Fixed double path slash URL issue in some cases

ssddanbrown · ssddanbrown · commit ebc69a8f2c3e · 2022-05-04T20:08:22.000+01:00
- Occurred on system request path usage (Primarily on guest login redirection) when a custom path was not in use. - Added test to cover. For #3404
diff --git a/app/Http/Request.php b/app/Http/Request.php
@@ -35,7 +35,8 @@ public function getBaseUrl()
         $appUrl = config('app.url', null);
 
         if ($appUrl) {
-            return '/' . rtrim(implode('/', array_slice(explode('/', $appUrl), 3)), '/');
+            $parsedBaseUrl = rtrim(implode('/', array_slice(explode('/', $appUrl), 3)), '/');
+            return empty($parsedBaseUrl) ? '' : ('/' . $parsedBaseUrl);
         }
 
         return parent::getBaseUrl();
diff --git a/tests/UrlTest.php b/tests/UrlTest.php
@@ -34,4 +34,19 @@ public function test_app_url_forces_overrides_on_base_request()
         $this->assertEquals('/cool/docs', $bsRequest->getBaseUrl());
         $this->assertEquals('https://donkey.example.com:8091/cool/docs/login', $bsRequest->getUri());
     }
+
+    public function test_app_url_without_path_does_not_duplicate_path_slash()
+    {
+        config()->set('app.url', 'https://donkey.example.com');
+
+        // Have to manually get and wrap request in our custom type due to testing mechanics
+        $this->get('/settings');
+        $bsRequest = Request::createFrom(request());
+
+        $this->assertEquals('https://donkey.example.com', $bsRequest->getSchemeAndHttpHost());
+        $this->assertEquals('', $bsRequest->getBaseUrl());
+        $this->assertEquals('/settings', $bsRequest->getPathInfo());
+        $this->assertEquals('https://donkey.example.com/settings', $bsRequest->getUri());
+    }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,8 @@ public function getBaseUrl()`
`35`	`35`	`$appUrl = config('app.url', null);`
`36`	`36`
`37`	`37`	`if ($appUrl) {`
`38`		`- return '/' . rtrim(implode('/', array_slice(explode('/', $appUrl), 3)), '/');`
	`38`	`+ $parsedBaseUrl = rtrim(implode('/', array_slice(explode('/', $appUrl), 3)), '/');`
	`39`	`+ return empty($parsedBaseUrl) ? '' : ('/' . $parsedBaseUrl);`
`39`	`40`	`}`
`40`	`41`
`41`	`42`	`return parent::getBaseUrl();`