django 5.1: support LoginRequiredMiddleware

Author: xi

mfa/admin.py

@@ -4,8 +4,10 @@
 from django.urls import reverse
 
 from .models import MFAKey
+from .decorators import login_not_required
 
 
+@login_not_required
 def custom_login(self, request, extra_context=None):
     next_url = (
         request.GET.get(REDIRECT_FIELD_NAME)

mfa/decorators.py

@@ -1,3 +1,16 @@
+try:
+    from stronghold.decorators import public as stronghold_login_not_required
+except ImportError:
+    def stronghold_login_not_required(view_func):
+        return view_func
+
+try:
+    from django.contrib.auth.decorators import login_not_required
+except ImportError:
+    def login_not_required(view_func):
+        return view_func
+
+
 def public(view_func):
     view_func.mfa_public = True
     return view_func

mfa/views.py

@@ -15,18 +15,14 @@
 from django.views.generic import ListView
 
 from . import settings
+from .decorators import login_not_required
+from .decorators import stronghold_login_not_required
 from .forms import MFAAuthForm
 from .forms import MFACreateForm
 from .mail import send_mail
 from .mixins import MFAFormView
 from .models import MFAKey
 
-try:
-    from stronghold.decorators import public as stronghold_public
-except ImportError:
-    def stronghold_public(view_func):
-        return view_func
-
 
 class LoginView(DjangoLoginView):
     def no_key_exists(self, form):
@@ -90,7 +86,8 @@ def form_valid(self, form):
         return super().form_valid(form)
 
 
-@method_decorator(stronghold_public, name='dispatch')
+@method_decorator(login_not_required, name='dispatch')
+@method_decorator(stronghold_login_not_required, name='dispatch')
 class MFAAuthView(MFAFormView):
     form_class = MFAAuthForm
 

tests/settings.py

@@ -1,5 +1,7 @@
 from pathlib import Path
 
+import django
+
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
@@ -21,6 +23,9 @@
     'mfa.middleware.MFAEnforceMiddleware',
 ]
 
+if django.VERSION >= (5, 1):
+    MIDDLEWARE.append('django.contrib.auth.middleware.LoginRequiredMiddleware')
+
 AUTHENTICATION_BACKENDS = [
     'django.contrib.auth.backends.ModelBackend',
 ]