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

usso/core.py

@@ -147,23 +147,31 @@ class Usso:
     def __init__(
         self,
         *,
-        jwt_config: str | dict | JWTConfig | None = None,
-        jwt_configs: list[str] | list[dict] | list[JWTConfig] | None = None,
+        jwt_config: str | dict | JWTConfig | list[str] | list[dict] | list[JWTConfig] | None = None,
+        jwk_url: str | None = None,
+        secret: str | None = None,
     ):
-        if jwt_config is None and jwt_configs is None:
+        if jwt_config 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 jwt_config is None:
             if not jwk_url:
+                jwk_url = os.getenv("USSO_JWK_URL") or os.getenv("USSO_JWKS_URL")
+            if jwk_url:
                 self.jwt_configs = [JWTConfig(jwk_url=jwk_url)]
                 return
+            
+            if not secret:
+                secret = os.getenv("USSO_SECRET")
+            if secret:
+                self.jwt_configs = [JWTConfig(secret=secret)]
+                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",
+                        "jwt_config or jwk_url or secret must be provided",
+                        "or set the environment variable USSO_JWT_CONFIG or USSO_JWK_URL or USSO_SECRET",
                     ]
                 )
             )
@@ -188,7 +196,16 @@ class Usso:
         exp = None
         for jwk_config in self.jwt_configs:
             try:
-                return jwk_config.decode(token)
+                user_data = jwk_config.decode(token)
+                if user_data.token_type.lower() != kwargs.get("token_type", "access"):
+                    raise USSOException(
+                        status_code=401,
+                        error="invalid_token_type",
+                        message="Token type must be 'access'",
+                    )
+
+                return user_data
+
             except USSOException as e:
                 exp = e
 

usso/fastapi/integration.py

@@ -5,7 +5,7 @@ from starlette.status import HTTP_401_UNAUTHORIZED
 
 from usso.exceptions import USSOException
 
-from ..core import UserData, Usso
+from ..core import UserData, Usso, get_authorization_scheme_param
 
 logger = logging.getLogger("usso")
 
@@ -15,7 +15,7 @@ def get_request_token(request: Request | WebSocket) -> UserData | None:
     token = None
 
     if authorization:
-        scheme, credentials = Usso().get_authorization_scheme_param(authorization)
+        scheme, credentials = get_authorization_scheme_param(authorization)
         if scheme.lower() == "bearer":
             token = credentials
 
@@ -27,33 +27,35 @@ def get_request_token(request: Request | WebSocket) -> UserData | None:
     return token
 
 
-def jwt_access_security_None(request: Request) -> UserData | None:
+def jwt_access_security_None(request: Request, jwt_config = None) -> UserData | None:
     """Return the user associated with a token value."""
     token = get_request_token(request)
     if not token:
         return None
-    return Usso().user_data_from_token(token, raise_exception=False)
+    return Usso(jwt_config=jwt_config).user_data_from_token(token, raise_exception=False)
 
 
-def jwt_access_security(request: Request) -> UserData | None:
+def jwt_access_security(request: Request, jwt_config=None) -> UserData | None:
     """Return the user associated with a token value."""
     token = get_request_token(request)
     if not token:
         raise USSOException(
             status_code=HTTP_401_UNAUTHORIZED,
             error="unauthorized",
+            message="No token provided",
         )
 
-    return Usso().user_data_from_token(token)
+    return Usso(jwt_config=jwt_config).user_data_from_token(token)
 
 
-def jwt_access_security_ws(websocket: WebSocket) -> UserData | None:
+def jwt_access_security_ws(websocket: WebSocket, jwt_config=None) -> UserData | None:
     """Return the user associated with a token value."""
     token = get_request_token(websocket)
     if not token:
         raise USSOException(
             status_code=HTTP_401_UNAUTHORIZED,
             error="unauthorized",
+            message="No token provided",
         )
 
-    return Usso().user_data_from_token(token)
+    return Usso(jwt_config=jwt_config).user_data_from_token(token)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: usso
-Version: 0.25.2
+Version: 0.25.4
 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>

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

@@ -3,16 +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=7DpJplPX8aWI4wSkd-gS58ss_G_Sgq5uRqbXiKOQgeo,6512
+usso/core.py,sha256=tZzoh_t7HYr-HIual4hN7K1ZVk_nGZdKpaItq5VvkJQ,7087
 usso/exceptions.py,sha256=hawOAuVbvQtjgRfwp1KFZ4SmV7fh720y5Gom9JVA8W8,504
 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/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/integration.py,sha256=-8MTeqGokvmUO0lxZpEWXdTMYg6n065qtnaJHOwCrzQ,1890
+usso-0.25.4.dist-info/LICENSE.txt,sha256=ceC9ZJOV9H6CtQDcYmHOS46NA3dHJ_WD4J9blH513pc,1081
+usso-0.25.4.dist-info/METADATA,sha256=A_tGSXx1G-21gFFMscbvknkEdDumh0qZ3L4wlE7Nxxs,4194
+usso-0.25.4.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+usso-0.25.4.dist-info/entry_points.txt,sha256=4Zgpm5ELaAWPf0jPGJFz1_X69H7un8ycT3WdGoJ0Vvk,35
+usso-0.25.4.dist-info/top_level.txt,sha256=g9Jf6h1Oyidh0vPiFni7UHInTJjSvu6cUalpLTIvthg,5
+usso-0.25.4.dist-info/RECORD,,