usso 0.24.6__tar.gz → 0.24.8__tar.gz

{usso-0.24.6/src/usso.egg-info → usso-0.24.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: usso
-Version: 0.24.6
+Version: 0.24.8
 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 → usso-0.24.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "usso"
-version = "0.24.6"
+version = "0.24.8"
 description = "A plug-and-play client for integrating universal single sign-on (SSO) with Python frameworks, enabling secure and seamless authentication across microservices."
 readme = "README.md"
 requires-python = ">=3.9"

usso-0.24.8/src/usso/async_session.py

@@ -0,0 +1,86 @@
+from datetime import datetime
+import aiohttp
+import jwt
+
+
+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:
+            raise ValueError("Refresh token not provided or invalid.")
+
+        async with aiohttp.ClientSession() as session:
+            async with session.post(
+                self.sso_refresh_url,
+                json={"refresh_token": self.refresh_token},
+            ) as response:
+                response.raise_for_status()
+                return await response.json()
+
+    async def _ensure_valid_token(self):
+        if self.access_token:
+            decoded_token = jwt.decode(
+                self.access_token, options={"verify_signature": False}
+            )
+            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"]
+
+            # Update headers with the new access token
+            if self.session:
+                self.session.headers.update(
+                    {"Authorization": f"Bearer {self.access_token}"}
+                )
+
+    async def __aenter__(self):
+        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):
+        if self.session:
+            await self.session.close()  # Close the session properly
+
+    async def _request(self, method: str, url: str, **kwargs):
+        await self._ensure_valid_token()  # Ensure valid token before any request
+        return await self.session.request(method, url, **kwargs)
+
+    async def get(self, url: str, **kwargs):
+        return await self._request("GET", url, **kwargs)
+
+    async def post(self, url: str, **kwargs):
+        return await self._request("POST", url, **kwargs)
+
+    async def put(self, url: str, **kwargs):
+        return await self._request("PUT", url, **kwargs)
+
+    async def patch(self, url: str, **kwargs):
+        return await self._request("PATCH", url, **kwargs)
+
+    async def delete(self, url: str, **kwargs):
+        return await self._request("DELETE", url, **kwargs)
+
+    async def head(self, url: str, **kwargs):
+        return await self._request("HEAD", url, **kwargs)
+
+    async def options(self, url: str, **kwargs):
+        return await self._request("OPTIONS", url, **kwargs)
+    
+    async def close(self):
+        await self.session.close()
+        self.session = None
+
+    async def __del__(self):
+        if self.session:
+            await self.session.close()

{usso-0.24.6 → usso-0.24.8}/src/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 → usso-0.24.8/src/usso.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: usso
-Version: 0.24.6
+Version: 0.24.8
 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/src/usso/async_session.py

@@ -1,48 +0,0 @@
-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)
-        self.sso_refresh_url = sso_refresh_url
-        self.refresh_token = refresh_token
-        self.access_token = None
-
-    async def _refresh(self):
-        if not self.refresh_token:
-            raise ValueError("Refresh token not provided or invalid.")
-
-        async with aiohttp.ClientSession() as session:
-            async with session.post(
-                self.sso_refresh_url,
-                json={"refresh_token": self.refresh_token},
-            ) as response:
-                response.raise_for_status()
-                return await response.json()
-
-    async def _ensure_valid_token(self):
-        if self.access_token:
-            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
-
-        if not self.access_token:
-            token_data = await self._refresh()
-            self.access_token = token_data["access_token"]
-
-            self.headers.update({"Authorization": f"Bearer {self.access_token}"})
-
-    async def __aenter__(self):
-        await self._ensure_valid_token()
-        return self
-
-    async def __aexit__(self, exc_type, exc_value, traceback):
-        await self.close()

{usso-0.24.6 → usso-0.24.8}/src/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"]