dj-jwt-auth 1.5.0__py3-none-any.whl → 1.5.2__py3-none-any.whl

{dj_jwt_auth-1.5.0.dist-info → dj_jwt_auth-1.5.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dj-jwt-auth
-Version: 1.5.0
+Version: 1.5.2
 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.0.dist-info → dj_jwt_auth-1.5.2.dist-info}/RECORD

@@ -5,15 +5,15 @@ django_jwt/middleware.py,sha256=4PiF0-v13aLjvTyeyumQqYFimb6gCDHBgm6KooPGZdM,1176
 django_jwt/pkce.py,sha256=HYIQI0vKSmQkYIqTj3cciIT01ldkjhqlYiXkYcnNSGc,711
 django_jwt/roles.py,sha256=SaHK3o8T8USS4ZhG4SrHPlZQV2lMb2t1UZHT6IQtBvA,143
 django_jwt/settings.py,sha256=gJePa3ER0vY6k5sDk-L1VagjbF4_dYrP0zrRJkGNY6Y,1708
-django_jwt/urls.py,sha256=PmNoMxcVg_1oCDHHQJFAcPxhPAOkiMhd4PFnS-Q3JLA,326
-django_jwt/user.py,sha256=WmrSDIz6c5U9sfX0t-XJN3w1bOmsZH-xSTmK1X9BNRA,5241
+django_jwt/urls.py,sha256=ZhcnRcQ1MBRh-bS7fTa-Vkz8yuWUhv-G_uRXKLnKAs0,320
+django_jwt/user.py,sha256=lQ7AIdI4J-d2e1oCQIIyQKnXtjqCYD14e4WOhF2LbYs,5292
 django_jwt/utils.py,sha256=Gz8cH0cD3y_cvW8FwRoCFgShBrYvcB7XBF0GWx0n2qQ,1485
 django_jwt/views.py,sha256=LweS9G_NBeiuVDLhtm_GtOi_Ok6Sz5KJVTU62k91Jcg,4352
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/models.py,sha256=K5e0QCgyZeLLHS6i3KRMQHooql47g7qqni7f9tKQrIY,251
-tests/test.py,sha256=g1Itea87V6hqnK3FGX_nSq0znLRFxPW6WDNTuxYPf3M,8785
+tests/models.py,sha256=4uonwXuAvJGlITpuxFazyoeA_CSUYMyN7Vj1gEWJTH4,308
+tests/test.py,sha256=nD1sm_nH0l9ADnwavySPdhgrNOvLX7nLYol7w306TFU,9720
 tests/urls.py,sha256=D5FhDSVAudurkrpkCZZPnDvgXSgifwFVB3nAlYBg7uQ,212
-dj_jwt_auth-1.5.0.dist-info/METADATA,sha256=AktxVxd6quOwSseEepUpp7BiiBspNSmEnLwTUVS7nHg,4369
-dj_jwt_auth-1.5.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-dj_jwt_auth-1.5.0.dist-info/top_level.txt,sha256=58O7TdK-yECZcbmPc52KNlBFpjIUlENuZubCxaSOxus,17
-dj_jwt_auth-1.5.0.dist-info/RECORD,,
+dj_jwt_auth-1.5.2.dist-info/METADATA,sha256=TPUgNAgkafofn_j27WQW6uJaxUg4heRRnqk_fvspdgE,4369
+dj_jwt_auth-1.5.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+dj_jwt_auth-1.5.2.dist-info/top_level.txt,sha256=58O7TdK-yECZcbmPc52KNlBFpjIUlENuZubCxaSOxus,17
+dj_jwt_auth-1.5.2.dist-info/RECORD,,

django_jwt/urls.py

@@ -4,6 +4,6 @@ from django_jwt import views
 
 urlpatterns = [
     path("oidc/callback/", views.ReceiveRedirectView.as_view(), name="receive_redirect_view"),
-    path("oidc/logout/", views.silent_sso_check, name="silent_sso_check"),
+    path("oidc/logout/", views.LogoutView.as_view(), name="logout"),
     path("oidc/", views.StartOIDCAuthView.as_view(), name="start_oidc_auth"),
 ]

django_jwt/user.py

@@ -43,21 +43,20 @@ class UserHandler:
         """Collect user data from KeyCloak"""
 
         user_data = oidc_handler.get_user_info(self.access_token)
+        log.info(f"User data: {self.kwargs}, access_token: {self.access_token}")
         self.kwargs["email"] = user_data["email"].lower()
         self.kwargs.update(mapper(user_data))
-        log.info(f"User data: {self.kwargs}, access_token: {self.access_token}")
 
     def _update_user(self, user):
         """Update user fields if they are changed"""
 
-        is_changed = False
         self._collect_user_data()
+        if hasattr(user, settings.OIDC_USER_MODIFIED_FIELD):
+            self.kwargs[settings.OIDC_USER_MODIFIED_FIELD] = self.modified_at
         for key, val in self.kwargs.items():
             if getattr(user, key) != val:
                 setattr(user, key, val)
-                is_changed = True
-        if is_changed:
-            user.save(update_fields=self.kwargs.keys())
+        user.save(update_fields=self.kwargs.keys())
 
     def _create_new_user(self) -> model:
         """Create new user if user is not found in database even by email."""

tests/models.py

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

tests/test.py

@@ -1,9 +1,11 @@
+from datetime import datetime
 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, override_settings
+from django.test import TestCase
 from django.urls import reverse
 from jwt.api_jwt import ExpiredSignatureError
 
@@ -12,6 +14,7 @@ from django_jwt.middleware import JWTAuthMiddleware
 from django_jwt.roles import ROLE
 from django_jwt.user import role_handler
 
+utc = pytz.UTC
 access_token_payload = {
     "sub": "1234",
     "updated_at": 2687276498,
@@ -52,7 +55,7 @@ class OIDCHandlerTest(TestCase):
     def setUp(self):
         self.middleware = JWTAuthMiddleware(get_response=lambda x: x)
         self.request = Mock()
-        self.request.META = {"HTTP_AUTHORIZATION": "Bearer 1234"}
+        self.request.META = {"HTTP_AUTHORIZATION": "Bearer Token"}
         settings.OIDC_USER_MAPPING = {  # default mapping
             "given_name": "first_name",
             "family_name": "last_name",
@@ -166,6 +169,27 @@ class OIDCHandlerTest(TestCase):
         self.middleware.process_request(self.request)
         self.assertEqual(self.request.user.username, "override")
 
+    def test_updated_at(self, access_token, user_info):
+        """Check that
+        - the updated_at field saved correct
+        - don't call userdata if updated_at is not changed
+        """
+
+        updated_at = utc.localize(datetime.fromtimestamp(access_token_payload["updated_at"]))
+        user = User.objects.create(kc_id="1234", first_name="", last_name="", username="")
+
+        self.middleware.process_request(self.request)
+        self.assertEqual(self.request.user, user)
+        user.refresh_from_db()
+        self.assertEqual(user.modified_timestamp, updated_at)
+        self.assertEqual(user.username, user_info_payload["name"])
+        self.assertEqual(user_info.call_count, 1)
+
+        self.middleware.process_request(self.request)
+        user.refresh_from_db()
+        self.assertEqual(user.modified_timestamp, updated_at)
+        # self.assertEqual(user_info.call_count, 1)
+
 
 class RolesTest(TestCase):
     def setUp(self) -> None: