cardo-python-utils 0.5.dev55__py3-none-any.whl → 0.5.1__py3-none-any.whl

{cardo_python_utils-0.5.dev55.dist-info → cardo_python_utils-0.5.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cardo-python-utils
-Version: 0.5.dev55
+Version: 0.5.1
 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.dev55.dist-info → cardo_python_utils-0.5.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-cardo_python_utils-0.5.dev55.dist-info/licenses/LICENSE,sha256=N-YtxDy8n5A1Mo7JKKItNIlboiK_pMOZ48ojx76jo3g,1046
+cardo_python_utils-0.5.1.dist-info/licenses/LICENSE,sha256=N-YtxDy8n5A1Mo7JKKItNIlboiK_pMOZ48ojx76jo3g,1046
 python_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 python_utils/choices.py,sha256=_sLNkSnQqhg55gGKNRsOQCJ75W6gnz8J8Q00528MEYk,2548
 python_utils/data_structures.py,sha256=ZqkZYPy20zyGYOVhwb9qst4vF_P7X2A9z5E36rMUC6I,16820
@@ -24,8 +24,8 @@ python_utils/django/admin/views.py,sha256=D4Ez-RkZa_c7O8AN1ljosBBJWieSodrY2TAZ7-
 python_utils/django/admin/templates/__init__.py,sha256=LxCKcnJ1Ty48CFDJ8XtAZYTW45xDw5o7H4GLsRo6iQk,53
 python_utils/django/admin/templates/user_groups_changelist.html,sha256=KbO6bsH-nh3DDYCq4UB8j25NdjLP_nh_GuGZ4lYSarM,182
 python_utils/django/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-python_utils/django/api/drf.py,sha256=ar94uAVIaHDxzi3K7ubNSJDuysUWjV_xv0sFXtkJEuc,3101
-python_utils/django/api/ninja.py,sha256=Rz7331hYmKo4jyxtuvEKzOaNUjdmuCpXeHYkWGf0NsA,4863
+python_utils/django/api/drf.py,sha256=jYiOkU3laT_JnIMjyArn6-ILARq-UsLJIOm5v9NnyBc,3002
+python_utils/django/api/ninja.py,sha256=FnH0oAjznKAUVnGCSihiCwNmiH3FarTneqjPbH0wZo0,4793
 python_utils/django/api/utils.py,sha256=ycpSnTtGcfdGP1_Hk0P2c8ZNId70xOYtjx1m0nAUWRM,3465
 python_utils/django/auth/service.py,sha256=ggv_qc5B3vmoamoqLiEvU5XWJWcVr57rL0INz5826HE,7485
 python_utils/django/celery/__init__.py,sha256=eqKpBqhClH-7oK-kD1SUEpzt4Gqu7VWLWmhFUktee0A,79
@@ -44,7 +44,7 @@ python_utils/django/management/commands/showmigrations.py,sha256=mwNnL2EYAqX3iZ5
 python_utils/django/management/commands/tenant_aware_command.py,sha256=MBI7N0BEHZAhK183QmFjjEdDecM060O0nsxg0spH9Mc,2440
 python_utils/django/middleware/__init__.py,sha256=GyhuzaOtaXW13iB9GL0XF7OvEEzKoJzorJzYX597idA,117
 python_utils/django/middleware/tenant_aware_http_middleware.py,sha256=ifEkUtGtd9wEyBrPWzUhysSaUM2BkkNu8dnIpabhXI0,3950
-python_utils/django/middleware/tenant_aware_websocket_middleware.py,sha256=k6bn4pS4uZcTPafF7Yz_8VAj0vchEfJSXM4Bxb-Od-k,4100
+python_utils/django/middleware/tenant_aware_websocket_middleware.py,sha256=2zdrY6LcR8CSnOSaOu76r2gPJSL8nYv1RcWv2rLzueA,4333
 python_utils/django/migrations/0001_initial.py,sha256=j-y64JqkDv2A1o2YzJB9NE41KFOOiVmQn0-fv9A98WU,4841
 python_utils/django/migrations/0001_initial_squashed_0005_alter_userrole_id.py,sha256=PveIcroiawK2Mr4Vh0lsj5bjJfyaA98wdSfn_g53WZI,5803
 python_utils/django/migrations/0002_auto_20220120_1617.py,sha256=TOTmFU8wejKOX-bjq4D1s3B-QXTEub_FOX4STWAcJ4o,378
@@ -64,7 +64,7 @@ python_utils/django/storage/__init__.py,sha256=mNn2YmD7pkXhBLHMM1444BLsCMq78YdYx
 python_utils/django/storage/tenant_aware_storage.py,sha256=5dDes6xLv7_R8hIBbFIzRvPL7HL9K_RM-G6LI8qUSxM,2550
 python_utils/django/tests/__init__.py,sha256=Nkt0a7LEHyjLvuEBZ7113VjjAWJlyZlMy-H-JZ5tNcs,252
 python_utils/django/tests/conftest.py,sha256=KozXmXUWVcDLbkVAb7Aq4sDydGLh2YZkbRa4tkA8Z6U,3167
-cardo_python_utils-0.5.dev55.dist-info/METADATA,sha256=493CmMRlAB8Nmk60wyMjUXF6iNUuAVhs9dnOs4Qx3lU,3007
-cardo_python_utils-0.5.dev55.dist-info/WHEEL,sha256=YCfwYGOYMi5Jhw2fU4yNgwErybb2IX5PEwBKV4ZbdBo,91
-cardo_python_utils-0.5.dev55.dist-info/top_level.txt,sha256=zAx6OfEsjJs8BEW3okSiG_j9gpkI69xWShzum6oBgKI,13
-cardo_python_utils-0.5.dev55.dist-info/RECORD,,
+cardo_python_utils-0.5.1.dist-info/METADATA,sha256=5lttaasWWF_75Ig27FONaPSKC3ublt8ikBwZnljH7qU,3003
+cardo_python_utils-0.5.1.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+cardo_python_utils-0.5.1.dist-info/top_level.txt,sha256=zAx6OfEsjJs8BEW3okSiG_j9gpkI69xWShzum6oBgKI,13
+cardo_python_utils-0.5.1.dist-info/RECORD,,

{cardo_python_utils-0.5.dev55.dist-info → cardo_python_utils-0.5.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (82.0.0)
+Generator: setuptools (82.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

python_utils/django/api/drf.py

@@ -1,5 +1,5 @@
 from django.conf import settings
-from jwt.exceptions import ExpiredSignatureError, InvalidTokenError, PyJWKClientError
+from jwt.exceptions import ExpiredSignatureError, PyJWTError
 
 from rest_framework import authentication
 from rest_framework.exceptions import AuthenticationFailed, PermissionDenied
@@ -16,19 +16,17 @@ class AuthenticationBackend(authentication.TokenAuthentication):
             payload = decode_jwt(token, audience=self._get_audience())
         except ExpiredSignatureError as e:
             raise AuthenticationFailed("Token has expired.") from e
-        except (InvalidTokenError, PyJWKClientError) as e:
+        except PyJWTError as e:
             raise PermissionDenied(f"Invalid token: {str(e)}") from e
 
         try:
             username = payload["preferred_username"]
         except KeyError as e:
-            raise PermissionDenied(
-                "Invalid token: preferred_username not present."
-            ) from e
+            raise PermissionDenied("Invalid token: preferred_username not present.") from e
 
         user = create_or_update_user(username, payload)
         return user, payload
-    
+
     def _get_audience(self):
         """
         Allows subclasses to override the audience used for JWT decoding.
@@ -50,9 +48,9 @@ class HasScope(BasePermission):
         allowed_scopes = ["jobs"]
         ...
 
-    It is possible to define different scopes per HTTP method 
+    It is possible to define different scopes per HTTP method
     by setting `allowed_scopes` as a dict:
-    
+
     class MyApiView(APIView):
         permission_classes = [IsAuthenticated, HasScope]
         allowed_scopes = {
@@ -73,7 +71,7 @@ class HasScope(BasePermission):
                 f"No allowed_scopes defined on the view '{view.__class__.__name__}'. "
                 "Define allowed_scopes or set it to '*' to allow any scope."
             )
-        
+
         if isinstance(allowed_scopes, dict):
             allowed_scopes = allowed_scopes.get(request.method.lower(), [])
 

python_utils/django/api/ninja.py

@@ -1,12 +1,12 @@
 import logging
 from typing import Literal, Optional, Union
 
-from jwt.exceptions import ExpiredSignatureError, InvalidTokenError, PyJWKClientError
+from jwt.exceptions import ExpiredSignatureError, PyJWTError
 
 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,
@@ -63,14 +63,14 @@ class AuthBearer(HttpBearer):
             return decode_jwt(token)
         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
+        except PyJWTError as 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)

python_utils/django/middleware/tenant_aware_websocket_middleware.py

@@ -3,6 +3,7 @@ from urllib.parse import parse_qs
 
 from django.conf import settings
 from django.contrib.auth import get_user_model
+from jwt.exceptions import PyJWTError
 
 from ..api.utils import decode_jwt, TokenPayload
 from ..settings import DEVELOPMENT_TENANT
@@ -50,7 +51,13 @@ class TenantAwareWebsocketMiddleware:
         tenant = self._get_tenant(scope)
 
         async with TenantContext(tenant):
-            token_payload: TokenPayload = decode_jwt(access_token)
+            try:
+                token_payload: TokenPayload = decode_jwt(access_token)
+            except PyJWTError as e:
+                logger.info(f"Failed to decode JWT token: {e}")
+                await self._reject_connection(send, f"Invalid authorization token: {str(e)}")
+                return
+
             username = token_payload.get("preferred_username")
             if not username:
                 await self._reject_connection(send, "Username cannot be extracted from the token")
@@ -84,9 +91,7 @@ class TenantAwareWebsocketMiddleware:
         Returns:
             None
         """
-        await send(
-            {"type": "websocket.close", "code": 4000, "reason": reason}
-        )  # Custom close code for rejection
+        await send({"type": "websocket.close", "code": 4000, "reason": reason})  # Custom close code for rejection
 
     def _get_tenant(self, scope) -> str:
         """
@@ -110,9 +115,7 @@ class TenantAwareWebsocketMiddleware:
             logger.debug(f"Tenant '{tenant}' extracted from websocket host: {host}")
             return tenant
 
-        raise Exception(
-            f"Could not determine tenant from websocket subdomain. Host: {host}"
-        )
+        raise Exception(f"Could not determine tenant from websocket subdomain. Host: {host}")
 
     @staticmethod
     def _get_host_from_scope(scope) -> str: