usso 0.27.17__tar.gz → 0.27.19__tar.gz

{usso-0.27.17/src/usso.egg-info → usso-0.27.19}/PKG-INFO

@@ -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 → usso-0.27.19}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "usso"
-version = "0.27.17"
+version = "0.27.19"
 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.17 → usso-0.27.19}/src/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-0.27.17 → usso-0.27.19}/src/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-0.27.17 → usso-0.27.19}/src/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-0.27.19/src/usso/session/base_session.py

@@ -0,0 +1,95 @@
+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,
+        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: Optional["BaseUssoSession"] = None,
+        **kwargs,
+    ):
+        if client:
+            self.copy_attributes_from(client)
+            return
+
+        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}"
+        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.usso_admin_api_key = usso_admin_api_key
+        self.user_id = user_id
+        self.headers = getattr(self, "headers", {})
+
+    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_admin_api_key = client.usso_admin_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):
+            self._refresh_token = None
+
+        return self._refresh_token

{usso-0.27.17 → usso-0.27.19}/src/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 → usso-0.27.19/src/usso.egg-info}/PKG-INFO

@@ -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/src/usso/session/base_session.py

@@ -1,86 +0,0 @@
-import os
-from urllib.parse import urlparse
-
-from usso.core import is_expired
-
-
-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"),
-        user_id: str | None = None,
-        client: "BaseUssoSession" = None,
-    ):
-        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 usso_base_url:
-            url_parts = urlparse(usso_refresh_url)
-            usso_base_url = f"{url_parts.scheme}://{url_parts.netloc}"
-        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
-        self.api_key = api_key
-        self.usso_api_key = usso_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
-        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):
-            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)