usso 0.27.20__py3-none-any.whl → 0.27.22__py3-none-any.whl

usso/session/async_session.py

@@ -29,14 +29,16 @@ class AsyncUssoSession(httpx.AsyncClient, BaseUssoSession):
             user_id=user_id,
             client=client,
         )
-        if not self.api_key:
+        if not hasattr(self, "api_key") or not self.api_key:
             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 {}
+        headers = (
+            {"x-api-key": self.usso_admin_api_key} if self.usso_admin_api_key else {}
+        )
         params = {"user_id": self.user_id} if self.user_id else {}
         return headers, params
 
@@ -54,12 +56,12 @@ class AsyncUssoSession(httpx.AsyncClient, BaseUssoSession):
 
     def _refresh_sync(self) -> dict:
         assert (
-            self.refresh_token or self.usso_api_key
+            self.refresh_token or self.usso_admin_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:
+        if self.usso_admin_api_key and not self.refresh_token:
             response = httpx.get(
                 f"{self.usso_refresh_url}/api", headers=headers, params=params
             )
@@ -72,12 +74,12 @@ class AsyncUssoSession(httpx.AsyncClient, BaseUssoSession):
 
     async def _refresh(self) -> dict:
         assert (
-            self.refresh_token or self.usso_api_key
+            self.refresh_token or self.usso_admin_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:
+        if self.usso_admin_api_key and not self.refresh_token:
             response = await self.get(
                 f"{self.usso_refresh_url}/api", headers=headers, params=params
             )
@@ -89,7 +91,7 @@ class AsyncUssoSession(httpx.AsyncClient, BaseUssoSession):
         return self._handle_refresh_response(response)
 
     async def get_session(self):
-        if self.api_key:
+        if hasattr(self, "api_key") and self.api_key:
             return self
 
         if not self.access_token or is_expired(self.access_token):

usso/session/base_session.py

@@ -2,9 +2,7 @@ import os
 from urllib.parse import urlparse
 
 from usso.core import is_expired
-from typing import Optional, Any, Callable
-import inspect
-
+from typing import Optional
 
 
 class BaseUssoSession:
@@ -61,7 +59,10 @@ class BaseUssoSession:
 
         if api_key:
             self.api_key = api_key
+            self.headers = self.headers or {}
             self.headers.update({"x-api-key": api_key})
+        else:
+            self.api_key = None
 
         if not usso_base_url:
             url_parts = urlparse(usso_refresh_url)

usso/session/session.py

@@ -40,11 +40,11 @@ class UssoSession(httpx.Client, BaseUssoSession):
             self._refresh()
 
     def _refresh_api(self):
-        assert self.usso_api_key, "usso_api_key is required"
+        assert self.usso_admin_api_key, "usso_api_key is required"
         params = {"user_id": self.user_id} if self.user_id else {}
         response = httpx.get(
             f"{self.usso_refresh_url}/api",
-            headers={"x-api-key": self.usso_api_key},
+            headers={"x-api-key": self.usso_admin_api_key},
             params=params,
         )
         response.raise_for_status()
@@ -53,10 +53,10 @@ class UssoSession(httpx.Client, BaseUssoSession):
 
     def _refresh(self):
         assert (
-            self.refresh_token or self.usso_api_key
+            self.refresh_token or self.usso_admin_api_key
         ), "refresh_token or usso_api_key is required"
 
-        if self.usso_api_key and not self.refresh_token:
+        if self.usso_admin_api_key and not self.refresh_token:
             self._refresh_api()
 
         response = httpx.post(

{usso-0.27.20.dist-info → usso-0.27.22.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: usso
-Version: 0.27.20
+Version: 0.27.22
 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.20.dist-info → usso-0.27.22.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=CLtgIXcLF0if_VX1x0IJK_RpVEu1waUw69x4YVj4xxU,3517
-usso/session/base_session.py,sha256=wZ96VPf0zz8zDRtjJrOmZ2S4XvEBLLZAc74A4iDy7G4,3369
-usso/session/session.py,sha256=bjG0-WJIzNPTW1dKG1kKcwiXDNtRq-fZ__G2wNME-Lw,2545
-usso-0.27.20.dist-info/LICENSE.txt,sha256=ceC9ZJOV9H6CtQDcYmHOS46NA3dHJ_WD4J9blH513pc,1081
-usso-0.27.20.dist-info/METADATA,sha256=IHOr6tLj0dSr4TRTKNcxYIfhxVhI9B1b5ob6u4eL-7s,4580
-usso-0.27.20.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-usso-0.27.20.dist-info/entry_points.txt,sha256=4Zgpm5ELaAWPf0jPGJFz1_X69H7un8ycT3WdGoJ0Vvk,35
-usso-0.27.20.dist-info/top_level.txt,sha256=g9Jf6h1Oyidh0vPiFni7UHInTJjSvu6cUalpLTIvthg,5
-usso-0.27.20.dist-info/RECORD,,
+usso/session/async_session.py,sha256=bOWUeBpE2reDdK9zXrD4ZrZrRWlEOyyafWgPcLg2WLY,3638
+usso/session/base_session.py,sha256=1Ad6LbX8IsCPTeEIopnYwybrkPkN5zgGUobv8VHcipA,3430
+usso/session/session.py,sha256=T3v3lGvLxs4Yi-zZRzdKHLxEo2rtVewcLk-1V6Y44Jk,2569
+usso-0.27.22.dist-info/LICENSE.txt,sha256=ceC9ZJOV9H6CtQDcYmHOS46NA3dHJ_WD4J9blH513pc,1081
+usso-0.27.22.dist-info/METADATA,sha256=_di-fqd1GQaRLFMQHK2aVHv6xApGgeOEPlYYjqoI15E,4580
+usso-0.27.22.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+usso-0.27.22.dist-info/entry_points.txt,sha256=4Zgpm5ELaAWPf0jPGJFz1_X69H7un8ycT3WdGoJ0Vvk,35
+usso-0.27.22.dist-info/top_level.txt,sha256=g9Jf6h1Oyidh0vPiFni7UHInTJjSvu6cUalpLTIvthg,5
+usso-0.27.22.dist-info/RECORD,,