dj-jwt-auth 1.3.1__py3-none-any.whl → 1.4.0__py3-none-any.whl

{dj_jwt_auth-1.3.1.dist-info → dj_jwt_auth-1.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dj-jwt-auth
-Version: 1.3.1
+Version: 1.4.0
 Summary: A Django package for JSON Web Token validation and verification. Using PyJWT.
 Home-page: https://www.example.com/
 Author: Konstantin Seleznev
@@ -69,6 +69,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.1.dist-info → dj_jwt_auth-1.4.0.dist-info}/RECORD

@@ -4,16 +4,16 @@ django_jwt/exceptions.py,sha256=vFJcGOCSZvxJRbSeMgWgPUM9wcXu6CSHblpwMzhV-Ic,198
 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=HnuHNoM3H5sGfDRc9hvXZDa9iTyleMNrN9Ted5KmFRk,1474
+django_jwt/settings.py,sha256=NhA0froKOtkAD4QeO1TpEHdEPY-7z85wue9ceA8-sJ4,1552
 django_jwt/urls.py,sha256=OoKbJ2kf41tuDBnVjK5TTW4aVt9bhRaz59HFlUOAins,251
-django_jwt/user.py,sha256=_ZZdfAFdQeScMmWwkrzo-5XjTKMVCbmfK4FPpiCbaQQ,5021
+django_jwt/user.py,sha256=dTsB95TBgbqZLKMjKPSl9MiXgrJkdEyayh6f211wbwI,4930
 django_jwt/utils.py,sha256=Gz8cH0cD3y_cvW8FwRoCFgShBrYvcB7XBF0GWx0n2qQ,1485
 django_jwt/views.py,sha256=Mwcd70Qrp5aeZYgXWBMzkm8DD01Tf1nAVlfq6wIlhQY,3705
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models.py,sha256=K5e0QCgyZeLLHS6i3KRMQHooql47g7qqni7f9tKQrIY,251
-tests/test.py,sha256=uZz9eG1nC1CljITD6K79Ruodtr8SDPEnBSt_5GOLVSc,7460
+tests/test.py,sha256=OzfDEIgbDZvCinV_terIYEYjq7vPvhQQIqa0qgQNtxo,7405
 tests/urls.py,sha256=D5FhDSVAudurkrpkCZZPnDvgXSgifwFVB3nAlYBg7uQ,212
-dj_jwt_auth-1.3.1.dist-info/METADATA,sha256=EurjeCr-WQKFOZcAmjOs2p7Q7afp0KTWXfGQUK_0U04,3994
-dj_jwt_auth-1.3.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-dj_jwt_auth-1.3.1.dist-info/top_level.txt,sha256=58O7TdK-yECZcbmPc52KNlBFpjIUlENuZubCxaSOxus,17
-dj_jwt_auth-1.3.1.dist-info/RECORD,,
+dj_jwt_auth-1.4.0.dist-info/METADATA,sha256=Qhd171r14xnZhnRUCktDQJFQMjQ_wuA8ZnabpkxG7K8,4073
+dj_jwt_auth-1.4.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+dj_jwt_auth-1.4.0.dist-info/top_level.txt,sha256=58O7TdK-yECZcbmPc52KNlBFpjIUlENuZubCxaSOxus,17
+dj_jwt_auth-1.4.0.dist-info/RECORD,,

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,
@@ -38,7 +39,7 @@ OIDC_USER_ON_UPDATE = getattr(
 
 OIDC_CONFIG_ROUTES = getattr(settings, "OIDC_CONFIG_ROUTES", None)
 OIDC_ADMIN_ISSUER = getattr(settings, "OIDC_ADMIN_ISSUER", None)
-OIDC_ADMIN_CLIENT_ID = getattr(settings, "OIDC_ADMIN_CLIENT_ID", "complete-anatomy")
+OIDC_ADMIN_CLIENT_ID = getattr(settings, "OIDC_ADMIN_CLIENT_ID", "cs-completeanatomy-admin")
 OIDC_ADMIN_SCOPE = getattr(settings, "OIDC_ADMIN_SCOPE", "openid")
 OIDC_ADMIN_ROLES = getattr(settings, "OIDC_ADMIN_ROLES", [])
 

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

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