actually use USER_ID_FIELD in some places it wasnt used

CHANGELOG.rst

@@ -5,6 +5,14 @@ Change Log
 This document records all notable changes to djoser.
 This project adheres to `Semantic Versioning <http://semver.org/>`_.
 
+---------------------
+`2.2.2`_ (2023-11-09)
+---------------------
+
+* fix regression: rollback path changes as it resulted in regressions for some https://github.com/sunscrapers/djoser/issues/778
+* add Django 5 to test suite pipeline - consider it being supported https://github.com/sunscrapers/djoser/issues/772
+* fix in docs https://github.com/sunscrapers/djoser/commit/641b824353627a73ba901f7e81b86246384d1327
+
 ---------------------
 `2.2.1`_ (2023-11-05)
 ---------------------
@@ -424,3 +432,4 @@ few bugfixes / documentation updates. List of changes:
 .. _2.1.0: https://github.com/sunscrapers/djoser/compare/2.0.5...2.1.0
 .. _2.2.0: https://github.com/sunscrapers/djoser/compare/2.1.0...2.2.0
 .. _2.2.1: https://github.com/sunscrapers/djoser/compare/2.2.0...2.2.1
+.. _2.2.2: https://github.com/sunscrapers/djoser/compare/2.2.1...2.2.2

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

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(

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "djoser"
-version = "2.2.1"
+version = "2.2.2"
 description = "REST implementation of Django authentication system."
 authors = [
     "Sunscrapers <[email protected]>",