dj-jwt-auth 1.5.1__tar.gz → 1.5.2__tar.gz

{dj-jwt-auth-1.5.1 → dj-jwt-auth-1.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dj-jwt-auth
-Version: 1.5.1
+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.1 → dj-jwt-auth-1.5.2}/dj_jwt_auth.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dj-jwt-auth
-Version: 1.5.1
+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.1 → dj-jwt-auth-1.5.2}/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"),
 ]

{dj-jwt-auth-1.5.1 → dj-jwt-auth-1.5.2}/django_jwt/user.py

@@ -50,14 +50,13 @@ class UserHandler:
     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."""

{dj-jwt-auth-1.5.1 → dj-jwt-auth-1.5.2}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = dj-jwt-auth
-version = 1.5.1
+version = 1.5.2
 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.1 → dj-jwt-auth-1.5.2}/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)

{dj-jwt-auth-1.5.1 → dj-jwt-auth-1.5.2}/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: