usso 0.27.8__py3-none-any.whl → 0.27.10__py3-none-any.whl

usso/session/async_session.py

@@ -1,13 +1,10 @@
 import os
-
 import httpx
-
 from ..core import is_expired
 from .base_session import BaseUssoSession
 
 
 class AsyncUssoSession(httpx.AsyncClient, BaseUssoSession):
-
     def __init__(
         self,
         *,
@@ -17,44 +14,78 @@ class AsyncUssoSession(httpx.AsyncClient, BaseUssoSession):
         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,
+        client: "AsyncUssoSession" | 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,
-        )
+        if client:
+            self.copy_attributes_from(client)
+        else:
+            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()
 
-    async def _refresh_api(self):
+    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 {}
-        response = await self.get(
-            f"{self.usso_refresh_url}/api",
-            headers={"x-api-key": self.usso_api_key},
-            params=params,
-        )
+        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: dict = response.json()
+        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
 
-    async def _refresh(self):
+    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:
-            await self._refresh_api()
+            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": f"{self.refresh_token}"}
+            self.usso_refresh_url, json={"refresh_token": 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()
+        return self._handle_refresh_response(response)
 
     async def get_session(self):
         if self.api_key:

usso/session/base_session.py

@@ -27,6 +27,7 @@ class BaseUssoSession:
         if usso_base_url.endswith("/"):
             usso_base_url = usso_base_url[:-1]
 
+        self.usso_base_url = usso_base_url
         self.usso_refresh_url = usso_refresh_url or f"{usso_base_url}/auth/refresh"
         self._refresh_token = refresh_token
         self.access_token = None
@@ -37,6 +38,16 @@ class BaseUssoSession:
         if api_key:
             self.headers.update({"x-api-key": api_key})
 
+    def copy_attributes_from(self, client: "BaseUssoSession"):
+        self.usso_base_url = client.usso_base_url
+        self.usso_refresh_url = client.usso_refresh_url
+        self._refresh_token = client._refresh_token
+        self.access_token = client.access_token
+        self.api_key = client.api_key
+        self.usso_api_key = client.usso_api_key
+        self.user_id = client.user_id
+        self.headers = client.headers.copy()
+
     @property
     def refresh_token(self):
         if self._refresh_token and is_expired(self._refresh_token):

usso/session/session.py

@@ -1,12 +1,12 @@
 import os
 
-import requests
+import httpx
 from usso.core import is_expired
 
 from .base_session import BaseUssoSession
 
 
-class UssoSession(BaseUssoSession, requests.Session):
+class UssoSession(BaseUssoSession, httpx.Client):
 
     def __init__(
         self,
@@ -17,23 +17,28 @@ class UssoSession(BaseUssoSession, requests.Session):
         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,
+        client: "UssoSession" | None = None,
     ):
-        requests.Session.__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.headers.update(self.headers)
+        httpx.Client.__init__(self)
+
+        if client:
+            self.copy_attributes_from(client)
+        else:
+            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()
 
     def _refresh_api(self):
         assert self.usso_api_key, "usso_api_key is required"
         params = {"user_id": self.user_id} if self.user_id else {}
-        response = requests.get(
+        response = httpx.get(
             f"{self.usso_refresh_url}/api",
             headers={"x-api-key": self.usso_api_key},
             params=params,
@@ -50,7 +55,7 @@ class UssoSession(BaseUssoSession, requests.Session):
         if self.usso_api_key and not self.refresh_token:
             self._refresh_api()
 
-        response = requests.post(
+        response = httpx.post(
             self.usso_refresh_url, json={"refresh_token": f"{self.refresh_token}"}
         )
         response.raise_for_status()
@@ -68,4 +73,4 @@ class UssoSession(BaseUssoSession, requests.Session):
 
     def _request(self, method: str, url: str, **kwargs):
         self.get_session()
-        return requests.Session.request(self, method, url, **kwargs)
+        return super().request(self, method, url, **kwargs)

{usso-0.27.8.dist-info → usso-0.27.10.dist-info}/METADATA

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

@@ -11,12 +11,12 @@ usso/django/middleware.py,sha256=EEEpHvMQ6QiWw2HY8zQ2Aec0RCATcLWsCKeyiPWJKio,324
 usso/fastapi/__init__.py,sha256=0EcdOzb4f3yu9nILIdGWnlyUz-0VaVX2az1e3f2BusI,201
 usso/fastapi/integration.py,sha256=IonxxNj_B9sG2j672rIzE047qo972vk7ch4-eGENp3Q,2638
 usso/session/__init__.py,sha256=tE4qWUdSI7iN_pywm47Mg8NKOTBa2nCNwCy3wCZWRmU,124
-usso/session/async_session.py,sha256=_9NU_kds1IuMLmBGCDcBnbpGiLUMJJaoAvuzSxs7jZ8,2278
-usso/session/base_session.py,sha256=1A12QulP6UHe1lqYEihGAcBaZ_7C09EWZt3fB6JvbOE,2347
-usso/session/session.py,sha256=GpQtXNau_q-2JQAWjJZ_JEA9QrVJa_3yzW5_lROyzXA,2333
-usso-0.27.8.dist-info/LICENSE.txt,sha256=ceC9ZJOV9H6CtQDcYmHOS46NA3dHJ_WD4J9blH513pc,1081
-usso-0.27.8.dist-info/METADATA,sha256=5lseEywIDCqpBFPW6GQrRsC6xvkPfN-cXKxYOSFLTpg,4528
-usso-0.27.8.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-usso-0.27.8.dist-info/entry_points.txt,sha256=4Zgpm5ELaAWPf0jPGJFz1_X69H7un8ycT3WdGoJ0Vvk,35
-usso-0.27.8.dist-info/top_level.txt,sha256=g9Jf6h1Oyidh0vPiFni7UHInTJjSvu6cUalpLTIvthg,5
-usso-0.27.8.dist-info/RECORD,,
+usso/session/async_session.py,sha256=Q7Rbw5z5tiiagNEvRR26SP7zCvwtV5DTWnanQWghvms,3577
+usso/session/base_session.py,sha256=Hs5ZEME04TJF3qNfk2gqD81Ib9UTZw_ArDRELxnSYVM,2829
+usso/session/session.py,sha256=PHVkDACeSCP7h2Pn38SEl905akwyRbk38gk6-KD8fqI,2450
+usso-0.27.10.dist-info/LICENSE.txt,sha256=ceC9ZJOV9H6CtQDcYmHOS46NA3dHJ_WD4J9blH513pc,1081
+usso-0.27.10.dist-info/METADATA,sha256=7T5zV2MktxkK_Wq-MTHXg0yR0OseSear_9liczD51ks,4529
+usso-0.27.10.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+usso-0.27.10.dist-info/entry_points.txt,sha256=4Zgpm5ELaAWPf0jPGJFz1_X69H7un8ycT3WdGoJ0Vvk,35
+usso-0.27.10.dist-info/top_level.txt,sha256=g9Jf6h1Oyidh0vPiFni7UHInTJjSvu6cUalpLTIvthg,5
+usso-0.27.10.dist-info/RECORD,,