Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix legacy redirection when Shaarli instance is under a subfolder

Browse source
This commit is contained in:
ArthurHoaro 2020-09-01 10:40:18 +02:00
parent aca995e09c
commit 9e2d47e519
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
application/legacy/LegacyController.php
View file

@ -40,30 +40,33 @@ public function process(Request $request, Response $response, string $action): R
public function post(Request $request, Response $response): Response public function post(Request $request, Response $response): Response
{ {
$parameters = count($request->getQueryParams()) > 0 ? '?' . http_build_query($request->getQueryParams()) : ''; $parameters = count($request->getQueryParams()) > 0 ? '?' . http_build_query($request->getQueryParams()) : '';
$route = '/admin/shaare';
if (!$this->container->loginManager->isLoggedIn()) { if (!$this->container->loginManager->isLoggedIn()) {
return $this->redirect($response, '/login?returnurl=/admin/shaare' . $parameters); return $this->redirect($response, '/login?returnurl='. $this->getBasePath() . $route . $parameters);
} }
return $this->redirect($response, '/admin/shaare' . $parameters); return $this->redirect($response, $route . $parameters);
} }
/** Legacy route: ?addlink= */ /** Legacy route: ?addlink= */
protected function addlink(Request $request, Response $response): Response protected function addlink(Request $request, Response $response): Response
{ {
$route = '/admin/add-shaare';
if (!$this->container->loginManager->isLoggedIn()) { if (!$this->container->loginManager->isLoggedIn()) {
return $this->redirect($response, '/login?returnurl=/admin/add-shaare'); return $this->redirect($response, '/login?returnurl=' . $this->getBasePath() . $route);
} }
return $this->redirect($response, '/admin/add-shaare'); return $this->redirect($response, $route);
} }
/** Legacy route: ?do=login */ /** Legacy route: ?do=login */
protected function login(Request $request, Response $response): Response protected function login(Request $request, Response $response): Response
{ {
$returnurl = $request->getQueryParam('returnurl'); $returnUrl = $request->getQueryParam('returnurl');
return $this->redirect($response, '/login' . ($returnurl ? '?returnurl=' . $returnurl : '')); return $this->redirect($response, '/login' . ($returnUrl ? '?returnurl=' . $returnUrl : ''));
} }
/** Legacy route: ?do=logout */ /** Legacy route: ?do=logout */

6
tests/legacy/LegacyControllerTest.php
View file

@ -66,11 +66,11 @@ public function getProcessProvider(): array
{ {
return [ return [
['post', [], '/admin/shaare', true], ['post', [], '/admin/shaare', true],
['post', [], '/login?returnurl=/admin/shaare', false], ['post', [], '/login?returnurl=/subfolder/admin/shaare', false],
['post', ['title' => 'test'], '/admin/shaare?title=test', true], ['post', ['title' => 'test'], '/admin/shaare?title=test', true],
['post', ['title' => 'test'], '/login?returnurl=/admin/shaare?title=test', false], ['post', ['title' => 'test'], '/login?returnurl=/subfolder/admin/shaare?title=test', false],
['addlink', [], '/admin/add-shaare', true], ['addlink', [], '/admin/add-shaare', true],
['addlink', [], '/login?returnurl=/admin/add-shaare', false], ['addlink', [], '/login?returnurl=/subfolder/admin/add-shaare', false],
['login', [], '/login', true], ['login', [], '/login', true],
['login', [], '/login', false], ['login', [], '/login', false],
['logout', [], '/admin/logout', true], ['logout', [], '/admin/logout', true],