From aca995e09cf9c210ffe45584fbe50dcedb8bdebb Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Tue, 1 Sep 2020 10:12:54 +0200
Subject: Fix support for legacy route login redirection
Makes sure that the user is properly redirected to the bookmark form after login, even with legacy routes
---
tests/legacy/LegacyControllerTest.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'tests')
diff --git a/tests/legacy/LegacyControllerTest.php b/tests/legacy/LegacyControllerTest.php
index 759a5b2a..460fbb3b 100644
--- a/tests/legacy/LegacyControllerTest.php
+++ b/tests/legacy/LegacyControllerTest.php
@@ -66,11 +66,11 @@ class LegacyControllerTest extends TestCase
{
return [
['post', [], '/admin/shaare', true],
- ['post', [], '/login', false],
+ ['post', [], '/login?returnurl=/admin/shaare', false],
['post', ['title' => 'test'], '/admin/shaare?title=test', true],
- ['post', ['title' => 'test'], '/login?title=test', false],
+ ['post', ['title' => 'test'], '/login?returnurl=/admin/shaare?title=test', false],
['addlink', [], '/admin/add-shaare', true],
- ['addlink', [], '/login', false],
+ ['addlink', [], '/login?returnurl=/admin/add-shaare', false],
['login', [], '/login', true],
['login', [], '/login', false],
['logout', [], '/admin/logout', true],
--
cgit v1.2.3
From 9e2d47e519783a991962e1fe2c9f28d77756ae49 Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Tue, 1 Sep 2020 10:40:18 +0200
Subject: Fix legacy redirection when Shaarli instance is under a subfolder
---
tests/legacy/LegacyControllerTest.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'tests')
diff --git a/tests/legacy/LegacyControllerTest.php b/tests/legacy/LegacyControllerTest.php
index 460fbb3b..2bbbb1d7 100644
--- a/tests/legacy/LegacyControllerTest.php
+++ b/tests/legacy/LegacyControllerTest.php
@@ -66,11 +66,11 @@ class LegacyControllerTest extends TestCase
{
return [
['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'], '/login?returnurl=/admin/shaare?title=test', false],
+ ['post', ['title' => 'test'], '/login?returnurl=/subfolder/admin/shaare?title=test', false],
['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', false],
['logout', [], '/admin/logout', true],
--
cgit v1.2.3
From 11aa4a7a29c5a6358584ce0f63c061fdb0704b18 Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Tue, 1 Sep 2020 10:40:35 +0200
Subject: Support redirection of legacy route 'do=configure'
---
tests/legacy/LegacyControllerTest.php | 2 ++
1 file changed, 2 insertions(+)
(limited to 'tests')
diff --git a/tests/legacy/LegacyControllerTest.php b/tests/legacy/LegacyControllerTest.php
index 2bbbb1d7..4e52f3e1 100644
--- a/tests/legacy/LegacyControllerTest.php
+++ b/tests/legacy/LegacyControllerTest.php
@@ -94,6 +94,8 @@ class LegacyControllerTest extends TestCase
['opensearch', [], '/open-search', true],
['dailyrss', [], '/daily-rss', false],
['dailyrss', [], '/daily-rss', true],
+ ['configure', [], '/login?returnurl=/subfolder/admin/configure', false],
+ ['configure', [], '/admin/configure', true],
];
}
}
--
cgit v1.2.3