usso 0.27.7__tar.gz → 0.27.9__tar.gz

{usso-0.27.7/src/usso.egg-info → usso-0.27.9}/PKG-INFO

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "usso"
-version = "0.27.7"
+version = "0.27.9"
 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.27.7 → usso-0.27.9}/src/usso/core.py

@@ -63,7 +63,7 @@ def is_expired(token: str, **kwargs) -> bool:
     decoded_token: dict = jwt.decode(token, options={"verify_signature": False})
     exp = decoded_token.get("exp", (now + timedelta(days=1)).timestamp())
     exp = datetime.fromtimestamp(exp)
-    return exp >= now
+    return exp < now
 
 
 @cached(TTLCache(maxsize=128, ttl=10 * 60))

usso-0.27.9/src/usso/session/async_session.py

@@ -0,0 +1,96 @@
+import os
+import httpx
+from ..core import is_expired
+from .base_session import BaseUssoSession
+
+
+class AsyncUssoSession(httpx.AsyncClient, BaseUssoSession):
+    def __init__(
+        self,
+        *,
+        usso_base_url: str | None = os.getenv("USSO_URL"),
+        api_key: str | None = os.getenv("USSO_API_KEY"),
+        usso_refresh_url: str | None = os.getenv("USSO_REFRESH_URL"),
+        refresh_token: str | None = os.getenv("USSO_REFRESH_TOKEN"),
+        usso_api_key: str | None = os.getenv("USSO_ADMIN_API_KEY"),
+        user_id: str | None = None,
+    ):
+        httpx.AsyncClient.__init__(self)
+        BaseUssoSession.__init__(
+            self,
+            usso_base_url=usso_base_url,
+            api_key=api_key,
+            usso_refresh_url=usso_refresh_url,
+            refresh_token=refresh_token,
+            usso_api_key=usso_api_key,
+            user_id=user_id,
+        )
+        self._refresh_sync()
+
+    def _prepare_refresh_request(self) -> tuple[dict, dict]:
+        """
+        Helper function to prepare headers and parameters for refresh requests.
+        """
+        headers = {"x-api-key": self.usso_api_key} if self.usso_api_key else {}
+        params = {"user_id": self.user_id} if self.user_id else {}
+        return headers, params
+
+    def _handle_refresh_response(self, response: httpx.Response) -> dict:
+        """
+        Helper function to process the response from refresh requests.
+        """
+        response.raise_for_status()
+        data = response.json()
+        self.access_token = data.get("access_token")
+        self._refresh_token = data.get("token", {}).get("refresh_token")
+        if self.access_token:
+            self.headers.update({"Authorization": f"Bearer {self.access_token}"})
+        return data
+
+    def _refresh_sync(self) -> dict:
+        assert (
+            self.refresh_token or self.usso_api_key
+        ), "refresh_token or usso_api_key is required"
+
+        headers, params = self._prepare_refresh_request()
+
+        if self.usso_api_key and not self.refresh_token:
+            response = httpx.get(
+                f"{self.usso_refresh_url}/api", headers=headers, params=params
+            )
+            self._handle_refresh_response(response)
+
+        response = httpx.post(
+            self.usso_refresh_url, json={"refresh_token": self.refresh_token}
+        )
+        return self._handle_refresh_response(response)
+
+    async def _refresh(self) -> dict:
+        assert (
+            self.refresh_token or self.usso_api_key
+        ), "refresh_token or usso_api_key is required"
+
+        headers, params = self._prepare_refresh_request()
+
+        if self.usso_api_key and not self.refresh_token:
+            response = await self.get(
+                f"{self.usso_refresh_url}/api", headers=headers, params=params
+            )
+            self._handle_refresh_response(response)
+
+        response = await self.post(
+            self.usso_refresh_url, json={"refresh_token": self.refresh_token}
+        )
+        return self._handle_refresh_response(response)
+
+    async def get_session(self):
+        if self.api_key:
+            return self
+
+        if not self.access_token or is_expired(self.access_token):
+            await self._refresh()
+        return self
+
+    async def _request(self, method: str, url: str, **kwargs):
+        session = await self.get_session()
+        return await session.request(method, url, **kwargs)

{usso-0.27.7 → usso-0.27.9}/src/usso/session/session.py

@@ -28,6 +28,7 @@ class UssoSession(BaseUssoSession, requests.Session):
             usso_api_key=usso_api_key,
             user_id=user_id,
         )
+        self._refresh()
         self.headers.update(self.headers)
 
     def _refresh_api(self):

{usso-0.27.7 → usso-0.27.9/src/usso.egg-info}/PKG-INFO

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

@@ -1,69 +0,0 @@
-import os
-
-import httpx
-
-from ..core import is_expired
-from .base_session import BaseUssoSession
-
-
-class AsyncUssoSession(httpx.AsyncClient, BaseUssoSession):
-
-    def __init__(
-        self,
-        *,
-        usso_base_url: str | None = os.getenv("USSO_URL"),
-        api_key: str | None = os.getenv("USSO_API_KEY"),
-        usso_refresh_url: str | None = os.getenv("USSO_REFRESH_URL"),
-        refresh_token: str | None = os.getenv("USSO_REFRESH_TOKEN"),
-        usso_api_key: str | None = os.getenv("USSO_ADMIN_API_KEY"),
-        user_id: str | None = None,
-    ):
-        httpx.AsyncClient.__init__(self)
-        BaseUssoSession.__init__(
-            self,
-            usso_base_url=usso_base_url,
-            api_key=api_key,
-            usso_refresh_url=usso_refresh_url,
-            refresh_token=refresh_token,
-            usso_api_key=usso_api_key,
-            user_id=user_id,
-        )
-
-    async def _refresh_api(self):
-        params = {"user_id": self.user_id} if self.user_id else {}
-        response = await self.get(
-            f"{self.usso_refresh_url}/api",
-            headers={"x-api-key": self.usso_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):
-        assert (
-            self.refresh_token or self.usso_api_key
-        ), "refresh_token or usso_api_key is required"
-
-        if self.usso_api_key and not self.refresh_token:
-            await self._refresh_api()
-
-        response = await self.post(
-            self.usso_refresh_url, json={"refresh_token": f"{self.refresh_token}"}
-        )
-        response.raise_for_status()
-        self.access_token = response.json().get("access_token")
-        self.headers.update({"Authorization": f"Bearer {self.access_token}"})
-        return response.json()
-
-    async def get_session(self):
-        if self.api_key:
-            return self
-
-        if not self.access_token or is_expired(self.access_token):
-            await self._refresh()
-        return self
-
-    async def _request(self, method: str, url: str, **kwargs):
-        session = await self.get_session()
-        return await session.request(method, url, **kwargs)