dj-jwt-auth 1.6.0__py3-none-any.whl → 1.7.0__py3-none-any.whl

{dj_jwt_auth-1.6.0.dist-info → dj_jwt_auth-1.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dj-jwt-auth
-Version: 1.6.0
+Version: 1.7.0
 Summary: A Django package for JSON Web Token validation and verification. Using PyJWT.
 Home-page: https://www.example.com/
 Author: Konstantin Seleznev
@@ -17,6 +17,7 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
 Requires-Python: >=3.8

{dj_jwt_auth-1.6.0.dist-info → dj_jwt_auth-1.7.0.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=leJyZbeY1gfZyIy10qypVDD-zuU3elUQD4w0ijWTYak,5771
+django_jwt/user.py,sha256=e1OizNlxUQjH2jwbbFxHN0go0pJiVrmLJUDP7lBuUUM,5859
 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=tJlhRARVGfFIH6Gp1o00buZKcY2oAk7HNw2PMnkTEDs,295
-tests/test.py,sha256=782KtcjRTfbBi_va69bBmS1TWFa9ReBVj2wKfGr4Rvo,10199
+tests/test.py,sha256=K1woXGzeg9FJrjd4I22vm0-M43D8tXYV6XwXtv9vTD8,10192
 tests/urls.py,sha256=D5FhDSVAudurkrpkCZZPnDvgXSgifwFVB3nAlYBg7uQ,212
-dj_jwt_auth-1.6.0.dist-info/METADATA,sha256=Pjkw3ckU170djJ-OgthwLk_vLeW-9uAhzmy7MJbrh5c,4365
-dj_jwt_auth-1.6.0.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-dj_jwt_auth-1.6.0.dist-info/top_level.txt,sha256=58O7TdK-yECZcbmPc52KNlBFpjIUlENuZubCxaSOxus,17
-dj_jwt_auth-1.6.0.dist-info/RECORD,,
+dj_jwt_auth-1.7.0.dist-info/METADATA,sha256=k4Aal9v4cYy-3GQaVekI9EQE9qZ_MSTCwu0heRpNOBw,4416
+dj_jwt_auth-1.7.0.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+dj_jwt_auth-1.7.0.dist-info/top_level.txt,sha256=58O7TdK-yECZcbmPc52KNlBFpjIUlENuZubCxaSOxus,17
+dj_jwt_auth-1.7.0.dist-info/RECORD,,

{dj_jwt_auth-1.6.0.dist-info → dj_jwt_auth-1.7.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.44.0)
+Generator: setuptools (75.5.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

django_jwt/user.py

@@ -1,8 +1,7 @@
-from datetime import datetime
+from datetime import datetime, timezone
 from functools import cache
 from logging import getLogger
 
-import pytz
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group, Permission
 from django.http.request import HttpRequest
@@ -10,7 +9,7 @@ from django.http.request import HttpRequest
 from django_jwt import settings
 from django_jwt.utils import oidc_handler
 
-utc = pytz.UTC
+utc = timezone.utc
 log = getLogger(__name__)
 
 model = get_user_model()
@@ -32,7 +31,7 @@ class UserHandler:
 
         modified_at = payload.get(settings.OIDC_TOKEN_MODIFIED_FIELD, None)
         if modified_at and isinstance(modified_at, int):
-            self.modified_at = utc.localize(datetime.fromtimestamp(modified_at))
+            self.modified_at = datetime.fromtimestamp(modified_at, utc)
 
         self.on_create = settings.OIDC_USER_ON_CREATE
         self.on_update = settings.OIDC_USER_ON_UPDATE
@@ -61,8 +60,9 @@ class UserHandler:
     def _create_new_user(self) -> model:
         """Create new user if user is not found in database even by email."""
 
-        user = model.objects.create(**self.kwargs)
-        if self.on_create:
+        email = self.kwargs.pop("email")
+        user, created = model.objects.get_or_create(email=email, defaults=self.kwargs)
+        if created and self.on_create:
             self.on_create(user, self.request, self.payload)
         return user
 
@@ -81,7 +81,7 @@ class UserHandler:
         user_modified_at = getattr(user, settings.OIDC_USER_MODIFIED_FIELD, None)
         if user_modified_at:
             if not user_modified_at.tzinfo:
-                user_modified_at = utc.localize(user_modified_at)
+                user_modified_at = user_modified_at.replace(tzinfo=utc)
             is_modified = user_modified_at < self.modified_at
 
             log.info(

tests/test.py

@@ -1,8 +1,7 @@
-from datetime import datetime
+from datetime import datetime, timezone
 from http import HTTPStatus
 from unittest.mock import Mock, patch
 
-import pytz
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group, Permission
 from django.test import TestCase
@@ -14,7 +13,7 @@ from django_jwt.middleware import JWTAuthMiddleware
 from django_jwt.roles import ROLE
 from django_jwt.user import role_handler
 
-utc = pytz.UTC
+utc = timezone.utc
 access_token_payload = {
     "sub": "1234",
     "updated_at": 2687276498,
@@ -185,7 +184,7 @@ class OIDCHandlerTest(TestCase):
         - don't call userdata if updated_at is not changed
         """
 
-        updated_at = utc.localize(datetime.fromtimestamp(access_token_payload["updated_at"]))
+        updated_at = datetime.fromtimestamp(access_token_payload["updated_at"], utc)
         user = User.objects.create(kc_id="1234", first_name="", last_name="", username="")
 
         self.middleware.process_request(self.request)