dj-jwt-auth 1.5.6__tar.gz → 1.5.8__tar.gz

{dj-jwt-auth-1.5.6 → dj-jwt-auth-1.5.8}/PKG-INFO

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dj-jwt-auth
-Version: 1.5.6
+Version: 1.5.8
 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.6 → dj-jwt-auth-1.5.8}/django_jwt/pkce.py

@@ -1,14 +1,14 @@
 import base64
 import hashlib
-import random
-import string
+
+from django_jwt.utils import get_random_string
 
 
 class PKCESecret:
     """PKCE secret."""
 
     def __init__(self, length: int = 128):
-        self.value = "".join(random.choices(string.ascii_letters + string.digits, k=length))
+        self.value = get_random_string(length)
 
     def __str__(self) -> str:
         return self.value

{dj-jwt-auth-1.5.6 → dj-jwt-auth-1.5.8}/django_jwt/settings.py

@@ -42,8 +42,11 @@ OIDC_ADMIN_ISSUER = getattr(settings, "OIDC_ADMIN_ISSUER", None)
 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", [])
+OIDC_ADMIN_REDIRECT_URI = getattr(settings, "OIDC_ADMIN_REDIRECT_URI", None)
 OIDC_AUTHORIZATION_BACKEND = getattr(
-    settings, "OIDC_AUTHORIZATION_BACKEND", "django.contrib.auth.backends.ModelBackend",
+    settings,
+    "OIDC_AUTHORIZATION_BACKEND",
+    "django.contrib.auth.backends.ModelBackend",
 )
 
 if not OIDC_ADMIN_ISSUER:

{dj-jwt-auth-1.5.6 → dj-jwt-auth-1.5.8}/django_jwt/user.py

@@ -43,7 +43,7 @@ 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}")
+        log.info(f"User data: {user_data}, access_token: {self.access_token}")
         self.kwargs["email"] = user_data["email"].lower()
         self.kwargs.update(mapper(user_data))
 

{dj-jwt-auth-1.5.6 → dj-jwt-auth-1.5.8}/django_jwt/utils.py

@@ -1,5 +1,7 @@
 import base64
 import json
+import random
+import string
 
 import jwt
 import requests
@@ -8,6 +10,10 @@ from django_jwt import settings
 from django_jwt.config import config
 
 
+def get_random_string(k: int = 32) -> str:
+    return "".join(random.choices(string.ascii_letters + string.digits + "-._~", k=k))
+
+
 def get_alg(token: str) -> str:
     header = json.loads(base64.b64decode(token.split(".")[0] + "==="))
     return header["alg"]

{dj-jwt-auth-1.5.6 → dj-jwt-auth-1.5.8}/django_jwt/views.py

@@ -1,10 +1,7 @@
 import base64
-import random
-import string
 from logging import getLogger
 from urllib.parse import urlencode
 
-from django.conf import settings
 from django.contrib.auth import login
 from django.core.cache import cache
 from django.http.response import HttpResponse
@@ -18,7 +15,7 @@ from django_jwt.config import config
 from django_jwt.exceptions import BadRequestException, ConfigException
 from django_jwt.pkce import PKCESecret
 from django_jwt.user import UserHandler, role_handler
-from django_jwt.utils import get_access_token, oidc_handler
+from django_jwt.utils import get_access_token, get_random_string, oidc_handler
 
 log = getLogger(__name__)
 
@@ -60,12 +57,11 @@ class AbsView(View):
 class StartOIDCAuthView(AbsView):
     def get(self, request):
         pkce_secret = PKCESecret()
-        redirect_uri = request.build_absolute_uri(reverse("receive_redirect_view"))
+        redirect_uri = jwt_settings.OIDC_ADMIN_REDIRECT_URI
+        if not redirect_uri:
+            redirect_uri = request.build_absolute_uri(reverse("receive_redirect_view"))
         authorization_endpoint = config.admin().get("authorization_endpoint")
-        state = base64.urlsafe_b64encode(
-            "".join(random.choices(string.ascii_letters + string.digits + "-._~", k=32)).encode()
-        ).decode()
-        random_nonce = "".join(random.choices(string.ascii_letters + string.digits + "-._~", k=32))
+        state = base64.urlsafe_b64encode(get_random_string().encode()).decode()
         params = {
             "client_id": jwt_settings.OIDC_ADMIN_CLIENT_ID,
             "redirect_uri": redirect_uri,
@@ -75,7 +71,7 @@ class StartOIDCAuthView(AbsView):
             "code_challenge": pkce_secret.challenge,
             "code_challenge_method": pkce_secret.challenge_method,
             "ui_locales": "en",
-            "nonce": random_nonce,
+            "nonce": get_random_string(),
         }
         cache.set(state, str(pkce_secret), timeout=600)
         log.info(f"OIDC Admin login: {authorization_endpoint}?{urlencode(params)}")

{dj-jwt-auth-1.5.6 → dj-jwt-auth-1.5.8}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = dj-jwt-auth
-version = 1.5.6
+version = 1.5.8
 description = A Django package for JSON Web Token validation and verification. Using PyJWT.
 long_description = file: README.md
 url = https://www.example.com/