trustchain-oc1-orchestral
/
authentik
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

*: fix remaining redirects to overview

This commit is contained in:
Jens Langhammer 2020-11-22 23:44:21 +01:00
parent c26d928eb0
commit 5da8caf0d4
17 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
passbook/core/tests/test_views_overview.py
View File

@ -23,8 +23,20 @@ class TestOverviewViews(TestCase):
)
self.client.force_login(self.user)
def test_shell(self):
"""Test shell"""
self.assertEqual(
self.client.get(reverse("passbook_core:shell")).status_code, 200
)
def test_overview(self):
"""Test UserSettingsView"""
"""Test overview"""
self.assertEqual(
self.client.get(reverse("passbook_core:overview")).status_code, 200
)
def test_user_settings(self):
"""Test user settings"""
self.assertEqual(
self.client.get(reverse("passbook_core:user-settings")).status_code, 200
)

6
passbook/flows/tests/test_views.py
View File

@ -207,7 +207,7 @@ class TestFlowExecutor(TestCase):
# We do this request without the patch, so the policy results in false
response = self.client.post(exec_url)
self.assertEqual(response.status_code, 302)
self.assertEqual(response.url, reverse("passbook_core:overview"))
self.assertEqual(response.url, reverse("passbook_core:shell"))
def test_reevaluate_remove_middle(self):
"""Test planner with re-evaluate (middle stage is removed)"""
@ -273,7 +273,7 @@ class TestFlowExecutor(TestCase):
self.assertEqual(response.status_code, 200)
self.assertJSONEqual(
force_str(response.content),
{"type": "redirect", "to": reverse("passbook_core:overview")},
{"type": "redirect", "to": reverse("passbook_core:shell")},
)
def test_reevaluate_remove_consecutive(self):
@ -349,5 +349,5 @@ class TestFlowExecutor(TestCase):
self.assertEqual(response.status_code, 200)
self.assertJSONEqual(
force_str(response.content),
{"type": "redirect", "to": reverse("passbook_core:overview")},
{"type": "redirect", "to": reverse("passbook_core:shell")},
)

4
passbook/flows/views.py
View File

@ -144,7 +144,7 @@ class FlowExecutorView(View):
# Since this is wrapped by the ExecutorShell, the next argument is saved in the session
# extract the next param before cancel as that cleans it
next_param = self.request.session.get(SESSION_KEY_GET, {}).get(
NEXT_ARG_NAME, "passbook_core:overview"
NEXT_ARG_NAME, "passbook_core:shell"
)
self.cancel()
return redirect_with_qs(next_param)
@ -248,7 +248,7 @@ class CancelView(View):
if SESSION_KEY_PLAN in request.session:
del request.session[SESSION_KEY_PLAN]
LOGGER.debug("Canceled current plan")
return redirect("passbook_core:overview")
return redirect("passbook_core:shell")
class ToDefaultFlow(View):

2
passbook/providers/oauth2/templates/providers/oauth2/end_session.html
View File

@ -22,7 +22,7 @@ You've logged out of {{ application }}.
{% endblocktrans %}
</p>
<a id="pb-back-home" href="{% url 'passbook_core:overview' %}" class="pf-c-button pf-m-primary">{% trans 'Go back to overview' %}</a>
<a id="pb-back-home" href="{% url 'passbook_core:shell' %}" class="pf-c-button pf-m-primary">{% trans 'Go back to overview' %}</a>
<a id="logout" href="{% url 'passbook_flows:default-invalidation' %}" class="pf-c-button pf-m-secondary">{% trans 'Log out of passbook' %}</a>

2
passbook/recovery/views.py
View File

@ -21,4 +21,4 @@ class UseTokenView(View):
login(request, token.user, backend="django.contrib.auth.backends.ModelBackend")
token.delete()
messages.warning(request, _("Used recovery-link to authenticate."))
return redirect("passbook_core:overview")
return redirect("passbook_core:shell")

2
passbook/stages/captcha/tests.py
View File

@ -51,5 +51,5 @@ class TestCaptchaStage(TestCase):
self.assertEqual(response.status_code, 200)
self.assertJSONEqual(
force_str(response.content),
{"type": "redirect", "to": reverse("passbook_core:overview")},
{"type": "redirect", "to": reverse("passbook_core:shell")},
)

6
passbook/stages/consent/tests.py
View File

