usso 0.27.8__py3-none-any.whl → 0.27.9__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,
         *,
@@ -28,33 +25,63 @@ class AsyncUssoSession(httpx.AsyncClient, BaseUssoSession):
             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
+
+    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)
 
-    async def _refresh(self):
+        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:
-            await self._refresh_api()
+            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/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.8.dist-info → usso-0.27.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: usso
-Version: 0.27.8
+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.8.dist-info → usso-0.27.9.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/async_session.py,sha256=yOWePytbrPrN489xLGFm3jz-dW0I_esRrnGoDwXcKx0,3412
 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/session.py,sha256=us23VzndGIyBW1TbtfL_qwmMobG9ciGuoDlsgraJUkQ,2357
+usso-0.27.9.dist-info/LICENSE.txt,sha256=ceC9ZJOV9H6CtQDcYmHOS46NA3dHJ_WD4J9blH513pc,1081
+usso-0.27.9.dist-info/METADATA,sha256=u_q1K9l6YiNxatNEWwp_WzIW0UoeWSxYxjYHTFh9QeE,4528
+usso-0.27.9.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+usso-0.27.9.dist-info/entry_points.txt,sha256=4Zgpm5ELaAWPf0jPGJFz1_X69H7un8ycT3WdGoJ0Vvk,35
+usso-0.27.9.dist-info/top_level.txt,sha256=g9Jf6h1Oyidh0vPiFni7UHInTJjSvu6cUalpLTIvthg,5
+usso-0.27.9.dist-info/RECORD,,