dj-jwt-auth 1.3.2__tar.gz → 1.4.1__tar.gz

{dj-jwt-auth-1.3.2 → dj-jwt-auth-1.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dj-jwt-auth
-Version: 1.3.2
+Version: 1.4.1
 Summary: A Django package for JSON Web Token validation and verification. Using PyJWT.
 Home-page: https://www.example.com/
 Author: Konstantin Seleznev
@@ -65,6 +65,7 @@ User retated variables:
 - OIDC_USER_MODIFIED_FIELD - user model field to store last modified date, by default `modified_timestamp`
 - OIDC_TOKEN_MODIFIED_FIELD - access token field to store last modified date, by default `updated_at`
 - OIDC_USER_UID - User model" unique identifier, by default `kc_id`
+- OIDC_TOKEN_USER_UID - access token field to store user UID, by default `sub`
 - OIDC_USER_MAPPING - mapping between JWT claims and user model fields, by default:
 ```
     OIDC_USER_MAPPING = {

{dj-jwt-auth-1.3.2 → dj-jwt-auth-1.4.1}/README.md

@@ -41,6 +41,7 @@ User retated variables:
 - OIDC_USER_MODIFIED_FIELD - user model field to store last modified date, by default `modified_timestamp`
 - OIDC_TOKEN_MODIFIED_FIELD - access token field to store last modified date, by default `updated_at`
 - OIDC_USER_UID - User model" unique identifier, by default `kc_id`
+- OIDC_TOKEN_USER_UID - access token field to store user UID, by default `sub`
 - OIDC_USER_MAPPING - mapping between JWT claims and user model fields, by default:
 ```
     OIDC_USER_MAPPING = {

{dj-jwt-auth-1.3.2 → dj-jwt-auth-1.4.1}/dj_jwt_auth.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dj-jwt-auth
-Version: 1.3.2
+Version: 1.4.1
 Summary: A Django package for JSON Web Token validation and verification. Using PyJWT.
 Home-page: https://www.example.com/
 Author: Konstantin Seleznev
@@ -65,6 +65,7 @@ User retated variables:
 - OIDC_USER_MODIFIED_FIELD - user model field to store last modified date, by default `modified_timestamp`
 - OIDC_TOKEN_MODIFIED_FIELD - access token field to store last modified date, by default `updated_at`
 - OIDC_USER_UID - User model" unique identifier, by default `kc_id`
+- OIDC_TOKEN_USER_UID - access token field to store user UID, by default `sub`
 - OIDC_USER_MAPPING - mapping between JWT claims and user model fields, by default:
 ```
     OIDC_USER_MAPPING = {

{dj-jwt-auth-1.3.2 → dj-jwt-auth-1.4.1}/django_jwt/settings.py

@@ -8,6 +8,7 @@ OIDC_CONFIG_URL = getattr(settings, "OIDC_CONFIG_URL", None)
 OIDC_USER_UPDATE = getattr(settings, "OIDC_USER_UPDATE", True)
 OIDC_USER_MODIFIED_FIELD = getattr(settings, "OIDC_USER_MODIFIED_FIELD", "modified_timestamp")
 OIDC_TOKEN_MODIFIED_FIELD = getattr(settings, "OIDC_TOKEN_MODIFIED_FIELD", "updated_at")
+OIDC_TOKEN_USER_UID = getattr(settings, "OIDC_TOKEN_USER_UID", "sub")
 OIDC_USER_UID = getattr(settings, "OIDC_USER_UID", "kc_id")
 OIDC_USER_MAPPING = getattr(
     settings,

{dj-jwt-auth-1.3.2 → dj-jwt-auth-1.4.1}/django_jwt/user.py

@@ -21,9 +21,8 @@ class UserHandler:
 
     def __init__(self, payload: dict, request: HttpRequest, access_token: str):
         # payload of access token without user info
-        # auth0_id should be available if auth0 added in Client Scopes in KeyCloak admin
         self.kwargs = settings.OIDC_USER_DEFAULTS.copy()
-        self.kwargs[settings.OIDC_USER_UID] = payload.get("auth0_id", payload["sub"])
+        self.kwargs[settings.OIDC_USER_UID] = payload[settings.OIDC_TOKEN_USER_UID]
 
         modified_at = payload.get(settings.OIDC_TOKEN_MODIFIED_FIELD, None)
         if modified_at and isinstance(modified_at, int):
@@ -42,6 +41,7 @@ class UserHandler:
         self.kwargs.update(
             {ca_key: user_data[kc_key] for kc_key, ca_key in settings.OIDC_USER_MAPPING.items() if kc_key in 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"""

{dj-jwt-auth-1.3.2 → dj-jwt-auth-1.4.1}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = dj-jwt-auth
-version = 1.3.2
+version = 1.4.1
 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.3.2 → dj-jwt-auth-1.4.1}/tests/test.py

@@ -13,13 +13,11 @@ from django_jwt.user import role_handler
 from django_jwt.roles import ROLE
 
 access_token_payload = {
-    "sub": "12345",
-    "auth0_id": "1234",
+    "sub": "1234",
     "updated_at": 2687276498,
 }
 user_info_payload = {
-    "sub": "12345",
-    "auth0_id": "1234",
+    "sub": "1234",
     "email": "example@bk.com",
     "name": "UserName",
     "given_name": "1st name",
@@ -51,7 +49,7 @@ class OIDCHandlerTest(TestCase):
         self.assertEqual(self.request.user.last_name, user_info_payload["family_name"])
         self.assertEqual(self.request.user.username, user_info_payload["name"])
         self.assertEqual(self.request.user.email, user_info_payload["email"])
-        self.assertEqual(self.request.user.kc_id, user_info_payload["auth0_id"])
+        self.assertEqual(self.request.user.kc_id, user_info_payload["sub"])
 
     def test_keycloak_new_user(self, *_):
         """User is created if it doesn't exist in database"""