Merge development

ocadotechnology · Feb 22, 2024 · 94738c4 · 94738c4
2 parents 996d263 + cc76c1a
commit 94738c4
Show file tree

Hide file tree

Showing 6 changed files with 277 additions and 111 deletions.
diff --git a/backend/Pipfile.lock b/backend/Pipfile.lock
diff --git a/backend/api/serializers/auth_factor.py b/backend/api/serializers/auth_factor.py
@@ -24,7 +24,7 @@ class Meta:
     # pylint: disable-next=missing-function-docstring
     def validate_type(self, value: str):
         if AuthFactor.objects.filter(
-            user=self.request.user, type=value
+            user=self.request.auth_user, type=value
         ).exists():
             raise serializers.ValidationError(
                 "You already have this authentication factor enabled.",
@@ -34,7 +34,7 @@ def validate_type(self, value: str):
         return value
 
     def create(self, validated_data):
-        user = self.request.user
+        user = self.request.auth_user
         if not user.userprofile.otp_secret:
             user.userprofile.otp_secret = pyotp.random_base32()
             user.userprofile.save()
@@ -51,6 +51,6 @@ def to_representation(self, instance):
         ):
             representation[
                 "totp_provisioning_uri"
-            ] = self.request.user.totp_provisioning_uri
+            ] = self.request.auth_user.totp_provisioning_uri
 
         return representation