usso 0.25.4__tar.gz → 0.26.1__tar.gz

{usso-0.25.4/src/usso.egg-info → usso-0.26.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: usso
-Version: 0.25.4
+Version: 0.26.1
 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>
@@ -51,10 +51,19 @@ Requires-Dist: fastapi>=0.65.0; extra == "fastapi"
 Requires-Dist: uvicorn[standard]>=0.13.0; extra == "fastapi"
 Provides-Extra: django
 Requires-Dist: Django>=3.2; extra == "django"
+Provides-Extra: httpx
+Requires-Dist: httpx; extra == "httpx"
 Provides-Extra: dev
 Requires-Dist: check-manifest; extra == "dev"
 Provides-Extra: test
 Requires-Dist: coverage; extra == "test"
+Provides-Extra: all
+Requires-Dist: fastapi; extra == "all"
+Requires-Dist: uvicorn; extra == "all"
+Requires-Dist: django; extra == "all"
+Requires-Dist: httpx; extra == "all"
+Requires-Dist: dev; extra == "all"
+Requires-Dist: test; extra == "all"
 
 # USSO-Client
 

{usso-0.25.4 → usso-0.26.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "usso"
-version = "0.25.4"
+version = "0.26.1"
 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"
@@ -34,7 +34,7 @@ dependencies = [
   # "singleton_package",
   "cachetools",
 ]
-optional-dependencies = {"fastapi" = ["fastapi>=0.65.0", "uvicorn[standard]>=0.13.0"],"django" = ["Django>=3.2"],"dev" = ["check-manifest"],"test" = ["coverage"]}
+optional-dependencies = {"fastapi"=["fastapi>=0.65.0", "uvicorn[standard]>=0.13.0"], "django"=["Django>=3.2"], "httpx"=["httpx"], "dev"=["check-manifest"], "test" = ["coverage"], "all"=["fastapi", "uvicorn", "django", "httpx", "dev", "test"]}
 
 [project.urls]
 "Homepage" = "https://github.com/ussoio/usso-python"

usso-0.26.1/src/usso/httpx_session.py

@@ -0,0 +1,87 @@
+from datetime import datetime, timedelta
+
+import httpx
+import jwt
+
+
+class AsyncUssoSession(httpx.AsyncClient):
+    def __init__(
+        self,
+        sso_refresh_url: str,
+        refresh_token: str | None = None,
+        api_key: str | None = None,
+        user_id: str | None = None,
+    ):
+        super().__init__()
+        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
+        self.api_key = api_key
+        self.user_id = user_id
+
+    @property
+    def refresh_token(self):
+        if self._refresh_token:
+            decoded_token = jwt.decode(
+                self._refresh_token, options={"verify_signature": False}
+            )
+            exp = decoded_token.get(
+                "exp", (datetime.now() + timedelta(days=1)).timestamp()
+            )
+            exp = datetime.fromtimestamp(exp)
+            if exp < datetime.now():
+                self._refresh_token = None
+
+        return self._refresh_token
+
+    async def _refresh_api(self):
+        params = {"user_id": self.user_id} if self.user_id else {}
+        async with httpx.AsyncClient() as session:
+            response = await session.get(
+                f"{self.sso_refresh_url}/api",
+                headers={"x-api-key": self.api_key},
+                params=params,
+            )
+            response.raise_for_status()
+            data: dict = response.json()
+            self._refresh_token = data.get("token", {}).get("refresh_token")
+
+    async def _refresh(self):
+        if not self.refresh_token and not self.api_key:
+            raise ValueError("Refresh token not provided or invalid.")
+
+        if self.api_key and not self.refresh_token:
+            await self._refresh_api()
+
+        async with httpx.AsyncClient() as session:
+            response = await session.post(
+                self.sso_refresh_url, json={"refresh_token": self.refresh_token}
+            )
+            response.raise_for_status()
+            return 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.get("access_token")
+
+    async def request(self, method: str, url: str, *args, **kwargs):
+        await self._ensure_valid_token()
+
+        # Add authorization header to each request
+        headers = kwargs.pop("headers") or {}
+        headers["Authorization"] = f"Bearer {self.access_token}"
+
+        # Call the parent's request method
+        return await super().request(method, url, headers=headers, *args, **kwargs)

{usso-0.25.4 → usso-0.26.1}/src/usso/session.py

@@ -58,6 +58,8 @@ class UssoSession:
             json={"refresh_token": f"{self.refresh_token}"},
         )
         response.raise_for_status()
+        self.access_token = response.json().get("access_token")
+        self.session.headers.update({"Authorization": f"Bearer {self.access_token}"})
         return response.json()
 
     def get_session(self):

{usso-0.25.4 → usso-0.26.1/src/usso.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: usso
-Version: 0.25.4
+Version: 0.26.1
 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>
@@ -51,10 +51,19 @@ Requires-Dist: fastapi>=0.65.0; extra == "fastapi"
 Requires-Dist: uvicorn[standard]>=0.13.0; extra == "fastapi"
 Provides-Extra: django
 Requires-Dist: Django>=3.2; extra == "django"
+Provides-Extra: httpx
+Requires-Dist: httpx; extra == "httpx"
 Provides-Extra: dev
 Requires-Dist: check-manifest; extra == "dev"
 Provides-Extra: test
 Requires-Dist: coverage; extra == "test"
+Provides-Extra: all
+Requires-Dist: fastapi; extra == "all"
+Requires-Dist: uvicorn; extra == "all"
+Requires-Dist: django; extra == "all"
+Requires-Dist: httpx; extra == "all"
+Requires-Dist: dev; extra == "all"
+Requires-Dist: test; extra == "all"
 
 # USSO-Client
 

{usso-0.25.4 → usso-0.26.1}/src/usso.egg-info/SOURCES.txt

@@ -8,6 +8,7 @@ src/usso/async_session.py
 src/usso/b64tools.py
 src/usso/core.py
 src/usso/exceptions.py
+src/usso/httpx_session.py
 src/usso/session.py
 src/usso.egg-info/PKG-INFO
 src/usso.egg-info/SOURCES.txt

{usso-0.25.4 → usso-0.26.1}/src/usso.egg-info/requires.txt

@@ -3,6 +3,14 @@ requests>=2.26.0
 pyjwt[crypto]
 cachetools
 
+[all]
+fastapi
+uvicorn
+django
+httpx
+dev
+test
+
 [dev]
 check-manifest
 
@@ -13,5 +21,8 @@ Django>=3.2
 fastapi>=0.65.0
 uvicorn[standard]>=0.13.0
 
+[httpx]
+httpx
+
 [test]
 coverage