Add method_decorator to use custom decorator on a view.

Author: Michał Kopydłowski

trench/decorators.py

@@ -1,8 +1,6 @@
 from django.contrib.auth import REDIRECT_FIELD_NAME
 from django.contrib.auth.decorators import user_passes_test
 
-from trench.command.authenticate_second_factor import authenticate_second_step_command
-
 
 def mfa_login_required(
     function=None, redirect_field_name=REDIRECT_FIELD_NAME, login_url=None
@@ -12,13 +10,11 @@ def mfa_login_required(
     to the log-in page if necessary.
     """
 
-    def test(user):
-        # return user.is_verified() or (user.is_authenticated and not user_has_device(user))
-        return authenticate_second_step_command
+    def is_user_authenticated(user):
+        return user.is_authenticated
 
     actual_decorator = user_passes_test(
-        lambda u: u.is_authenticated,
-        # test,
+        is_user_authenticated,
         login_url=login_url,
         redirect_field_name=redirect_field_name,
     )

trench/views/base.py

@@ -1,6 +1,6 @@
-from django.contrib.auth.decorators import login_required
 from django.contrib.auth.models import User
 from django.db.models import QuerySet
+from django.utils.decorators import method_decorator
 from django.utils.translation import gettext_lazy as _
 
 from abc import ABC, abstractmethod
@@ -212,7 +212,6 @@ class MFAMethodRequestCodeView(APIView):
     permission_classes = (IsAuthenticated,)
 
     @staticmethod
-    @login_required
     def post(request: Request) -> Response:
         serializer = MFAMethodCodeSerializer(data=request.data)
         serializer.is_valid(raise_exception=True)
@@ -228,6 +227,10 @@ def post(request: Request) -> Response:
         except MFAValidationError as cause:
             return ErrorResponse(error=cause)
 
+    @method_decorator(mfa_login_required)
+    def dispatch(self, *args, **kwargs):
+        return super().dispatch(*args, **kwargs)
+
 
 class MFAPrimaryMethodChangeView(APIView):
     permission_classes = (IsAuthenticated,)