usso 0.25.1__py3-none-any.whl → 0.25.3__py3-none-any.whl

usso/core.py

@@ -7,7 +7,6 @@ from functools import lru_cache
 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:
@@ -188,7 +188,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
 

{usso-0.25.1.dist-info → usso-0.25.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: usso
-Version: 0.25.1
+Version: 0.25.3
 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,6 @@ 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'

{usso-0.25.1.dist-info → usso-0.25.3.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=vrGpfueuX3CwkBdGj9ze-BPuI61TOlLPsCqHiKOQnFY,6510
+usso/core.py,sha256=I2Mxwfa3SAAIGMNCYhu7q9ejaS219Lz9O7h6zVBZYCI,6858
 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.1.dist-info/LICENSE.txt,sha256=ceC9ZJOV9H6CtQDcYmHOS46NA3dHJ_WD4J9blH513pc,1081
-usso-0.25.1.dist-info/METADATA,sha256=z1rpx_Pqk64o-Bpi6q38jpHDYZDGr9jiYha05I1jxBg,4227
-usso-0.25.1.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-usso-0.25.1.dist-info/entry_points.txt,sha256=4Zgpm5ELaAWPf0jPGJFz1_X69H7un8ycT3WdGoJ0Vvk,35
-usso-0.25.1.dist-info/top_level.txt,sha256=g9Jf6h1Oyidh0vPiFni7UHInTJjSvu6cUalpLTIvthg,5
-usso-0.25.1.dist-info/RECORD,,
+usso/fastapi/integration.py,sha256=tvf_oD7x6y0gVmW_BwJkYI-UO5LIMpWxJsh2IPBftlM,1692
+usso-0.25.3.dist-info/LICENSE.txt,sha256=ceC9ZJOV9H6CtQDcYmHOS46NA3dHJ_WD4J9blH513pc,1081
+usso-0.25.3.dist-info/METADATA,sha256=cfBtCQXLYFdZIri1-KHwzoTuYgxQM2HdS6qTAOYW2wc,4194
+usso-0.25.3.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+usso-0.25.3.dist-info/entry_points.txt,sha256=4Zgpm5ELaAWPf0jPGJFz1_X69H7un8ycT3WdGoJ0Vvk,35
+usso-0.25.3.dist-info/top_level.txt,sha256=g9Jf6h1Oyidh0vPiFni7UHInTJjSvu6cUalpLTIvthg,5
+usso-0.25.3.dist-info/RECORD,,