usso 0.27.17__py3-none-any.whl → 0.27.19__py3-none-any.whl

usso/client/api.py

@@ -15,6 +15,7 @@ class UssoAPI(metaclass=Singleton):
     ):
         if url and not url.startswith("http"):
             url = f"https://{url}"
+        url = url.rstrip("/")
         self.url = url
         assert (
             api_key or refresh_token

usso/client/async_api.py

@@ -15,6 +15,7 @@ class AsyncUssoAPI(metaclass=Singleton):
     ):
         if url and not url.startswith("http"):
             url = f"https://{url}"
+        url = url.rstrip("/")
         self.url = url
         assert (
             api_key or refresh_token

usso/core.py

@@ -79,11 +79,15 @@ def decode_token_with_jwk(jwk_url: str, token: str, **kwargs) -> UserData | None
 
 @cachetools.func.ttl_cache(maxsize=128, ttl=10 * 60)
 def fetch_api_key_data(jwk_url: str, api_key: str):
-    parsed = urlparse(jwk_url)
-    url = f"{parsed.scheme}://{parsed.netloc}/api_key/verify"
-    response = httpx.post(url, json={"api_key": api_key})
-    response.raise_for_status()
-    return UserData(**response.json())
+    try:
+        parsed = urlparse(jwk_url)
+        url = f"{parsed.scheme}://{parsed.netloc}/api_key/verify"
+        response = httpx.post(url, json={"api_key": api_key})
+        response.raise_for_status()
+        return UserData(**response.json())
+    except Exception as e:
+        _handle_exception("error", message=str(e))
+
 
 
 class Usso:

usso/session/base_session.py

@@ -2,47 +2,80 @@ import os
 from urllib.parse import urlparse
 
 from usso.core import is_expired
+from typing import Optional, Any, Callable
+import inspect
+
 
 
 class 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"),
+        api_key: str | None = None,
+        *,
+        usso_base_url: str | None = None,
+        usso_refresh_url: str | None = None,
+        refresh_token: str | None = None,
+        app_id: str | None = None,
+        app_secret: str | None = None,
+        access_token: str | None = None,
+        usso_admin_api_key: str | None = None,
         user_id: str | None = None,
-        client: "BaseUssoSession" = None,
+        client: Optional["BaseUssoSession"] = None,
+        **kwargs,
     ):
         if client:
             self.copy_attributes_from(client)
             return
 
-        assert (
-            usso_base_url or usso_refresh_url
-        ), "usso_base_url or usso_refresh_url is required"
-        assert (
-            refresh_token or api_key or usso_api_key
-        ), "refresh_token or api_key or usso_api_key is required"
+        if not (api_key or usso_base_url or usso_refresh_url):
+            if os.getenv("USSO_API_KEY"):
+                api_key = os.getenv("USSO_API_KEY")
+            elif os.getenv("USSO_URL"):
+                usso_base_url = os.getenv("USSO_URL")
+            elif os.getenv("USSO_REFRESH_URL"):
+                usso_refresh_url = os.getenv("USSO_REFRESH_URL")
+            else:
+                raise ValueError(
+                    "one of api_key, usso_base_url or usso_refresh_url is required"
+                )
+
+        if not (
+            api_key
+            or refresh_token
+            or usso_admin_api_key
+            or (app_id and app_secret)
+            or access_token
+        ):
+            if os.getenv("USSO_REFRESH_TOKEN"):
+                refresh_token = os.getenv("USSO_REFRESH_TOKEN")
+            elif os.getenv("USSO_ADMIN_API_KEY"):
+                usso_admin_api_key = os.getenv("USSO_ADMIN_API_KEY")
+            elif os.getenv("USSO_APP_ID") and os.getenv("USSO_APP_SECRET"):
+                app_id = os.getenv("USSO_APP_ID")
+                app_secret = os.getenv("USSO_APP_SECRET")
+            else:
+                raise ValueError(
+                    "one of api_key, refresh_token, usso_admin_api_key, app_id and app_secret or access_token is required"
+                )
+
+        if api_key:
+            self.api_key = api_key
+            self.headers.update({"x-api-key": api_key})
 
         if not usso_base_url:
             url_parts = urlparse(usso_refresh_url)
             usso_base_url = f"{url_parts.scheme}://{url_parts.netloc}"
-        if usso_base_url.endswith("/"):
+        elif 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
-        self.api_key = api_key
-        self.usso_api_key = usso_api_key
+        self.usso_admin_api_key = usso_admin_api_key
         self.user_id = user_id
         self.headers = getattr(self, "headers", {})
-        if self.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
@@ -50,7 +83,7 @@ class BaseUssoSession:
         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.usso_admin_api_key = client.usso_admin_api_key
         self.user_id = client.user_id
         self.headers = client.headers.copy()
 
@@ -60,27 +93,3 @@ class BaseUssoSession:
             self._refresh_token = None
 
         return self._refresh_token
-
-    def request(self, method: str, url: str, **kwargs):
-        return self._request(method, url, **kwargs)
-
-    def get(self, url: str, **kwargs):
-        return self._request("GET", url, **kwargs)
-
-    def post(self, url: str, **kwargs):
-        return self._request("POST", url, **kwargs)
-
-    def put(self, url: str, **kwargs):
-        return self._request("PUT", url, **kwargs)
-
-    def patch(self, url: str, **kwargs):
-        return self._request("PATCH", url, **kwargs)
-
-    def delete(self, url: str, **kwargs):
-        return self._request("DELETE", url, **kwargs)
-
-    def head(self, url: str, **kwargs):
-        return self._request("HEAD", url, **kwargs)
-
-    def options(self, url: str, **kwargs):
-        return self._request("OPTIONS", url, **kwargs)

