From ec6e06b7163de2bb076544196ef56453e260ac2a Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Fri, 19 Apr 2024 09:58:14 +0200
Subject: [PATCH] Removed simplejwt related code

---
 modoboa/core/api/v2/viewsets.py | 39 +++++++++++++++++----------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/modoboa/core/api/v2/viewsets.py b/modoboa/core/api/v2/viewsets.py
index 2dd4dd17c..a0b469016 100644
--- a/modoboa/core/api/v2/viewsets.py
+++ b/modoboa/core/api/v2/viewsets.py
@@ -6,7 +6,8 @@ from rest_framework import filters, permissions, response, viewsets
 from rest_framework.authtoken.models import Token
 from rest_framework.decorators import action
 from rest_framework.exceptions import PermissionDenied
-from rest_framework_simplejwt.tokens import RefreshToken
+
+# from rest_framework_simplejwt.tokens import RefreshToken
 
 from modoboa.admin.api.v1 import serializers as admin_v1_serializers
 from modoboa.core.api.v1 import serializers as core_v1_serializers
@@ -79,20 +80,20 @@ class AccountViewSet(core_v1_viewsets.AccountViewSet):
         serializer = serializers.UserAPITokenSerializer({"token": str(token)})
         return response.Response(serializer.data, status=status)
 
-    @action(methods=["post"], detail=False, url_path="tfa/verify")
-    def tfa_verify_code(self, request):
-        """Verify given code validity."""
-        serializer = serializers.VerifyTFACodeSerializer(
-            data=request.data, context={"user": request.user}
-        )
-        serializer.is_valid(raise_exception=True)
-        refresh = RefreshToken.for_user(request.user)
-        refresh[constants.TFA_DEVICE_TOKEN_KEY] = serializer.validated_data[
-            "code"
-        ].persistent_id
-        return response.Response(
-            {"refresh": str(refresh), "access": str(refresh.access_token)}
-        )
+    # @action(methods=["post"], detail=False, url_path="tfa/verify")
+    # def tfa_verify_code(self, request):
+    #     """Verify given code validity."""
+    #     serializer = serializers.VerifyTFACodeSerializer(
+    #         data=request.data, context={"user": request.user}
+    #     )
+    #     serializer.is_valid(raise_exception=True)
+    #     refresh = RefreshToken.for_user(request.user)
+    #     refresh[constants.TFA_DEVICE_TOKEN_KEY] = serializer.validated_data[
+    #         "code"
+    #     ].persistent_id
+    #     return response.Response(
+    #         {"refresh": str(refresh), "access": str(refresh.access_token)}
+    #     )
 
     @action(methods=["get"], detail=False, url_path="tfa/setup/key")
     def tfa_setup_get_key(self, request):
@@ -129,13 +130,13 @@ class AccountViewSet(core_v1_viewsets.AccountViewSet):
         request.user.save()
         # Generate new tokens
         device = request.user.totpdevice_set.first()
-        refresh = RefreshToken.for_user(request.user)
-        refresh[constants.TFA_DEVICE_TOKEN_KEY] = device.persistent_id
+        # refresh = RefreshToken.for_user(request.user)
+        # refresh[constants.TFA_DEVICE_TOKEN_KEY] = device.persistent_id
         return response.Response(
             {
                 "tokens": tokens,
-                "refresh": str(refresh),
-                "access": str(refresh.access_token),
+                # "refresh": str(refresh),
+                # "access": str(refresh.access_token),
             }
         )