From 29ee31790e42cae46716565bbf95457399c70942 Mon Sep 17 00:00:00 2001
From: Helge Jung <hej@c3pb.de>
Date: Tue, 24 Dec 2024 00:50:23 +0100
Subject: [PATCH] SSO: rename template paths to ensure they're used
---
src/core/locale/de/LC_MESSAGES/django.po | 42 +++++++++----------
src/core/locale/en/LC_MESSAGES/django.po | 42 +++++++++----------
.../{oauth2_provider => sso}/authorize.html | 0
.../out-of-band-display-token.html | 0
src/core/views/sso.py | 4 +-
5 files changed, 44 insertions(+), 44 deletions(-)
rename src/core/templates/{oauth2_provider => sso}/authorize.html (100%)
rename src/core/templates/{oauth2_provider => sso}/out-of-band-display-token.html (100%)
diff --git a/src/core/locale/de/LC_MESSAGES/django.po b/src/core/locale/de/LC_MESSAGES/django.po
index d53a77fcf..0ea55dfcb 100644
--- a/src/core/locale/de/LC_MESSAGES/django.po
+++ b/src/core/locale/de/LC_MESSAGES/django.po
@@ -2444,27 +2444,6 @@ msgstr "Backend-Services Engelsystem @ {slug}"
msgid "SSO__svc_user_mgmt"
msgstr "Deinen {slug}-Benutzerstatus setzen."
-msgid "SSO__authorize"
-msgstr "Autorisieren von"
-
-msgid "SSO__authorize_scopes"
-msgstr "Die Seite möchte folgendes wissen:"
-
-msgid "SSO__redirecting_to"
-msgstr "Diese Information wird weitergegeben an (und du weitergeleitet zu):"
-
-msgid "SSO__authorize_abort"
-msgstr "abbrechen"
-
-msgid "SSO__authorize_accept"
-msgstr "akzeptieren"
-
-msgid "SSO__out_of_band_noscript"
-msgstr "Bitte kopiere nun das Token in das Program, welches die Authentifikation angefragt hat. Du kannst das Token in der Adress-Zeile zwischen '#code=' und '&' finden."
-
-msgid "SSO__out_of_band"
-msgstr "Bitte kopiere nun das Token in die Anwendung, welche die Authentifikation angefragt hat."
-
msgid "Hello"
msgstr "Hallo"
@@ -2523,6 +2502,27 @@ msgstr ""
msgid "Activate your %(safe_site_name)s account"
msgstr "Aktiviere dein %(safe_site_name)s Konto"
+msgid "SSO__authorize"
+msgstr "Autorisieren von"
+
+msgid "SSO__authorize_scopes"
+msgstr "Die Seite möchte folgendes wissen:"
+
+msgid "SSO__redirecting_to"
+msgstr "Diese Information wird weitergegeben an (und du weitergeleitet zu):"
+
+msgid "SSO__authorize_abort"
+msgstr "abbrechen"
+
+msgid "SSO__authorize_accept"
+msgstr "akzeptieren"
+
+msgid "SSO__out_of_band_noscript"
+msgstr "Bitte kopiere nun das Token in das Program, welches die Authentifikation angefragt hat. Du kannst das Token in der Adress-Zeile zwischen '#code=' und '&' finden."
+
+msgid "SSO__out_of_band"
+msgstr "Bitte kopiere nun das Token in die Anwendung, welche die Authentifikation angefragt hat."
+
msgid "Conference-day"
msgstr "Tag"
diff --git a/src/core/locale/en/LC_MESSAGES/django.po b/src/core/locale/en/LC_MESSAGES/django.po
index 4eac17f38..13724a859 100644
--- a/src/core/locale/en/LC_MESSAGES/django.po
+++ b/src/core/locale/en/LC_MESSAGES/django.po
@@ -2442,27 +2442,6 @@ msgstr "Engelsystem Backend service @ {slug}"
msgid "SSO__svc_user_mgmt"
msgstr "Set your user status at {name}."
-msgid "SSO__authorize"
-msgstr "Authorize"
-
-msgid "SSO__authorize_scopes"
-msgstr "The site requests:"
-
-msgid "SSO__redirecting_to"
-msgstr "This information is forwarded to (and you will be redirected there):"
-
-msgid "SSO__authorize_abort"
-msgstr "cancel"
-
-msgid "SSO__authorize_accept"
-msgstr "accept"
-
-msgid "SSO__out_of_band_noscript"
-msgstr "Please now copy the toke to the application requesting it. You can find the token in the address bar between '#access_token=' and '&'."
-
-msgid "SSO__out_of_band"
-msgstr "Please copy the token to the application requesting it."
-
msgid "Hello"
msgstr ""
@@ -2505,6 +2484,27 @@ msgstr ""
msgid "Activate your %(safe_site_name)s account"
msgstr ""
+msgid "SSO__authorize"
+msgstr "Authorize"
+
+msgid "SSO__authorize_scopes"
+msgstr "The site requests:"
+
+msgid "SSO__redirecting_to"
+msgstr "This information is forwarded to (and you will be redirected there):"
+
+msgid "SSO__authorize_abort"
+msgstr "cancel"
+
+msgid "SSO__authorize_accept"
+msgstr "accept"
+
+msgid "SSO__out_of_band_noscript"
+msgstr "Please now copy the toke to the application requesting it. You can find the token in the address bar between '#access_token=' and '&'."
+
+msgid "SSO__out_of_band"
+msgstr "Please copy the token to the application requesting it."
+
msgid "Conference-day"
msgstr "day"
diff --git a/src/core/templates/oauth2_provider/authorize.html b/src/core/templates/sso/authorize.html
similarity index 100%
rename from src/core/templates/oauth2_provider/authorize.html
rename to src/core/templates/sso/authorize.html
diff --git a/src/core/templates/oauth2_provider/out-of-band-display-token.html b/src/core/templates/sso/out-of-band-display-token.html
similarity index 100%
rename from src/core/templates/oauth2_provider/out-of-band-display-token.html
rename to src/core/templates/sso/out-of-band-display-token.html
diff --git a/src/core/views/sso.py b/src/core/views/sso.py
index fb4e9e409..1e8162a6d 100644
--- a/src/core/views/sso.py
+++ b/src/core/views/sso.py
@@ -27,12 +27,12 @@ class SelectedConferenceContextMixin:
@method_decorator(csp_update(form_action='*'), name='dispatch')
class OutOfBandDisplayTokenView(SelectedConferenceContextMixin, TemplateView):
- template_name = 'oauth2_provider/out-of-band-display-token.html'
+ template_name = 'sso/out-of-band-display-token.html'
@method_decorator(csp_update(form_action='*'), name='dispatch')
class AuthorizeView(SelectedConferenceContextMixin, AuthorizationView):
- template_name = 'oauth2_provider/authorize.html'
+ template_name = 'sso/authorize.html'
@method_decorator(csrf_exempt, name='dispatch')
--
GitLab