usso/session/session.py

@@ -1,12 +1,12 @@
 import os
-
+import inspect
+from typing import Callable, Any
 import httpx
 
 from usso.core import is_expired
 
 from .base_session import BaseUssoSession
 
-
 class UssoSession(httpx.Client, BaseUssoSession):
 
     def __init__(
@@ -19,8 +19,12 @@ class UssoSession(httpx.Client, BaseUssoSession):
         usso_api_key: str | None = os.getenv("USSO_ADMIN_API_KEY"),
         user_id: str | None = None,
         client: "UssoSession" = None,
+        **kwargs,
     ):
-        httpx.Client.__init__(self)
+
+        httpx_kwargs = _filter_kwargs(kwargs, httpx.Client.__init__)
+
+        httpx.Client.__init__(self, **httpx_kwargs)
 
         BaseUssoSession.__init__(
             self,

{usso-0.27.17.dist-info → usso-0.27.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: usso
-Version: 0.27.17
+Version: 0.27.19
 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.17.dist-info → usso-0.27.19.dist-info}/RECORD

@@ -1,22 +1,22 @@
 usso/__init__.py,sha256=NnOS_S1a-JKTOlGe1nw-kCL3m0y82mA2mDraus7BQ2o,120
 usso/b64tools.py,sha256=HGQ0E59vzjrQo2-4jrcY03ebtTaYwTtCZ7KgJaEmxO0,610
-usso/core.py,sha256=R4WrOn5bkBJzAnvJZldfihfwNvMn0BnjoKkO5eCnDTA,5533
+usso/core.py,sha256=kZCdHQz-sIbmd9MUd4CVMZACtvP60rbpL1Gszy3tkzQ,5641
 usso/exceptions.py,sha256=ogJsjdUK0HoZdQv5uCnzIVoG-bTTMHBqyvB4swAMsiE,653
 usso/schemas.py,sha256=aK_UWZvqjZLz5r1yBIZX_nL2yPCNUjxpZ93AsV9mAes,1810
 usso/client/__init__.py,sha256=ilGFrugI7bhGXVIcETdbRAye8S7k2mVjkEeziToVzSs,100
-usso/client/api.py,sha256=xlDq2nZNpq3mhAvqIbGEfANHNjJpPquSeULBfS7iMJw,5094
-usso/client/async_api.py,sha256=VBmuUsx9vBy-naeiVNhsGgJOTpD1z7VgH_23lazz3_4,5156
+usso/client/api.py,sha256=-sluL8BMjcI1z8y8thZElCa63nxo25qlmKh3IzK3M6U,5124
+usso/client/async_api.py,sha256=UMN84vmWvLgi-3zsNdhCOjf5zQQQFUJ-wKLztI_rU58,5186
 usso/django/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 usso/django/middleware.py,sha256=EEEpHvMQ6QiWw2HY8zQ2Aec0RCATcLWsCKeyiPWJKio,3245
 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=GyqsmAG5TsmM5LEcf8EjH31ObD9RQg7FC1_DLA8jBWw,2962
-usso/session/session.py,sha256=WnvT0wqBj_z0_N97oaqBleni36SJQdhK9r5k1roxcgY,2389
-usso-0.27.17.dist-info/LICENSE.txt,sha256=ceC9ZJOV9H6CtQDcYmHOS46NA3dHJ_WD4J9blH513pc,1081
-usso-0.27.17.dist-info/METADATA,sha256=mey2QJ0QdUeyuCYy1gmOdaR6LGETszjAcdArWz2DCS0,4580
-usso-0.27.17.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-usso-0.27.17.dist-info/entry_points.txt,sha256=4Zgpm5ELaAWPf0jPGJFz1_X69H7un8ycT3WdGoJ0Vvk,35
-usso-0.27.17.dist-info/top_level.txt,sha256=g9Jf6h1Oyidh0vPiFni7UHInTJjSvu6cUalpLTIvthg,5
-usso-0.27.17.dist-info/RECORD,,
+usso/session/base_session.py,sha256=wZ96VPf0zz8zDRtjJrOmZ2S4XvEBLLZAc74A4iDy7G4,3369
+usso/session/session.py,sha256=aQ5EJ0o0unPz_JxFZWaF4ABwdu-Um9YZGnzCBTBG-bc,2540
+usso-0.27.19.dist-info/LICENSE.txt,sha256=ceC9ZJOV9H6CtQDcYmHOS46NA3dHJ_WD4J9blH513pc,1081
+usso-0.27.19.dist-info/METADATA,sha256=wrS64OzjjPXQVqW90LsVLdUCCZaDIc0vAuElYPn_grs,4580
+usso-0.27.19.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+usso-0.27.19.dist-info/entry_points.txt,sha256=4Zgpm5ELaAWPf0jPGJFz1_X69H7un8ycT3WdGoJ0Vvk,35
+usso-0.27.19.dist-info/top_level.txt,sha256=g9Jf6h1Oyidh0vPiFni7UHInTJjSvu6cUalpLTIvthg,5
+usso-0.27.19.dist-info/RECORD,,

{usso-0.27.17.dist-info → usso-0.27.19.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.6.0)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any