Remove base dir from redirect urls

Align the redirect parameter with the implementation in authentication. Having the base path present results in a double base path. See cakephp/authentication#343
cakephp · Jan 25, 2020 · 6fefa13 · 6fefa13
1 parent 49bb64b
commit 6fefa13
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 10 deletions.
diff --git a/src/Middleware/UnauthorizedHandler/CakeRedirectHandler.php b/src/Middleware/UnauthorizedHandler/CakeRedirectHandler.php
@@ -69,10 +69,6 @@ protected function getUrl(ServerRequestInterface $request, array $options): stri
         $url = $options['url'];
         if ($options['queryParam'] !== null) {
             $uri = $request->getUri();
-            /** @psalm-suppress NoInterfaceProperties */
-            if (property_exists($uri, 'base')) {
-                $uri = $uri->withPath($uri->base . $uri->getPath());
-            }
             $redirect = $uri->getPath();
             if ($uri->getQuery()) {
                 $redirect .= '?' . $uri->getQuery();

diff --git a/src/Middleware/UnauthorizedHandler/RedirectHandler.php b/src/Middleware/UnauthorizedHandler/RedirectHandler.php
@@ -101,10 +101,6 @@ protected function getUrl(ServerRequestInterface $request, array $options): stri
         $url = $options['url'];
         if ($options['queryParam'] !== null && $request->getMethod() === 'GET') {
             $uri = $request->getUri();
-            /** @psalm-suppress NoInterfaceProperties */
-            if (property_exists($uri, 'base')) {
-                $uri = $uri->withPath($uri->base . $uri->getPath());
-            }
             $redirect = $uri->getPath();
             if ($uri->getQuery()) {
                 $redirect .= '?' . $uri->getQuery();

diff --git a/tests/TestCase/Middleware/UnauthorizedHandler/CakeRedirectHandlerTest.php b/tests/TestCase/Middleware/UnauthorizedHandler/CakeRedirectHandlerTest.php
@@ -145,7 +145,7 @@ public function testHandleRedirectWithBasePath()
 
         $this->assertEquals(302, $response->getStatusCode());
         $this->assertEquals(
-            '/basedir/login?redirect=%2Fbasedir%2Fadmin%2Fdashboard',
+            '/basedir/login?redirect=%2Fadmin%2Fdashboard',
             $response->getHeaderLine('Location')
         );
     }

diff --git a/tests/TestCase/Middleware/UnauthorizedHandler/RedirectHandlerTest.php b/tests/TestCase/Middleware/UnauthorizedHandler/RedirectHandlerTest.php
@@ -146,7 +146,7 @@ public function testHandleRedirectWithBasePath()
 
         $this->assertEquals(302, $response->getStatusCode());
         $this->assertEquals(
-            '/basedir/login?redirect=%2Fbasedir%2Fpath',
+            '/basedir/login?redirect=%2Fpath',
             $response->getHeaderLine('Location')
         );
     }