usso 0.27.2__tar.gz → 0.27.4__tar.gz

{usso-0.27.2/src/usso.egg-info → usso-0.27.4}/PKG-INFO

@@ -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 → usso-0.27.4}/README.md

@@ -14,7 +14,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:
@@ -22,7 +22,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 → usso-0.27.4}/pyproject.toml

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

@@ -1,18 +1,17 @@
+import os
 from urllib.parse import urlparse
-
-import requests
-
-from ..core import is_expired
+from usso.core import is_expired
 
 
 class 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,
     ):
         assert (
@@ -30,15 +29,13 @@ class BaseUssoSession:
 
         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 = {}
+        self.headers = getattr(self, "headers", {})
         if api_key:
-            self.headers = {"x-api-key": api_key}
-            self.session.headers.update(self.headers)
+            self.headers.update({"x-api-key": api_key})
 
     @property
     def refresh_token(self):
@@ -70,47 +67,3 @@ class BaseUssoSession:
 
     def options(self, url: str, **kwargs):
         return self._request("OPTIONS", url, **kwargs)
-
-
-class UssoSession(BaseUssoSession):
-    def _refresh_api(self):
-        params = {"user_id": self.user_id} if self.user_id else {}
-        response = requests.get(
-            f"{self.usso_refresh_url}/api",
-            headers={"x-api-key": self.usso_api_key},
-            params=params,
-        )
-        response.raise_for_status()
-        data: dict = response.json()
-        self._refresh_token = data.get("token", {}).get("refresh_token")
-
-    def _refresh(self):
-        assert (
-            self.refresh_token or self.usso_api_key
-        ), "refresh_token or usso_api_key is required"
-
-        if self.usso_api_key and not self.refresh_token:
-            self._refresh_api()
-
-        response = requests.post(
-            self.usso_refresh_url, json={"refresh_token": f"{self.refresh_token}"}
-        )
-        response.raise_for_status()
-        self.access_token = response.json().get("access_token")
-        self.session.headers.update({"Authorization": f"Bearer {self.access_token}"})
-        return response.json()
-
-    def get_session(self):
-        if self.api_key:
-            return self.session
-
-        if not self.access_token or is_expired(self.access_token):
-            self._refresh()
-        return self.session
-
-    def _request(self, method: str, url: str, **kwargs):
-        session = self.get_session()
-        return session.request(method, url, **kwargs)
-
-    def close(self):
-        self.session.close()

usso-0.27.4/src/usso/session/session.py

@@ -0,0 +1,71 @@
+import os
+
+import requests
+from usso.core import is_expired
+
+from .base_session import BaseUssoSession
+
+
+class UssoSession(BaseUssoSession, requests.Session):
+
+    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,
+    ):
+        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)
+
+    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",
+            headers={"x-api-key": self.usso_api_key},
+            params=params,
+        )
+        response.raise_for_status()
+        data: dict = response.json()
+        self._refresh_token = data.get("token", {}).get("refresh_token")
+
+    def _refresh(self):
+        assert (
+            self.refresh_token or self.usso_api_key
+        ), "refresh_token or usso_api_key is required"
+
+        if self.usso_api_key and not self.refresh_token:
+            self._refresh_api()
+
+        response = requests.post(
+            self.usso_refresh_url, json={"refresh_token": f"{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()
+
+    def get_session(self):
+        if self.api_key:
+            return self
+
+        if not self.access_token or is_expired(self.access_token):
+            self._refresh()
+        return self
+
+    def _request(self, method: str, url: str, **kwargs):
+        self.get_session()
+        return requests.Session.request(self, method, url, **kwargs)

{usso-0.27.2 → usso-0.27.4/src/usso.egg-info}/PKG-INFO

@@ -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 → usso-0.27.4}/src/usso.egg-info/SOURCES.txt

@@ -21,6 +21,7 @@ src/usso/fastapi/__init__.py
 src/usso/fastapi/integration.py
 src/usso/session/__init__.py
 src/usso/session/async_session.py
+src/usso/session/base_session.py
 src/usso/session/session.py
 tests/test_api.py
 tests/test_core.py