Fix redirect after login prompt (#1786)

Co-authored-by: Roelof Korporaal <[email protected]>

rocky/rocky/middleware/auth_required.py

@@ -1,17 +1,17 @@
 from django.conf import settings
+from django.contrib.auth.views import redirect_to_login
 from django.shortcuts import redirect
 from django.urls.base import reverse
 from django.utils import translation
 
 
 def AuthRequiredMiddleware(get_response):
     def middleware(request):
-        login_path = reverse("login")
         two_factor_setup_path = reverse("setup")
         # URLs excluded from login and 2fa
         excluded = [
             "/",
-            login_path,
+            reverse("login"),
             reverse("recover_email"),
             reverse("password_reset"),
             reverse("landing_page"),
@@ -40,7 +40,7 @@ def middleware(request):
             # check if path starts with anything in excluded_prefix
             or any([request.path.startswith(prefix) for prefix in excluded_prefix])
         ):
-            return redirect(login_path)
+            return redirect_to_login(request.get_full_path())
 
         # When 2fa is enabled, check if user is verified, otherwise redirect to 2fa setup page
         if (

rocky/rocky/settings.py

@@ -277,7 +277,7 @@
 STATIC_ROOT = BASE_DIR / "static"
 STATICFILES_DIRS = (BASE_DIR / "assets",)
 
-LOGIN_URL = "two_factor:login"
+LOGIN_URL = "login"
 LOGIN_REDIRECT_URL = "crisis_room"
 
 # Default primary key field type