dj-jwt-auth 1.9.4__py3-none-any.whl → 1.9.6__py3-none-any.whl

{dj_jwt_auth-1.9.4.dist-info → dj_jwt_auth-1.9.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dj-jwt-auth
-Version: 1.9.4
+Version: 1.9.6
 Summary: A Django package for JSON Web Token validation and verification. Using PyJWT.
 Home-page: https://www.example.com/
 Author: Konstantin Seleznev
@@ -102,12 +102,9 @@ OR
 These functions should accept two arguments: user and request.
 
 ### Admin panel integration:
-To integrate admin panel with OIDC, add OIDC_ADMIN_ISSUER and OIDC_ADMIN_CLIENT_ID to settings.
-- OIDC_ADMIN_ISSUER - for admin-panel access through OIDC. By default will be used 'ES256' from OIDC_CONFIG_ROUTES. Example: 
-```
-    OIDC_ADMIN_ISSUER = "https://keyCloak/realms/h/.well-known/openid-configuration"
-```
+To integrate admin panel with OIDC, add OIDC_ADMIN_CLIENT_ID to settings. Example:
 - OIDC_ADMIN_CLIENT_ID - by default "complete-anatomy"
+By default will be used 'ES256' from OIDC_CONFIG_ROUTES as Issuer.
 To mapping roles to admin panel permissions, use OIDC_ADMIN_ROLES. Example:
 
 ```python

{dj_jwt_auth-1.9.4.dist-info → dj_jwt_auth-1.9.6.dist-info}/RECORD

@@ -1,21 +1,21 @@
 django_jwt/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-django_jwt/config.py,sha256=zPPlRw1tvE-DQGk0Q3avZmrYVG98GM9vigK1GqDAQeE,1703
+django_jwt/config.py,sha256=rJTLgFo42iuxZ4pk2tecmlp2fKcyX7QDDsOrnEKjC6c,1506
 django_jwt/exceptions.py,sha256=S8HeH_lu8XSsejhyW0qkl04MmXxxbN4-zrtyPywbBwc,311
 django_jwt/middleware.py,sha256=jk3M9qumI0p4rVvmkZM1jAf5xzaVl5FmAqrR-jAO_Po,1288
 django_jwt/pkce.py,sha256=j-v2ffCw0X3JW7ak8vfNeSZI-dACOvHbi1eLmJ0R8gM,685
 django_jwt/roles.py,sha256=SaHK3o8T8USS4ZhG4SrHPlZQV2lMb2t1UZHT6IQtBvA,143
-django_jwt/settings.py,sha256=e7-ghBcQAUXZXO8td4ZaGH5VvpYY5zPxJmGQLR9-NSM,1923
+django_jwt/settings.py,sha256=N3v8B4lEM-bGLmAhXhF7hOfdcjKn6afbxDFx7CETcD0,1769
 django_jwt/urls.py,sha256=ZhcnRcQ1MBRh-bS7fTa-Vkz8yuWUhv-G_uRXKLnKAs0,320
 django_jwt/user.py,sha256=v2oCoAThstFg5x5cOA9nSKlYWZzCEqhFbz63WGhE_NM,6382
-django_jwt/utils.py,sha256=E_D_GxIVmKQYHzKTMEWPqR1zV4l0q40vPolxhcDGQdk,1641
-django_jwt/views.py,sha256=WG1xtflDEKbH0LnRiZXPmwCeIxj-B31VgI_4_OoCXlc,4754
+django_jwt/utils.py,sha256=aZBCcGKpxA3rIye2DFEvNWrAmShYtS9Ku9tSc2D1T3k,1685
+django_jwt/views.py,sha256=RcVoLgMeKuaKxDWipFc3RFAgxHqvJ_qwhkb0EjH-Mlg,4852
 django_jwt/templates/django-jwt-index.html,sha256=y8f0v2WbRAFxnIU799I_MZCVsjn1sbdh7bypjdWB0lA,1353
 django_jwt/templates/admin/login.html,sha256=Nihyu0IGvDDZVvQDITXozwlj6XCQ0B8gqlyHLqVNyJc,275
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models.py,sha256=jhoJcCEsx5B9AibmoLQLDD3cEsyYzYy6dMdYhRnBVFo,338
 tests/test.py,sha256=HEy5DsEYrPmtWSdeDhgdeV2tZTYlepaWt82VoTBrta8,11828
 tests/urls.py,sha256=D5FhDSVAudurkrpkCZZPnDvgXSgifwFVB3nAlYBg7uQ,212
-dj_jwt_auth-1.9.4.dist-info/METADATA,sha256=3muLrnOkU5lsNtEK93A6PsfUwQI7eQPg7dNTZrt0QRM,4416
-dj_jwt_auth-1.9.4.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-dj_jwt_auth-1.9.4.dist-info/top_level.txt,sha256=58O7TdK-yECZcbmPc52KNlBFpjIUlENuZubCxaSOxus,17
-dj_jwt_auth-1.9.4.dist-info/RECORD,,
+dj_jwt_auth-1.9.6.dist-info/METADATA,sha256=dOvBDqstn_4LI-Ba2XMF729FEXH7N0WAlfynorOu4ok,4251
+dj_jwt_auth-1.9.6.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+dj_jwt_auth-1.9.6.dist-info/top_level.txt,sha256=58O7TdK-yECZcbmPc52KNlBFpjIUlENuZubCxaSOxus,17
+dj_jwt_auth-1.9.6.dist-info/RECORD,,

django_jwt/config.py

@@ -1,4 +1,5 @@
 import json
+from enum import StrEnum
 from functools import cache
 from urllib.parse import urljoin
 
@@ -9,6 +10,11 @@ from django_jwt import settings
 from django_jwt.exceptions import AlgorithmNotSupportedException, ConfigException
 
 
+class SupportedAlgorithms(StrEnum):
+    ES256 = "ES256"
+    RS256 = "RS256"
+
+
 def ensure_well_known(url: str) -> str:
     if url.endswith(".well-known/openid-configuration"):
         return url
@@ -42,13 +48,5 @@ class Config:
                 algorithm = RSAAlgorithm if key_data["kty"] == "RSA" else ECAlgorithm
                 return algorithm.from_jwk(json.dumps(key_data))
 
-    @cache
-    def admin(self) -> dict:
-        if settings.OIDC_ADMIN_ISSUER:
-            response = requests.get(ensure_well_known(settings.OIDC_ADMIN_ISSUER))
-            response.raise_for_status()
-            return response.json()
-        raise ConfigException("OIDC_ADMIN_ISSUER is not set")
-
 
 config = Config()

django_jwt/settings.py

@@ -38,7 +38,6 @@ OIDC_USER_ON_UPDATE = getattr(
 )
 
 OIDC_CONFIG_ROUTES = getattr(settings, "OIDC_CONFIG_ROUTES", {})
-OIDC_ADMIN_ISSUER = getattr(settings, "OIDC_ADMIN_ISSUER", None)
 OIDC_ADMIN_CLIENT_ID = getattr(settings, "OIDC_ADMIN_CLIENT_ID", "gme-completeanatomy-admin")
 OIDC_ADMIN_SCOPE = getattr(settings, "OIDC_ADMIN_SCOPE", "openid")
 OIDC_ADMIN_ROLES = getattr(settings, "OIDC_ADMIN_ROLES", [])
@@ -49,9 +48,6 @@ OIDC_AUTHORIZATION_BACKEND = getattr(
     "django.contrib.auth.backends.ModelBackend",
 )
 
-if not OIDC_ADMIN_ISSUER:
-    OIDC_ADMIN_ISSUER = OIDC_CONFIG_ROUTES.get("ES256", None)
-
 for role in OIDC_ADMIN_ROLES:
     assert isinstance(role, ROLE), f"Role must be a namedtuple, got {type(role)}"
 

django_jwt/utils.py

@@ -7,7 +7,7 @@ import jwt
 import requests
 
 from django_jwt import settings
-from django_jwt.config import config
+from django_jwt.config import config, SupportedAlgorithms
 
 
 def get_random_string(k: int = 32) -> str:
@@ -20,7 +20,7 @@ def get_alg(token: str) -> str:
 
 
 def get_access_token(code: str, redirect_uri: str, pkce_secret: str, client_id: str) -> str:
-    token_endpoint = config.admin().get("token_endpoint")
+    token_endpoint = config.cfg(SupportedAlgorithms.ES256).get("token_endpoint")
     data = {
         "grant_type": "authorization_code",
         "client_id": client_id,

django_jwt/views.py

@@ -11,7 +11,7 @@ from django.views import View
 from requests.exceptions import HTTPError
 
 from django_jwt import settings as jwt_settings
-from django_jwt.config import config
+from django_jwt.config import SupportedAlgorithms, config
 from django_jwt.exceptions import BadRequestException, ConfigException
 from django_jwt.pkce import PKCESecret
 from django_jwt.user import UserHandler, role_handler
@@ -25,7 +25,7 @@ def silent_sso_check(request):
 
 
 def index_response(request, msg, status=400):
-    logout_url = config.admin().get("end_session_endpoint")
+    logout_url = config.cfg(SupportedAlgorithms.ES256).get("end_session_endpoint")
     return render(
         request,
         "django-jwt-index.html",
@@ -44,11 +44,12 @@ class InitiateView(View):
     client_id = None
     scope = "openid"
     params = {}
+    algorithm = SupportedAlgorithms.ES256
 
     def get(self, request):
         pkce_secret = PKCESecret()
         redirect_uri = request.build_absolute_uri(reverse(self.callback_view_name))
-        authorization_endpoint = config.admin().get("authorization_endpoint")
+        authorization_endpoint = config.cfg(self.algorithm).get("authorization_endpoint")
         state = base64.urlsafe_b64encode(get_random_string().encode()).decode()
         self.params = {
             "client_id": self.client_id,