Made various login redirects more intuative

dlareau · Mar 22, 2020 · 4785d04 · 4785d04
1 parent 4bb9e98
commit 4785d04
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/huntserver/auth_views.py b/huntserver/auth_views.py
@@ -1,4 +1,5 @@
 from django.conf import settings
+from django.contrib import messages
 from django.contrib.auth import logout, login, views
 from django.contrib.auth.models import User
 from django.shortcuts import render, redirect
@@ -61,13 +62,14 @@ def account_logout(request):
     """ A view to logout the user and *hopefully* also logout out the shibboleth system. """
 
     logout(request)
+    messages.success(request, "Logout successful")
     if 'next' in request.GET:
         additional_url = request.GET['next']
     else:
         additional_url = ""
     if(settings.USE_SHIBBOLETH):
         next_url = "https://" + request.get_host() + additional_url
-        return redirect("/Shibboleth.sso/Logout?next=" + next_url)
+        return redirect("/Shibboleth.sso/Logout?return=" + next_url)
     else:
         return index(request)
 

diff --git a/puzzlehunt_server/settings/base_settings.py b/puzzlehunt_server/settings/base_settings.py
@@ -92,7 +92,7 @@
 # URL settings
 LOGIN_REDIRECT_URL = '/'
 PROTECTED_URL = '/protected/'
-LOGIN_URL = 'login_selection'
+LOGIN_URL = 'huntserver:login_selection'
 
 # Random settings
 SILENCED_SYSTEM_CHECKS = ["urls.W005"]  # silences admin url override warning

diff --git a/puzzlehunt_server/urls.py b/puzzlehunt_server/urls.py
@@ -8,6 +8,10 @@
 
 urlpatterns = [
     # Admin redirections/views
+    url(r'^admin/login/$', RedirectView.as_view(url=reverse_lazy(settings.LOGIN_URL),
+                                                query_string=True)),
+    url(r'^staff/login/$', RedirectView.as_view(url=reverse_lazy(settings.LOGIN_URL),
+                                                query_string=True)),
     url(r'^admin/$', RedirectView.as_view(url=reverse_lazy('admin:app_list',
                                           args=('huntserver',)))),
     url(r'^staff/$', RedirectView.as_view(url=reverse_lazy('admin:app_list',