dj-jwt-auth 1.5.10__tar.gz → 1.5.11__tar.gz

{dj-jwt-auth-1.5.10 → dj-jwt-auth-1.5.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dj-jwt-auth
-Version: 1.5.10
+Version: 1.5.11
 Summary: A Django package for JSON Web Token validation and verification. Using PyJWT.
 Home-page: https://www.example.com/
 Author: Konstantin Seleznev

{dj-jwt-auth-1.5.10 → dj-jwt-auth-1.5.11}/dj_jwt_auth.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dj-jwt-auth
-Version: 1.5.10
+Version: 1.5.11
 Summary: A Django package for JSON Web Token validation and verification. Using PyJWT.
 Home-page: https://www.example.com/
 Author: Konstantin Seleznev

{dj-jwt-auth-1.5.10 → dj-jwt-auth-1.5.11}/django_jwt/user.py

@@ -43,7 +43,7 @@ class UserHandler:
         """Collect user data from KeyCloak"""
 
         user_data = oidc_handler.get_user_info(self.access_token)
-        log.info(f"User data: {user_data}, access_token: {self.access_token}")
+        log.info(f"[OIDC] User data: {user_data}")
         self.kwargs["email"] = user_data["email"].lower()
         self.kwargs.update(mapper(user_data))
 
@@ -85,7 +85,7 @@ class UserHandler:
             is_modified = user_modified_at < self.modified_at
 
             log.info(
-                f"User modified at: {user_modified_at}, "
+                f"[OIDC] User modified at: {user_modified_at}, "
                 f"modified_at: {self.modified_at}, "
                 f"is_modified: {is_modified}, "
                 f"email: {user.email}",
@@ -113,6 +113,9 @@ class UserHandler:
                 return self._get_by_email()
             except model.DoesNotExist:
                 return self._create_new_user()
+        except model.MultipleObjectsReturned:
+            log.error(f"[OIDC] Multiple users found by {settings.OIDC_USER_UID}: {self.kwargs[settings.OIDC_USER_UID]}")
+            return self._get_by_email()
 
 
 class RoleHandler:

{dj-jwt-auth-1.5.10 → dj-jwt-auth-1.5.11}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = dj-jwt-auth
-version = 1.5.10
+version = 1.5.11
 description = A Django package for JSON Web Token validation and verification. Using PyJWT.
 long_description = file: README.md
 url = https://www.example.com/

{dj-jwt-auth-1.5.10 → dj-jwt-auth-1.5.11}/tests/models.py

@@ -4,5 +4,5 @@ from django.utils import timezone
 
 
 class User(AbstractUser):
-    kc_id = models.CharField(max_length=255, unique=True, null=True, blank=True)
+    kc_id = models.CharField(max_length=255, null=True, blank=True)
     modified_timestamp = models.DateTimeField(auto_now=False, default=timezone.now)

{dj-jwt-auth-1.5.10 → dj-jwt-auth-1.5.11}/tests/test.py

@@ -112,6 +112,16 @@ class OIDCHandlerTest(TestCase):
         # fields are updated if they are changed in KeyCloak
         self.assertUserWithPayload()
 
+    def test_exists_multiple_kc_id(self, *_):
+        """User exists in database by email"""
+        user = User.objects.create(email="example@bk.com", kc_id="123")
+        User.objects.create(email="example@gmail.com", kc_id="123", username="other")
+        self.middleware.process_request(self.request)
+        self.assertEqual(self.request.user, user)
+
+        # fields are updated if they are changed in KeyCloak
+        self.assertUserWithPayload()
+
     def test_exists_email_differeent_kc_id_user(self, *_):
         """User exists in database by email but different kc_id"""
         user = User.objects.create(email="example@bk.com", kc_id="123")