usso 0.24.6__py3-none-any.whl → 0.24.7__py3-none-any.whl

usso/async_session.py

@@ -1,17 +1,14 @@
 from datetime import datetime
-
 import aiohttp
 import jwt
 
 
-class AsyncUssoSession(aiohttp.ClientSession):
-    def __init__(
-        self, sso_refresh_url: str, refresh_token: str | None = None, **kwargs
-    ):
-        super().__init__(**kwargs)
+class AsyncUssoSession:
+    def __init__(self, sso_refresh_url: str, refresh_token: str | None = None):
         self.sso_refresh_url = sso_refresh_url
         self.refresh_token = refresh_token
         self.access_token = None
+        self.session = None  # This will hold the aiohttp session
 
     async def _refresh(self):
         if not self.refresh_token:
@@ -30,19 +27,27 @@ class AsyncUssoSession(aiohttp.ClientSession):
             decoded_token = jwt.decode(
                 self.access_token, options={"verify_signature": False}
             )
-            exp = datetime.fromtimestamp(decoded_token.get("exp"))
-            if exp < datetime.now():
-                self.access_token = None
+            exp = decoded_token.get("exp")
+
+            if exp and datetime.fromtimestamp(exp) < datetime.now():
+                self.access_token = None  # Token expired, need a new one
 
         if not self.access_token:
+            # Get a new token if none exists or it has expired
             token_data = await self._refresh()
             self.access_token = token_data["access_token"]
 
-            self.headers.update({"Authorization": f"Bearer {self.access_token}"})
+            # Update headers with the new access token
+            if self.session:
+                self.session.headers.update(
+                    {"Authorization": f"Bearer {self.access_token}"}
+                )
 
     async def __aenter__(self):
-        await self._ensure_valid_token()
+        self.session = aiohttp.ClientSession()  # Initialize the session
+        await self._ensure_valid_token()  # Ensure valid token before usage
         return self
 
     async def __aexit__(self, exc_type, exc_value, traceback):
-        await self.close()
+        if self.session:
+            await self.session.close()  # Close the session properly

usso/fastapi/__init__.py

@@ -1,7 +1,7 @@
 from .integration import (
     jwt_access_security,
-    jwt_access_security_ws,
     jwt_access_security_None,
+    jwt_access_security_ws,
 )
 
 __all__ = ["jwt_access_security", "jwt_access_security_ws", "jwt_access_security_None"]

usso/fastapi/integration.py

@@ -12,7 +12,7 @@ logger = logging.getLogger("usso")
 def get_request_token(request: Request | WebSocket) -> UserData | None:
     authorization = request.headers.get("Authorization")
     token = None
-    
+
     if authorization:
         scheme, credentials = Usso().get_authorization_scheme_param(authorization)
         if scheme.lower() == "bearer":

{usso-0.24.6.dist-info → usso-0.24.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: usso
-Version: 0.24.6
+Version: 0.24.7
 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.24.6.dist-info → usso-0.24.7.dist-info}/RECORD

@@ -1,7 +1,7 @@
 usso/__init__.py,sha256=NnOS_S1a-JKTOlGe1nw-kCL3m0y82mA2mDraus7BQ2o,120
 usso/api.py,sha256=xlDq2nZNpq3mhAvqIbGEfANHNjJpPquSeULBfS7iMJw,5094
 usso/async_api.py,sha256=rb-Xh5oudmZrPYM_iH_B75b5Z0Fvi1V1uurdcKE51w0,5551
-usso/async_session.py,sha256=78MxGFojmqYmTe2iytrhPNrfYdvEn24tVJEiRJVeoyk,1563
+usso/async_session.py,sha256=AClLpmM0q-P_ES_iMfv8CDUdyZtKb4FA-VSp5Uh4esw,1960
 usso/b64tools.py,sha256=HGQ0E59vzjrQo2-4jrcY03ebtTaYwTtCZ7KgJaEmxO0,610
 usso/core.py,sha256=m6Y-g70FuPYZM3AMtsEVVToQkYrf4WwNVH8C4HZRzl8,4103
 usso/exceptions.py,sha256=hawOAuVbvQtjgRfwp1KFZ4SmV7fh720y5Gom9JVA8W8,504
@@ -9,11 +9,11 @@ usso/package_data.dat,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 usso/session.py,sha256=S3dFXzar0Pcwxj5TGqadKwGdmzmzgp4H2W3brfOwJ6A,1184
 usso/django/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 usso/django/middleware.py,sha256=EEEpHvMQ6QiWw2HY8zQ2Aec0RCATcLWsCKeyiPWJKio,3245
-usso/fastapi/__init__.py,sha256=kmjbCK-V01myG3ElJv0nRcYJt3lMtd262Q0uXIRC6ys,201
-usso/fastapi/integration.py,sha256=qu2HBsm4hPzM-fctO5rGZAHH2Lo8fk5U0K1jcEGDt2U,1673
-usso-0.24.6.dist-info/LICENSE.txt,sha256=ceC9ZJOV9H6CtQDcYmHOS46NA3dHJ_WD4J9blH513pc,1081
-usso-0.24.6.dist-info/METADATA,sha256=GuPLk_R-UuuooiBQl3Fkj9BhxDP9URepdzvEAbLQojc,4231
-usso-0.24.6.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-usso-0.24.6.dist-info/entry_points.txt,sha256=4Zgpm5ELaAWPf0jPGJFz1_X69H7un8ycT3WdGoJ0Vvk,35
-usso-0.24.6.dist-info/top_level.txt,sha256=g9Jf6h1Oyidh0vPiFni7UHInTJjSvu6cUalpLTIvthg,5
-usso-0.24.6.dist-info/RECORD,,
+usso/fastapi/__init__.py,sha256=0EcdOzb4f3yu9nILIdGWnlyUz-0VaVX2az1e3f2BusI,201
+usso/fastapi/integration.py,sha256=VAUWaa7ChQ1jTtn8A136VgyG6t2kDo5pGK-3RgmNDVs,1669
+usso-0.24.7.dist-info/LICENSE.txt,sha256=ceC9ZJOV9H6CtQDcYmHOS46NA3dHJ_WD4J9blH513pc,1081
+usso-0.24.7.dist-info/METADATA,sha256=Q_WAGLUFZp3qPM7ZfK2J2gYaZ4Ugvd0TayQr2L4C5j8,4231
+usso-0.24.7.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+usso-0.24.7.dist-info/entry_points.txt,sha256=4Zgpm5ELaAWPf0jPGJFz1_X69H7un8ycT3WdGoJ0Vvk,35
+usso-0.24.7.dist-info/top_level.txt,sha256=g9Jf6h1Oyidh0vPiFni7UHInTJjSvu6cUalpLTIvthg,5
+usso-0.24.7.dist-info/RECORD,,