actually use USER_ID_FIELD in some places it wasnt used

sunscrapers · Jul 22, 2024 · 11ebd83 · 11ebd83
1 parent 1a03eee
commit 11ebd83
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/djoser/email.py b/djoser/email.py
@@ -13,7 +13,7 @@ def get_context_data(self):
         context = super().get_context_data()
 
         user = context.get("user")
-        context["uid"] = utils.encode_uid(user.pk)
+        context["uid"] = utils.encode_uid(getattr(user, settings.USER_ID_FIELD))
         context["token"] = default_token_generator.make_token(user)
         context["url"] = settings.ACTIVATION_URL.format(**context)
         return context
@@ -31,7 +31,7 @@ def get_context_data(self):
         context = super().get_context_data()
 
         user = context.get("user")
-        context["uid"] = utils.encode_uid(user.pk)
+        context["uid"] = utils.encode_uid(getattr(user, settings.USER_ID_FIELD))
         context["token"] = default_token_generator.make_token(user)
         context["url"] = settings.PASSWORD_RESET_CONFIRM_URL.format(**context)
         return context
@@ -52,7 +52,7 @@ def get_context_data(self):
         context = super().get_context_data()
 
         user = context.get("user")
-        context["uid"] = utils.encode_uid(user.pk)
+        context["uid"] = utils.encode_uid(getattr(user, settings.USER_ID_FIELD))
         context["token"] = default_token_generator.make_token(user)
         context["url"] = settings.USERNAME_RESET_CONFIRM_URL.format(**context)
         return context
diff --git a/djoser/serializers.py b/djoser/serializers.py
@@ -177,7 +177,7 @@ def validate(self, attrs):
         # doesn't work with modelserializer
         try:
             uid = utils.decode_uid(self.initial_data.get("uid", ""))
-            self.user = User.objects.get(pk=uid)
+            self.user = User.objects.get(**{settings.USER_ID_FIELD: uid})
         except (User.DoesNotExist, ValueError, TypeError, OverflowError):
             key_error = "invalid_uid"
             raise ValidationError(