usso 0.25.0__py3-none-any.whl → 0.25.2__py3-none-any.whl

usso/core.py

@@ -1,13 +1,12 @@
+import json
 import logging
 import os
 import uuid
 from functools import lru_cache
-from typing import Optional, Tuple
 
 import cachetools.func
 import jwt
 from pydantic import BaseModel, model_validator
-from singleton import Singleton
 
 from . import b64tools
 from .exceptions import USSOException
@@ -61,6 +60,7 @@ def get_authorization_scheme_param(
 def decode_token(key, token: str, algorithms=["RS256"], **kwargs) -> dict:
     try:
         decoded = jwt.decode(token, key, algorithms=algorithms)
+        decoded["data"] = decoded
         decoded["token"] = token
         return UserData(**decoded)
     except jwt.exceptions.ExpiredSignatureError:
@@ -142,33 +142,60 @@ class JWTConfig(BaseModel):
         return decode_token(self.secret, token, algorithms=[self.type])
 
 
-class Usso(metaclass=Singleton):
-    def __init__(self, jwks_url: str | None = None):
-        if jwks_url is None:
-            jwks_url = os.getenv("USSO_JWKS_URL")
-        self.jwks_url = jwks_url
+class Usso:
+
+    def __init__(
+        self,
+        *,
+        jwt_config: str | dict | JWTConfig | None = None,
+        jwt_configs: list[str] | list[dict] | list[JWTConfig] | None = None,
+    ):
+        if jwt_config is None and jwt_configs is None:
+            jwt_config = os.getenv("USSO_JWT_CONFIG")
+
+        if jwt_config is None and jwt_configs is None:
+            jwk_url = os.getenv("USSO_JWK_URL") or os.getenv("USSO_JWKS_URL")
+            if not jwk_url:
+                self.jwt_configs = [JWTConfig(jwk_url=jwk_url)]
+                return
+
+            raise ValueError(
+                "\n".join(
+                    [
+                        "Either jwt_config or jwt_configs must be provided",
+                        "or set the environment variable USSO_JWT_CONFIG or USSO_JWK_URL",
+                    ]
+                )
+            )
+
+        def _get_config(jwt_config):
+            if isinstance(jwt_config, str):
+                jwt_config = json.loads(jwt_config)
+            if isinstance(jwt_config, dict):
+                jwt_config = JWTConfig(**jwt_config)
+            return jwt_config
 
-    def get_jwk_keys(self):
-        return get_jwk_keys(self.jwks_url)
+        if isinstance(jwt_config, str | dict | JWTConfig):
+            jwt_config = [_get_config(jwt_config)]
+        elif isinstance(jwt_config, list):
+            jwt_config = [_get_config(j) for j in jwt_config]
 
-    def get_authorization_scheme_param(
-        self, authorization_header_value: Optional[str]
-    ) -> Tuple[str, str]:
-        return get_authorization_scheme_param(authorization_header_value)
+        # self.jwk_url = jwt_config
+        self.jwt_configs = jwt_config
 
     def user_data_from_token(self, token: str, **kwargs) -> UserData | None:
         """Return the user associated with a token value."""
-        user_data = decode_token_jwk(self.jwks_url, token, **kwargs)
-        if user_data.token_type.lower() != kwargs.get("token_type", "access"):
-            raise USSOException(status_code=401, error="invalid_token_type")
-        return user_data
-
-    def user_data_from_token_none(self, token: str, **kwargs) -> UserData | None:
-        try:
-            return self.user_data_from_token(token, **kwargs)
-        except USSOException:
-            # logger.error(str(e))
-            return None
-        except Exception:
-            # logger.error(str(e))
-            return None
+        exp = None
+        for jwk_config in self.jwt_configs:
+            try:
+                return jwk_config.decode(token)
+            except USSOException as e:
+                exp = e
+
+        if kwargs.get("raise_exception", True):
+            if exp:
+                raise exp
+            raise USSOException(
+                status_code=401,
+                error="unauthorized",
+            )

usso/fastapi/integration.py

@@ -3,9 +3,10 @@ import logging
 from fastapi import Request, WebSocket
 from starlette.status import HTTP_401_UNAUTHORIZED
 
-from usso.core import UserData, Usso
 from usso.exceptions import USSOException
 
+from ..core import UserData, Usso
+
 logger = logging.getLogger("usso")
 
 

{usso-0.25.0.dist-info → usso-0.25.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: usso
-Version: 0.25.0
+Version: 0.25.2
 Summary: A plug-and-play client for integrating universal single sign-on (SSO) with Python frameworks, enabling secure and seamless authentication across microservices.
 Author-email: Mahdi Kiani <mahdikiany@gmail.com>
 Maintainer-email: Mahdi Kiani <mahdikiany@gmail.com>
@@ -45,7 +45,7 @@ License-File: LICENSE.txt
 Requires-Dist: pydantic >=2
 Requires-Dist: requests >=2.26.0
 Requires-Dist: pyjwt[crypto]
-Requires-Dist: singleton-package
+Requires-Dist: cachetools
 Provides-Extra: dev
 Requires-Dist: check-manifest ; extra == 'dev'
 Provides-Extra: django
@@ -53,7 +53,6 @@ Requires-Dist: Django >=3.2 ; extra == 'django'
 Provides-Extra: fastapi
 Requires-Dist: fastapi >=0.65.0 ; extra == 'fastapi'
 Requires-Dist: uvicorn[standard] >=0.13.0 ; extra == 'fastapi'
-Requires-Dist: cachetools ; extra == 'fastapi'
 Provides-Extra: test
 Requires-Dist: coverage ; extra == 'test'
 

{usso-0.25.0.dist-info → usso-0.25.2.dist-info}/RECORD

@@ -3,18 +3,16 @@ usso/api.py,sha256=xlDq2nZNpq3mhAvqIbGEfANHNjJpPquSeULBfS7iMJw,5094
 usso/async_api.py,sha256=rb-Xh5oudmZrPYM_iH_B75b5Z0Fvi1V1uurdcKE51w0,5551
 usso/async_session.py,sha256=nFIrtV3Tp0H-s2ZkMLU9_fVSeVGq1EtY1bGT_XOS5Vw,4336
 usso/b64tools.py,sha256=HGQ0E59vzjrQo2-4jrcY03ebtTaYwTtCZ7KgJaEmxO0,610
-usso/core.py,sha256=bWegFuGsWMmfz1b0upGPn5E8X3az4IOuJ-WqzRDMngM,5767
+usso/core.py,sha256=7DpJplPX8aWI4wSkd-gS58ss_G_Sgq5uRqbXiKOQgeo,6512
 usso/exceptions.py,sha256=hawOAuVbvQtjgRfwp1KFZ4SmV7fh720y5Gom9JVA8W8,504
-usso/package_data.dat,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 usso/session.py,sha256=Lky2O8FGbOMJFOMxxdE0rhpgwWKThGQfr-X9YQsFpLk,2358
 usso/django/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 usso/django/middleware.py,sha256=EEEpHvMQ6QiWw2HY8zQ2Aec0RCATcLWsCKeyiPWJKio,3245
 usso/fastapi/__init__.py,sha256=0EcdOzb4f3yu9nILIdGWnlyUz-0VaVX2az1e3f2BusI,201
-usso/fastapi/auth_middleware.py,sha256=HfRbdelAQ4URwTA8hEyeq0IYBEZcbRa-utEHf5rRw_s,2710
-usso/fastapi/integration.py,sha256=VAUWaa7ChQ1jTtn8A136VgyG6t2kDo5pGK-3RgmNDVs,1669
-usso-0.25.0.dist-info/LICENSE.txt,sha256=ceC9ZJOV9H6CtQDcYmHOS46NA3dHJ_WD4J9blH513pc,1081
-usso-0.25.0.dist-info/METADATA,sha256=3_BvP1GtgbIGMng5NDF64x3zlcviiD0VHMiuxGGllt8,4248
-usso-0.25.0.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-usso-0.25.0.dist-info/entry_points.txt,sha256=4Zgpm5ELaAWPf0jPGJFz1_X69H7un8ycT3WdGoJ0Vvk,35
-usso-0.25.0.dist-info/top_level.txt,sha256=g9Jf6h1Oyidh0vPiFni7UHInTJjSvu6cUalpLTIvthg,5
-usso-0.25.0.dist-info/RECORD,,
+usso/fastapi/integration.py,sha256=LNKd_KStKr5CBj_CUfwkrgtiY5R8nBL61FVBWcIrhQE,1667
+usso-0.25.2.dist-info/LICENSE.txt,sha256=ceC9ZJOV9H6CtQDcYmHOS46NA3dHJ_WD4J9blH513pc,1081
+usso-0.25.2.dist-info/METADATA,sha256=RgDkN68nTqjXyUjX8LHcC20MFMuM7kyilJqxrI5Oyqw,4194
+usso-0.25.2.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+usso-0.25.2.dist-info/entry_points.txt,sha256=4Zgpm5ELaAWPf0jPGJFz1_X69H7un8ycT3WdGoJ0Vvk,35
+usso-0.25.2.dist-info/top_level.txt,sha256=g9Jf6h1Oyidh0vPiFni7UHInTJjSvu6cUalpLTIvthg,5
+usso-0.25.2.dist-info/RECORD,,

usso/fastapi/auth_middleware.py

@@ -1,87 +0,0 @@
-import json
-import logging
-import os
-
-from fastapi import Request, WebSocket
-from starlette.status import HTTP_401_UNAUTHORIZED
-
-from usso.exceptions import USSOException
-
-from ..core import JWTConfig, UserData
-from .integration import get_request_token
-
-logger = logging.getLogger("usso")
-
-
-class Usso:
-
-    def __init__(
-        self,
-        jwt_config: (
-            str | dict | JWTConfig | list[str] | list[dict] | list[JWTConfig] | None
-        ) = None,
-    ):
-        if jwt_config is None:
-            self.jwk_url = os.getenv("USSO_JWK_URL")
-            self.jwt_configs = [JWTConfig(jwk_url=self.jwk_url)]
-            return
-
-        def _get_config(jwt_config):
-            if isinstance(jwt_config, str):
-                jwt_config = json.loads(jwt_config)
-            if isinstance(jwt_config, dict):
-                jwt_config = JWTConfig(**jwt_config)
-            return jwt_config
-
-        if isinstance(jwt_config, str | dict | JWTConfig):
-            jwt_config = [_get_config(jwt_config)]
-        elif isinstance(jwt_config, list):
-            jwt_config = [_get_config(j) for j in jwt_config]
-
-        # self.jwk_url = jwt_config
-        self.jwt_configs = jwt_config
-
-    def user_data_from_token(self, token: str, **kwargs) -> UserData | None:
-        """Return the user associated with a token value."""
-        exp = None
-        for jwk_config in self.jwt_configs:
-            try:
-                return jwk_config.decode(token)
-            except USSOException as e:
-                exp = e
-
-        if kwargs.get("raise_exception", True):
-            if exp:
-                raise exp
-            raise USSOException(
-                status_code=HTTP_401_UNAUTHORIZED,
-                error="unauthorized",
-            )
-
-    async def jwt_access_security(self, request: Request, **kwargs) -> UserData | None:
-        """Return the user associated with a token value."""
-        token = get_request_token(request)
-        if token:
-            return self.user_data_from_token(token)
-
-        if kwargs.get("raise_exception", True):
-            raise USSOException(
-                status_code=HTTP_401_UNAUTHORIZED,
-                error="unauthorized",
-            )
-        return None
-
-    async def jwt_access_security_ws(
-        self, websocket: WebSocket, **kwargs
-    ) -> UserData | None:
-        """Return the user associated with a token value."""
-        token = get_request_token(websocket)
-        if token:
-            return self.user_data_from_token(token)
-
-        if kwargs.get("raise_exception", True):
-            raise USSOException(
-                status_code=HTTP_401_UNAUTHORIZED,
-                error="unauthorized",
-            )
-        return None