Merge pull request #155 from fsinfuhh/admin_login_oidc

fsinfuhh · Feb 27, 2024 · 694ca90 · 694ca90
2 parents deb3fde + 6b7f654
commit 694ca90
Show file tree

Hide file tree

Showing 7 changed files with 175 additions and 126 deletions.
diff --git a/Pipfile b/Pipfile
@@ -4,7 +4,7 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-Django = "~=4.1.12"    # can be upgraded once we have postgres >11 deployed
+Django = "~=5.0"
 Pillow = "~=10.0"
 PyPDF2 = "~=1.27"
 bleach = {extras = ["css"], version = "~=6.1"}

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mafiasi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-12 16:48+0100\n"
+"POT-Creation-Date: 2024-02-26 19:24+0100\n"
 "PO-Revision-Date: 2024-01-12 16:56+0100\n"
 "Last-Translator: Timon Engelke <timon.engelke@uni-hamburg.de>\n"
 "Language-Team: \n"
@@ -88,6 +88,15 @@ msgstr "Probleme?"
 msgid "License information"
 msgstr "Lizenzinformationen"
 
+#: mafiasi/base/templates/base/login.html:8
+#, python-format
+msgid ""
+"You are authenticated as %(username)s, but are not authorized to access this "
+"page. Would you like to login to a different account?"
+msgstr ""
+"Sie sind als %(username)s angemeldet, aber nicht autorisiert, auf diese "
+"Seite zuzugreifen. Wollen Sie sich mit einem anderen Account anmelden?"
+
 #: mafiasi/base/templates/base/problems.html:7
 #, python-format
 msgid ""

diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mafiasi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-12 17:28+0100\n"
+"POT-Creation-Date: 2024-02-26 19:24+0100\n"
 "PO-Revision-Date: 2024-01-12 17:06+0100\n"
 "Last-Translator: Timon Engelke <timon.engelke@uni-hamburg.de>\n"
 "Language-Team: \n"
@@ -80,6 +80,13 @@ msgstr ""
 msgid "License information"
 msgstr ""
 
+#: mafiasi/base/templates/base/login.html:8
+#, python-format
+msgid ""
+"You are authenticated as %(username)s, but are not authorized to access this "
+"page. Would you like to login to a different account?"
+msgstr ""
+
 #: mafiasi/base/templates/base/problems.html:7
 #, python-format
 msgid ""

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mafiasi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-12 16:48+0100\n"
+"POT-Creation-Date: 2024-02-26 19:24+0100\n"
 "PO-Revision-Date: 2024-01-15 16:39+0100\n"
 "Last-Translator: Timon Engelke <timon.engelke@uni-hamburg.de>\n"
 "Language-Team: \n"
@@ -88,6 +88,16 @@ msgstr "Problèmes?"
 msgid "License information"
 msgstr "Informations sur la licence"
 
+#: mafiasi/base/templates/base/login.html:8
+#, python-format
+msgid ""
+"You are authenticated as %(username)s, but are not authorized to access this "
+"page. Would you like to login to a different account?"
+msgstr ""
+"Vous êtes authentifié sous le nom %(username)s, mais vous n’êtes pas "
+"autorisé à accéder à cette page. Souhaitez-vous vous connecter avec un autre "
+"compte utilisateur ?"
+
 #: mafiasi/base/templates/base/problems.html:7
 #, python-format
 msgid ""

diff --git a/mafiasi/base/admin.py b/mafiasi/base/admin.py
@@ -23,3 +23,4 @@ class MafiasiAdmin(UserAdmin):
 
 admin.site.register(Yeargroup)
 admin.site.register(Mafiasi, MafiasiAdmin)
+admin.site.login_template = "base/login.html"
diff --git a/mafiasi/base/templates/base/login.html b/mafiasi/base/templates/base/login.html
@@ -0,0 +1,22 @@
+{% extends "admin/login.html" %}
+{% load i18n %}
+{% block content %}
+<div id="content-main">
+
+{% if user.is_authenticated %}
+<p class="errornote">
+{% blocktranslate trimmed %}
+    You are authenticated as {{ username }}, but are not authorized to
+    access this page. Would you like to login to a different account?
+{% endblocktranslate %}
+</p>
+{% endif %}
+
+<form id="login-form" method="get" action="{% url 'simple_openid_connect:login' %}">
+  <div class="submit-row">
+    <input type="submit" value="Log in with Mafiasi">
+  </div>
+</form>
+
+</div>
+{% endblock %}