cardo-python-utils 0.5.dev54__tar.gz → 0.5.dev56__tar.gz

{cardo_python_utils-0.5.dev54/cardo_python_utils.egg-info → cardo_python_utils-0.5.dev56}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cardo-python-utils
-Version: 0.5.dev54
+Version: 0.5.dev56
 Summary: Python library enhanced with a wide range of functions for different scenarios.
 Author-email: CardoAI <hello@cardoai.com>
 License: MIT

{cardo_python_utils-0.5.dev54 → cardo_python_utils-0.5.dev56/cardo_python_utils.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cardo-python-utils
-Version: 0.5.dev54
+Version: 0.5.dev56
 Summary: Python library enhanced with a wide range of functions for different scenarios.
 Author-email: CardoAI <hello@cardoai.com>
 License: MIT

{cardo_python_utils-0.5.dev54 → cardo_python_utils-0.5.dev56}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cardo-python-utils"
-version = "0.5.dev54"
+version = "0.5.dev56"
 description = "Python library enhanced with a wide range of functions for different scenarios."
 readme = "README.rst"
 requires-python = ">=3.8"

{cardo_python_utils-0.5.dev54 → cardo_python_utils-0.5.dev56}/python_utils/django/README.md

@@ -10,8 +10,6 @@ This package provides utilities for facilitating IDP communication and multi-ten
 - DATABASE_CONFIG
   - A JSON dictionary where each key is the tenant name and the value is a dict with the datase config.
   - If multiple 'DATABASE_CONFIG'-prefixed variables are set, they will be merged into a single dictionary.
-- KEYCLOAK_SERVER_URL
-  - The URL of the Keycloak deployment
 - KEYCLOAK_CONFIDENTIAL_CLIENT_ID
   - The id of the confidential client of the backend service
 - KEYCLOAK_CONFIDENTIAL_CLIENT_SERVICE_ACCOUNT_TOKEN_FILE_PATHS

{cardo_python_utils-0.5.dev54 → cardo_python_utils-0.5.dev56}/python_utils/django/api/ninja.py

@@ -6,7 +6,7 @@ from jwt.exceptions import ExpiredSignatureError, InvalidTokenError, PyJWKClient
 from django.conf import settings
 from django.http import HttpRequest
 from ninja.security import HttpBearer
-from ninja.errors import AuthenticationError, AuthorizationError, HttpError
+from ninja.errors import AuthenticationError, HttpError
 
 from .utils import (
     acreate_or_update_user,
@@ -64,13 +64,13 @@ class AuthBearer(HttpBearer):
         except ExpiredSignatureError as e:
             raise AuthenticationError("Token has expired.") from e
         except (InvalidTokenError, PyJWKClientError) as e:
-            raise AuthorizationError(f"Invalid token: {str(e)}") from e
+            raise AuthenticationError(f"Invalid token: {str(e)}") from e
 
     def _get_username(self, payload: TokenPayload) -> str:
         try:
             return payload["preferred_username"]
         except KeyError as e:
-            raise AuthorizationError("Invalid token: 'preferred_username' claim not present.") from e
+            raise AuthenticationError("Invalid token: 'preferred_username' claim not present.") from e
 
     def _verify_scopes(self, request, token_payload):
         allowed_scopes = self._get_view_allowed_scopes(request)

{cardo_python_utils-0.5.dev54 → cardo_python_utils-0.5.dev56}/python_utils/django/auth/service.py

@@ -6,8 +6,8 @@ from keycloak import KeycloakOpenIDConnection
 from keycloak.exceptions import KeycloakGetError
 
 from ..oidc_settings import (
-    KEYCLOAK_SERVER_URL,
     KEYCLOAK_CONFIDENTIAL_CLIENT_ID,
+    get_keycloak_server_url,
     get_oidc_confidential_client_token,
 )
 from ..tenant_context import TenantContext
@@ -70,7 +70,7 @@ class KeycloakService:
         tenant = TenantContext.get()
 
         keycloak_connection = KeycloakOpenIDConnection(
-            server_url=KEYCLOAK_SERVER_URL,
+            server_url=get_keycloak_server_url(),
             realm_name=tenant,
             user_realm_name=tenant,
             client_id=KEYCLOAK_CONFIDENTIAL_CLIENT_ID,

{cardo_python_utils-0.5.dev54 → cardo_python_utils-0.5.dev56}/python_utils/django/oidc_settings.py

@@ -12,7 +12,7 @@ from django.conf import settings
 from .tenant_context import TenantContext
 
 
-KEYCLOAK_SERVER_URL = os.getenv("KEYCLOAK_SERVER_URL", None)
+KEYCLOAK_SERVER_URL_TEMPLATE = os.getenv("KEYCLOAK_SERVER_URL_TEMPLATE", "https://keycloak.{realm}.company.com")
 KEYCLOAK_CONFIDENTIAL_CLIENT_ID = os.getenv("KEYCLOAK_CONFIDENTIAL_CLIENT_ID", None)
 
 OIDC_CLIENT_AUTH_METHOD = getattr(settings, "OIDC_CLIENT_AUTH_METHOD", "client_assertion")
@@ -45,11 +45,17 @@ def get_realm_for_tenant(tenant: str) -> str:
     return TENANT_REALM_MAPPING.get(tenant, tenant)
 
 
+def get_keycloak_server_url() -> str:
+    """Get the Keycloak server URL for the current tenant."""
+
+    return KEYCLOAK_SERVER_URL_TEMPLATE.format(realm=get_realm_for_tenant(TenantContext.get()))
+
+
 def get_oidc_op_base_url() -> str:
     """Get the base URL for the OIDC provider (Keycloak realm URL)."""
 
     realm = get_realm_for_tenant(TenantContext.get())
-    return f"{KEYCLOAK_SERVER_URL}/realms/{realm}"
+    return f"{get_keycloak_server_url()}/realms/{realm}"
 
 
 def get_oidc_op_authorization_endpoint() -> str: