Skip to content

Commit 00118f0

Browse files
committed
fix basepath in redirecthandler
1 parent b52be08 commit 00118f0

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

src/Middleware/UnauthorizedHandler/CakeRedirectHandler.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,11 @@ protected function getUrl(ServerRequestInterface $request, array $options): stri
7777
$url['?'][$options['queryParam']] = $redirect;
7878
}
7979

80+
$requestBase = $request->getAttribute('base');
81+
if ($requestBase) {
82+
$url['_base'] = $requestBase;
83+
}
84+
8085
return Router::url($url);
8186
}
8287
}

tests/TestCase/Middleware/UnauthorizedHandler/CakeRedirectHandlerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,10 @@ public function testHandleRedirectWithBasePath()
129129
$handler = new CakeRedirectHandler();
130130
$exception = new Exception();
131131

132-
Configure::write('App.base', '/basedir');
133132
$request = ServerRequestFactory::fromGlobals(
134133
['REQUEST_URI' => '/admin/dashboard']
135134
);
135+
$request = $request->withAttribute('base', '/basedir');
136136

137137
$response = $handler->handle($exception, $request, [
138138
'exceptions' => [

0 commit comments

Comments
 (0)