usso 0.27.2__py3-none-any.whl → 0.27.4__py3-none-any.whl

usso/session/async_session.py

@@ -1,29 +1,33 @@
+import os
+
 import httpx
 
 from ..core import is_expired
-from .session import BaseUssoSession
+from .base_session import BaseUssoSession
 
 
 class AsyncUssoSession(httpx.AsyncClient, BaseUssoSession):
+
     def __init__(
         self,
-        usso_base_url: str | None = None,
-        api_key: str | None = None,
-        usso_refresh_url: str | None = None,
-        refresh_token: str | None = None,
-        usso_api_key: str | None = None,
+        *,
+        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,
     ):
+        httpx.AsyncClient.__init__(self)
         BaseUssoSession.__init__(
             self,
-            usso_base_url,
-            api_key,
-            usso_refresh_url,
-            refresh_token,
-            usso_api_key,
-            user_id,
+            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,
         )
-        httpx.AsyncClient.__init__(self, headers=self.headers)
 
     async def _refresh_api(self):
         params = {"user_id": self.user_id} if self.user_id else {}

usso/session/base_session.py

@@ -0,0 +1,69 @@
+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,
+    ):
+        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_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 api_key:
+            self.headers.update({"x-api-key": api_key})
+
+    @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)

usso/session/session.py

@@ -1,79 +1,37 @@
-from urllib.parse import urlparse
+import os
 
 import requests
+from usso.core import is_expired
 
-from ..core import is_expired
+from .base_session import BaseUssoSession
 
 
-class BaseUssoSession:
+class UssoSession(BaseUssoSession, requests.Session):
+
     def __init__(
         self,
-        usso_base_url: str | None = None,
-        api_key: str | None = None,
-        usso_refresh_url: str | None = None,
-        refresh_token: str | None = None,
-        usso_api_key: str | None = None,
+        *,
+        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,
     ):
-        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_refresh_url = usso_refresh_url or f"{usso_base_url}/auth/refresh"
-        self._refresh_token = refresh_token
-        self.session = requests.Session()
-        self.access_token = None
-        self.api_key = api_key
-        self.usso_api_key = usso_api_key
-        self.user_id = user_id
-        self.headers = {}
-        if api_key:
-            self.headers = {"x-api-key": api_key}
-            self.session.headers.update(self.headers)
-
-    @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)
-
+        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)
 
-class UssoSession(BaseUssoSession):
     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(
             f"{self.usso_refresh_url}/api",
@@ -97,20 +55,17 @@ class UssoSession(BaseUssoSession):
         )
         response.raise_for_status()
         self.access_token = response.json().get("access_token")
-        self.session.headers.update({"Authorization": f"Bearer {self.access_token}"})
+        self.headers.update({"Authorization": f"Bearer {self.access_token}"})
         return response.json()
 
     def get_session(self):
         if self.api_key:
-            return self.session
+            return self
 
         if not self.access_token or is_expired(self.access_token):
             self._refresh()
-        return self.session
+        return self
 
     def _request(self, method: str, url: str, **kwargs):
-        session = self.get_session()
-        return session.request(method, url, **kwargs)
-
-    def close(self):
-        self.session.close()
+        self.get_session()
+        return requests.Session.request(self, method, url, **kwargs)

{usso-0.27.2.dist-info → usso-0.27.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: usso
-Version: 0.27.2
+Version: 0.27.4
 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>
@@ -81,7 +81,7 @@ The USSO-Client provides a universal single sign-on (SSO) integration for micros
 Install the USSO client using pip:
 
 ```bash
-pip install usso-client
+pip install usso
 ```
 
 To add framework-specific support, use the following commands:
@@ -89,7 +89,13 @@ To add framework-specific support, use the following commands:
 For FastAPI:
 
 ```bash
-pip install "usso-client[fastapi]"
+pip install "usso[fastapi]"
+```
+
+For Django:
+
+```bash
+pip install "usso[django]"
 ```
 
 ## Quick Start

{usso-0.27.2.dist-info → usso-0.27.4.dist-info}/RECORD

@@ -11,11 +11,12 @@ usso/django/middleware.py,sha256=EEEpHvMQ6QiWw2HY8zQ2Aec0RCATcLWsCKeyiPWJKio,324
 usso/fastapi/__init__.py,sha256=0EcdOzb4f3yu9nILIdGWnlyUz-0VaVX2az1e3f2BusI,201
 usso/fastapi/integration.py,sha256=O788Pkvyv3ncTs4ObUwL_iDvzvL83MT2qnp4Al0sxXo,2321
 usso/session/__init__.py,sha256=tE4qWUdSI7iN_pywm47Mg8NKOTBa2nCNwCy3wCZWRmU,124
-usso/session/async_session.py,sha256=SSfB1tDcq5p0eXd2awfTsVYQWm5IRL-1GeMo1zsVFks,2081
-usso/session/session.py,sha256=R5i5ZYiNy5B76gHXDlr-uFT_OIyUIK72mXiw7xLLhn4,3738
-usso-0.27.2.dist-info/LICENSE.txt,sha256=ceC9ZJOV9H6CtQDcYmHOS46NA3dHJ_WD4J9blH513pc,1081
-usso-0.27.2.dist-info/METADATA,sha256=Nyx0DshLl4n6xPGG1maRjniligcgQHR_-fB6S1pSmus,4489
-usso-0.27.2.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-usso-0.27.2.dist-info/entry_points.txt,sha256=4Zgpm5ELaAWPf0jPGJFz1_X69H7un8ycT3WdGoJ0Vvk,35
-usso-0.27.2.dist-info/top_level.txt,sha256=g9Jf6h1Oyidh0vPiFni7UHInTJjSvu6cUalpLTIvthg,5
-usso-0.27.2.dist-info/RECORD,,
+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.4.dist-info/LICENSE.txt,sha256=ceC9ZJOV9H6CtQDcYmHOS46NA3dHJ_WD4J9blH513pc,1081
+usso-0.27.4.dist-info/METADATA,sha256=SbfHdpdZb1hqb2bkjuQNrzvEVOslIKDUhhoczzmnYzo,4528
+usso-0.27.4.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+usso-0.27.4.dist-info/entry_points.txt,sha256=4Zgpm5ELaAWPf0jPGJFz1_X69H7un8ycT3WdGoJ0Vvk,35
+usso-0.27.4.dist-info/top_level.txt,sha256=g9Jf6h1Oyidh0vPiFni7UHInTJjSvu6cUalpLTIvthg,5
+usso-0.27.4.dist-info/RECORD,,