dj-jwt-auth 1.5.10__py3-none-any.whl → 1.5.11__py3-none-any.whl

{dj_jwt_auth-1.5.10.dist-info → dj_jwt_auth-1.5.11.dist-info}/METADATA

@@ -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.dist-info → dj_jwt_auth-1.5.11.dist-info}/RECORD

@@ -6,16 +6,16 @@ django_jwt/pkce.py,sha256=j-v2ffCw0X3JW7ak8vfNeSZI-dACOvHbi1eLmJ0R8gM,685
 django_jwt/roles.py,sha256=SaHK3o8T8USS4ZhG4SrHPlZQV2lMb2t1UZHT6IQtBvA,143
 django_jwt/settings.py,sha256=pXQ8WUU4LGBe6PQxCLTLM_2_b1CCSgehqim3yJDqZdw,1922
 django_jwt/urls.py,sha256=ZhcnRcQ1MBRh-bS7fTa-Vkz8yuWUhv-G_uRXKLnKAs0,320
-django_jwt/user.py,sha256=B5kufN5dcDe0tlmnBgYnfz7PaE-ncqujtCqQiDYZWak,5564
+django_jwt/user.py,sha256=HPxVALN3wpBhkJLnUfQKjgShK9j9BvFv3F0dfrqN7Cc,5750
 django_jwt/utils.py,sha256=uIFw1JMldE_blC7YkaZbY7rpcawP2E6zsdLyuZRwJoA,1645
 django_jwt/views.py,sha256=jQW3YrW-Oed54KqxjDMaBOQ-dxEnqTAcBEXlQSK-zCE,4231
 django_jwt/templates/django-jwt-index.html,sha256=y8f0v2WbRAFxnIU799I_MZCVsjn1sbdh7bypjdWB0lA,1353
 django_jwt/templates/admin/login.html,sha256=Nihyu0IGvDDZVvQDITXozwlj6XCQ0B8gqlyHLqVNyJc,275
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/models.py,sha256=4uonwXuAvJGlITpuxFazyoeA_CSUYMyN7Vj1gEWJTH4,308
-tests/test.py,sha256=nD1sm_nH0l9ADnwavySPdhgrNOvLX7nLYol7w306TFU,9720
+tests/models.py,sha256=tJlhRARVGfFIH6Gp1o00buZKcY2oAk7HNw2PMnkTEDs,295
+tests/test.py,sha256=KnliWfuW8CtRH4qkQ1SNT0jmfFSNZ6MJCWYz4OUv6pU,10175
 tests/urls.py,sha256=D5FhDSVAudurkrpkCZZPnDvgXSgifwFVB3nAlYBg7uQ,212
-dj_jwt_auth-1.5.10.dist-info/METADATA,sha256=yp09WYeetYvOR8oWck18DPT3SIVs1IXkg7UH684518U,4370
-dj_jwt_auth-1.5.10.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-dj_jwt_auth-1.5.10.dist-info/top_level.txt,sha256=58O7TdK-yECZcbmPc52KNlBFpjIUlENuZubCxaSOxus,17
-dj_jwt_auth-1.5.10.dist-info/RECORD,,
+dj_jwt_auth-1.5.11.dist-info/METADATA,sha256=9_9XVtcrl9rOEhb5E9VOYuEJ5ZS9tc8bxMdWeoeYrUs,4370
+dj_jwt_auth-1.5.11.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+dj_jwt_auth-1.5.11.dist-info/top_level.txt,sha256=58O7TdK-yECZcbmPc52KNlBFpjIUlENuZubCxaSOxus,17
+dj_jwt_auth-1.5.11.dist-info/RECORD,,

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:

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)

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")