usso 0.28.0__py3-none-any.whl → 0.28.2__py3-none-any.whl

usso/auth/client.py

@@ -65,10 +65,12 @@ class UssoAuth:
             except usso_jwt.exceptions.JWTError as e:
                 exp = e
 
-        if raise_exception:
-            if exp:
-                _handle_exception("unauthorized", message=str(exp), **kwargs)
-            _handle_exception("unauthorized", **kwargs)
+        _handle_exception(
+            "Unauthorized",
+            message=str(exp) if exp else None,
+            raise_exception=raise_exception,
+            **kwargs,
+        )
 
     def user_data_from_api_key(self, api_key: str) -> UserData:
         """Get user data from an API key.

usso/integrations/fastapi/__init__.py

@@ -1,3 +1,8 @@
 from .dependency import USSOAuthentication
+from .handler import EXCEPTION_HANDLERS, usso_exception_handler
 
-__all__ = ["USSOAuthentication"]
+__all__ = [
+    "USSOAuthentication",
+    "EXCEPTION_HANDLERS",
+    "usso_exception_handler",
+]

usso/integrations/fastapi/dependency.py

@@ -1,13 +1,10 @@
 import logging
 
-from starlette.status import HTTP_401_UNAUTHORIZED
-
 from fastapi import Request, WebSocket
-from fastapi.responses import JSONResponse
 
 from ...auth import UssoAuth
 from ...auth.config import AuthConfig, AvailableJwtConfigs
-from ...exceptions import USSOException
+from ...exceptions import _handle_exception
 from ...models.user import UserData
 from ...utils.method_utils import instance_method
 
@@ -26,6 +23,9 @@ class USSOAuthentication(UssoAuth):
         super().__init__(jwt_config=jwt_config)
         self.raise_exception = raise_exception
 
+    def __call__(self, request: Request) -> UserData:
+        return self.usso_access_security(request)
+
     @instance_method
     def get_request_jwt(self, request: Request | WebSocket) -> str | None:
         for jwt_config in self.jwt_configs:
@@ -42,7 +42,7 @@ class USSOAuthentication(UssoAuth):
                 return token
         return None
 
-    @instance_method
+    # @instance_method
     def usso_access_security(self, request: Request) -> UserData | None:
         """Return the user associated with a token value."""
         api_key = self.get_request_api_key(request)
@@ -54,15 +54,14 @@ class USSOAuthentication(UssoAuth):
             return self.user_data_from_token(
                 token, raise_exception=self.raise_exception
             )
-        if self.raise_exception:
-            raise USSOException(
-                status_code=HTTP_401_UNAUTHORIZED,
-                error="unauthorized",
-                message="No token provided",
-            )
-        return None
 
-    @instance_method
+        _handle_exception(
+            "Unauthorized",
+            message="No token provided",
+            raise_exception=self.raise_exception,
+        )
+
+    # @instance_method
     def jwt_access_security_ws(self, websocket: WebSocket) -> UserData | None:
         """Return the user associated with a token value."""
         api_key = self.get_request_api_key(websocket)
@@ -74,22 +73,8 @@ class USSOAuthentication(UssoAuth):
             return self.user_data_from_token(
                 token, raise_exception=self.raise_exception
             )
-        if self.raise_exception:
-            raise USSOException(
-                status_code=HTTP_401_UNAUTHORIZED,
-                error="unauthorized",
-                message="No token provided",
-            )
-        return None
-
-
-async def usso_exception_handler(request: Request, exc: USSOException):
-    return JSONResponse(
-        status_code=exc.status_code,
-        content={"message": exc.message, "error": exc.error},
-    )
-
-
-EXCEPTION_HANDLERS = {
-    USSOException: usso_exception_handler,
-}
+        _handle_exception(
+            "Unauthorized",
+            message="No token provided",
+            raise_exception=self.raise_exception,
+        )

usso/integrations/fastapi/handler.py

@@ -0,0 +1,16 @@
+from fastapi import Request
+from fastapi.responses import JSONResponse
+
+from ...exceptions import USSOException
+
+
+async def usso_exception_handler(request: Request, exc: USSOException):
+    return JSONResponse(
+        status_code=exc.status_code,
+        content={"message": exc.message, "error": exc.error},
+    )
+
+
+EXCEPTION_HANDLERS = {
+    USSOException: usso_exception_handler,
+}

usso/models/user.py

@@ -75,6 +75,16 @@ class UserData(BaseModel):
             return self.claims["user_id"]
         return self.sub or ""
 
+    @property
+    def uid(self) -> str:
+        return self.user_id
+
+    @property
+    def user_name(self) -> str:
+        if self.claims and "user_name" in self.claims:
+            return self.claims["user_name"]
+        return ""
+
     @property
     def email(self) -> str:
         if self.claims and "email" in self.claims:

{usso-0.28.0.dist-info → usso-0.28.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: usso
-Version: 0.28.0
+Version: 0.28.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>

{usso-0.28.0.dist-info → usso-0.28.2.dist-info}/RECORD

@@ -2,13 +2,14 @@ usso/__init__.py,sha256=t3tYcw4qtGFpk7iakXTqEj5RlzIc8D2fs0I3FZcOmGs,571
 usso/exceptions.py,sha256=cBzmMCwpNQKMjCUXO3bCcFwZJQQvbvJ5RxTH987ZlCI,1012
 usso/auth/__init__.py,sha256=Dthv-iZTgsHTGcJrkJsnAtDCbRR5dNCx0Ut7MufoAXY,270
 usso/auth/api_key.py,sha256=ec3q_mJtPiNb-eZt5MA4bantX1zRo3WwU2JfYBcGCGk,1254
-usso/auth/client.py,sha256=SqZuq2ff4pbfP1bwQ0Mm9W1CEqYZEgFX7lIoAMJDMC4,2525
+usso/auth/client.py,sha256=epxc0Lfyo_BBiL-w5parDayzSu-5B0c_VIDFAGoRdQc,2522
 usso/auth/config.py,sha256=6tdnIg8iCrksuJGzpliw6QhRc8XsDUMR-dX0XY6QLHU,3833
 usso/integrations/django/__init__.py,sha256=dKpbffHS5ouGtW6ooI2ivzjPmH_1rOBny85htR-KqrY,97
 usso/integrations/django/middleware.py,sha256=8b-VYQ3FRhLnXSl4ZfHBpiA6VLY4b7b0-YoE_X41SFM,3443
-usso/integrations/fastapi/__init__.py,sha256=ZysSeNr35ioMkviQqvfrXLYgt1ox3Wyckzee4Fv0nCk,77
-usso/integrations/fastapi/dependency.py,sha256=HX2x6v9mI1r6O7SVAtSLtoTsx2uXXxxaFNwB6lSCh1Q,2954
-usso/models/user.py,sha256=jG8jlt6F2pHHgqnsRRP6kCuRNK-aO9FE5Mt7iiuPPnU,3293
+usso/integrations/fastapi/__init__.py,sha256=ohToiqutHu3Okr8naunssDkamj1OdiG4OpPdBW0rt7U,204
+usso/integrations/fastapi/dependency.py,sha256=9CaRSvCNbrSQr7EQd6SEs7HhxULWvXLkEX89L5rsnZc,2543
+usso/integrations/fastapi/handler.py,sha256=MNDoBYdySumFsBgVw-xir3jXXH63KehFXKCh-pNnNZQ,386
+usso/models/user.py,sha256=iqHlhkfkp4tDNGnvN2o-ZrhLHRrpe-JsfkwJdhv8ZZo,3526
 usso/session/__init__.py,sha256=tE4qWUdSI7iN_pywm47Mg8NKOTBa2nCNwCy3wCZWRmU,124
 usso/session/async_session.py,sha256=7OKvFnJQaHnLjeQKSW6bltl0KcQGzOvUje-bJKbxFZY,3692
 usso/session/base_session.py,sha256=Jggp_1JJEKwAJYxNTk4KhP15BSjq6diuSSBzf79gToI,2551
@@ -16,9 +17,9 @@ usso/session/session.py,sha256=B29Srxoq7webDvmfmfTeeh5JjtLSHvJijM2WCEZOh-8,1506
 usso/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 usso/utils/method_utils.py,sha256=1NMN4le04PWXDSJZK-nf7q2IFqOMkwYcCnslFXAzlH8,355
 usso/utils/string_utils.py,sha256=7tziAa2Cwa7xhwM_NF4DSY3BHoqVaWgJ21VuV8LvhrY,253
-usso-0.28.0.dist-info/licenses/LICENSE.txt,sha256=ceC9ZJOV9H6CtQDcYmHOS46NA3dHJ_WD4J9blH513pc,1081
-usso-0.28.0.dist-info/METADATA,sha256=eeqNJI0DT_JJCmXWFmMw3BMoNOKq94H_WEbPYfYvL5I,4845
-usso-0.28.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-usso-0.28.0.dist-info/entry_points.txt,sha256=4Zgpm5ELaAWPf0jPGJFz1_X69H7un8ycT3WdGoJ0Vvk,35
-usso-0.28.0.dist-info/top_level.txt,sha256=g9Jf6h1Oyidh0vPiFni7UHInTJjSvu6cUalpLTIvthg,5
-usso-0.28.0.dist-info/RECORD,,
+usso-0.28.2.dist-info/licenses/LICENSE.txt,sha256=ceC9ZJOV9H6CtQDcYmHOS46NA3dHJ_WD4J9blH513pc,1081
+usso-0.28.2.dist-info/METADATA,sha256=EWDQGDRrJkh6lfnECyg9EhKPYVr4yDDyfiKdNVaiOG4,4845
+usso-0.28.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+usso-0.28.2.dist-info/entry_points.txt,sha256=4Zgpm5ELaAWPf0jPGJFz1_X69H7un8ycT3WdGoJ0Vvk,35
+usso-0.28.2.dist-info/top_level.txt,sha256=g9Jf6h1Oyidh0vPiFni7UHInTJjSvu6cUalpLTIvthg,5
+usso-0.28.2.dist-info/RECORD,,