@ -51,7 +51,7 @@ class TestConsentStage(TestCase):
self.assertEqual(response.status_code, 200)
self.assertJSONEqual(
force_str(response.content),
{"type": "redirect", "to": reverse("passbook_core:overview")},
{"type": "redirect", "to": reverse("passbook_core:shell")},
)
self.assertFalse(UserConsent.objects.filter(user=self.user).exists())
@ -82,7 +82,7 @@ class TestConsentStage(TestCase):
self.assertEqual(response.status_code, 200)
self.assertJSONEqual(
force_str(response.content),
{"type": "redirect", "to": reverse("passbook_core:overview")},
{"type": "redirect", "to": reverse("passbook_core:shell")},
)
self.assertTrue(
UserConsent.objects.filter(
@ -119,7 +119,7 @@ class TestConsentStage(TestCase):
self.assertEqual(response.status_code, 200)
self.assertJSONEqual(
force_str(response.content),
{"type": "redirect", "to": reverse("passbook_core:overview")},
{"type": "redirect", "to": reverse("passbook_core:shell")},
)
self.assertTrue(
UserConsent.objects.filter(

2
passbook/stages/dummy/tests.py
View File

@ -49,7 +49,7 @@ class TestDummyStage(TestCase):
self.assertEqual(response.status_code, 200)
self.assertJSONEqual(
force_str(response.content),
{"type": "redirect", "to": reverse("passbook_core:overview")},
{"type": "redirect", "to": reverse("passbook_core:shell")},
)
def test_form(self):

2
passbook/stages/email/tests.py
View File

@ -117,7 +117,7 @@ class TestEmailStage(TestCase):
self.assertEqual(response.status_code, 200)
self.assertJSONEqual(
force_str(response.content),
{"type": "redirect", "to": reverse("passbook_core:overview")},
{"type": "redirect", "to": reverse("passbook_core:shell")},
)
session = self.client.session

2
passbook/stages/identification/tests.py
View File

@ -59,7 +59,7 @@ class TestIdentificationStage(TestCase):
self.assertEqual(response.status_code, 200)
self.assertJSONEqual(
force_str(response.content),
{"type": "redirect", "to": reverse("passbook_core:overview")},
{"type": "redirect", "to": reverse("passbook_core:shell")},
)
def test_invalid_with_username(self):

4
passbook/stages/invitation/tests.py
View File

@ -89,7 +89,7 @@ class TestUserLoginStage(TestCase):
self.assertEqual(response.status_code, 200)
self.assertJSONEqual(
force_str(response.content),
{"type": "redirect", "to": reverse("passbook_core:overview")},
{"type": "redirect", "to": reverse("passbook_core:shell")},
)
self.stage.continue_flow_without_invitation = False
@ -128,5 +128,5 @@ class TestUserLoginStage(TestCase):
self.assertEqual(response.status_code, 200)
self.assertJSONEqual(
force_str(response.content),
{"type": "redirect", "to": reverse("passbook_core:overview")},
{"type": "redirect", "to": reverse("passbook_core:shell")},
)

2
passbook/stages/password/tests.py
View File

@ -110,7 +110,7 @@ class TestPasswordStage(TestCase):
self.assertEqual(response.status_code, 200)
self.assertJSONEqual(
force_str(response.content),
{"type": "redirect", "to": reverse("passbook_core:overview")},
{"type": "redirect", "to": reverse("passbook_core:shell")},
)
def test_invalid_password(self):

2
passbook/stages/prompt/tests.py
View File

@ -165,7 +165,7 @@ class TestPromptStage(TestCase):
self.assertEqual(response.status_code, 200)
self.assertJSONEqual(
force_str(response.content),
{"type": "redirect", "to": reverse("passbook_core:overview")},
{"type": "redirect", "to": reverse("passbook_core:shell")},
)
# Check that valid data has been saved

2
passbook/stages/user_delete/tests.py
View File

@ -89,7 +89,7 @@ class TestUserDeleteStage(TestCase):
self.assertEqual(response.status_code, 200)
self.assertJSONEqual(
force_str(response.content),
{"type": "redirect", "to": reverse("passbook_core:overview")},
{"type": "redirect", "to": reverse("passbook_core:shell")},
)
self.assertFalse(User.objects.filter(username=self.username).exists())

2
passbook/stages/user_login/tests.py
View File

@ -55,7 +55,7 @@ class TestUserLoginStage(TestCase):
self.assertEqual(response.status_code, 200)
self.assertJSONEqual(
force_str(response.content),
{"type": "redirect", "to": reverse("passbook_core:overview")},
{"type": "redirect", "to": reverse("passbook_core:shell")},
)
@patch(

2
passbook/stages/user_logout/tests.py
View File

@ -51,7 +51,7 @@ class TestUserLogoutStage(TestCase):
self.assertEqual(response.status_code, 200)
self.assertJSONEqual(
force_str(response.content),
{"type": "redirect", "to": reverse("passbook_core:overview")},
{"type": "redirect", "to": reverse("passbook_core:shell")},
)
def test_form(self):

4
passbook/stages/user_write/tests.py
View File

@ -63,7 +63,7 @@ class TestUserWriteStage(TestCase):
self.assertEqual(response.status_code, 200)
self.assertJSONEqual(
force_str(response.content),
{"type": "redirect", "to": reverse("passbook_core:overview")},
{"type": "redirect", "to": reverse("passbook_core:shell")},
)
user_qs = User.objects.filter(
username=plan.context[PLAN_CONTEXT_PROMPT]["username"]
@ -101,7 +101,7 @@ class TestUserWriteStage(TestCase):
self.assertEqual(response.status_code, 200)
self.assertJSONEqual(
force_str(response.content),
{"type": "redirect", "to": reverse("passbook_core:overview")},
{"type": "redirect", "to": reverse("passbook_core:shell")},
)
user_qs = User.objects.filter(
username=plan.context[PLAN_CONTEXT_PROMPT]["username"]