usso 0.27.1__tar.gz → 0.27.4__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: usso
-Version: 0.27.1
+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.1 → 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.1 → usso-0.27.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "usso"
-version = "0.27.1"
+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.4/src/usso/client/__init__.py

@@ -0,0 +1,4 @@
+from .api import UssoAPI
+from .async_api import AsyncUssoAPI
+
+__all__ = ["UssoAPI", "AsyncUssoAPI"]

{usso-0.27.1 → usso-0.27.4}/src/usso/client/async_api.py

@@ -1,6 +1,6 @@
 import logging
 
-import aiohttp
+import httpx
 from singleton import Singleton
 
 from usso.core import UserData, Usso
@@ -28,18 +28,16 @@ class AsyncUssoAPI(metaclass=Singleton):
             return
 
         url = f"{self.url}/auth/refresh"
+        headers = {
+            "Authorization": f"Bearer {self.refresh_token}",
+            "Content-Type": "application/json",
+        }
 
-        if self.refresh_token:
-            headers = {
-                "Authorization": f"Bearer {self.refresh_token}",
-                "content-type": "application/json",
-            }
-
-        async with aiohttp.ClientSession() as session:
-            async with session.post(url, headers=headers) as resp:
-                if kwargs.get("raise_exception", True):
-                    resp.raise_for_status()
-                self.access_token = (await resp.json()).get("access_token")
+        async with httpx.AsyncClient() as client:
+            resp = await client.post(url, headers=headers)
+            if kwargs.get("raise_exception", True):
+                resp.raise_for_status()
+            self.access_token = resp.json().get("access_token")
 
     def _access_valid(self) -> bool:
         if not self.access_token:
@@ -48,9 +46,7 @@ class AsyncUssoAPI(metaclass=Singleton):
         user_data = Usso(
             jwks_url=f"{self.url}/website/jwks.json?"
         ).user_data_from_token(self.access_token)
-        if user_data:
-            return True
-        return False
+        return bool(user_data)
 
     async def _request(
         self,
@@ -60,7 +56,7 @@ class AsyncUssoAPI(metaclass=Singleton):
         **kwargs,
     ) -> dict:
         url = f"{self.url}/{endpoint}"
-        headers = {"content-type": "application/json"}
+        headers = {"Content-Type": "application/json"}
         if self.api_key:
             headers["x-api-key"] = self.api_key
         elif self.refresh_token:
@@ -68,54 +64,41 @@ class AsyncUssoAPI(metaclass=Singleton):
                 await self._refresh()
             headers["Authorization"] = f"Bearer {self.access_token}"
 
-        async with aiohttp.ClientSession() as session:
-            async with session.request(
-                method,
-                url,
-                headers=headers,
-                json=data,
-            ) as resp:
-                try:
-                    resp_json = await resp.json()
-                    resp.raise_for_status()
-                except aiohttp.ClientError as e:
-                    logging.error(f"Error: {e}")
-                    logging.error(f"Response: {resp_json}")
-                    raise e
-                except Exception as e:
-                    logging.error(f"Error: {e}")
-                    logging.error(f"Response: {resp.text}")
-                    raise e
-                return await resp.json()
+        async with httpx.AsyncClient() as client:
+            try:
+                resp = await client.request(
+                    method,
+                    url,
+                    headers=headers,
+                    json=data,
+                )
+                resp.raise_for_status()
+                return resp.json()
+            except httpx.HTTPStatusError as e:
+                logging.error(f"HTTP error: {e.response.status_code} {e.response.text}")
+                raise e
+            except Exception as e:
+                logging.error(f"Unexpected error: {e}")
+                raise e
 
     async def get_users(self, **kwargs) -> list[UserData]:
         users_dict = await self._request(endpoint="website/users", **kwargs)
-
         return [UserData(user_id=user.get("uid"), **user) for user in users_dict]
 
     async def get_user(self, user_id: str, **kwargs) -> UserData:
-        user_dict = await self._request(
-            endpoint=f"website/users/{user_id}",
-            **kwargs,
-        )
+        user_dict = await self._request(endpoint=f"website/users/{user_id}", **kwargs)
         return UserData(user_id=user_dict.get("uid"), **user_dict)
 
     async def get_user_by_credentials(self, credentials: dict, **kwargs) -> UserData:
         user_dict = await self._request(
-            endpoint="website/users/credentials",
-            data=credentials,
-            **kwargs,
+            endpoint="website/users/credentials", data=credentials, **kwargs
         )
         return UserData(user_id=user_dict.get("uid"), **user_dict)
 
     async def create_user(self, user_data: dict, **kwargs) -> UserData:
         user_dict = await self._request(
-            method="post",
-            endpoint="website/users",
-            data=user_data,
-            **kwargs,
+            method="post", endpoint="website/users", data=user_data, **kwargs
         )
-
         return UserData(user_id=user_dict.get("uid"), **user_dict)
 
     async def create_user_credentials(
@@ -139,10 +122,7 @@ class AsyncUssoAPI(metaclass=Singleton):
         if credentials:
             user_data["authenticators"] = [credentials]
         user_dict = await self._request(
-            method="post",
-            endpoint="website/users",
-            data=credentials,
-            **kwargs,
+            method="post", endpoint="website/users", data=credentials, **kwargs
         )
         return UserData(user_id=user_dict.get("uid"), **user_dict)
 

{usso-0.27.1 → usso-0.27.4}/src/usso/django/middleware.py

@@ -6,6 +6,7 @@ from django.db.utils import IntegrityError
 from django.http import JsonResponse
 from django.http.request import HttpRequest
 from django.utils.deprecation import MiddlewareMixin
+
 from usso import UserData, Usso, USSOException
 
 logger = logging.getLogger("usso")

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

@@ -0,0 +1,4 @@
+from .async_session import AsyncUssoSession
+from .session import UssoSession
+
+__all__ = ["UssoSession", "AsyncUssoSession"]

{usso-0.27.1 → 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.4/src/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-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.1 → usso-0.27.4/src/usso.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: usso
-Version: 0.27.1
+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.1 → 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

usso-0.27.1/src/usso/session/session.py

@@ -1,118 +0,0 @@
-from urllib.parse import urlparse
-
-import requests
-from singleton import Singleton
-
-from ..core import is_expired
-
-
-class BaseUssoSession(metaclass=Singleton):
-
-    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,
-        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)
-
-
-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.1 → usso-0.27.4}/src/usso/fastapi/integration.py

@@ -1,8 +1,8 @@
 import logging
 
+from fastapi import Request, WebSocket
 from starlette.status import HTTP_401_UNAUTHORIZED
 
-from fastapi import Request, WebSocket
 from usso.exceptions import USSOException
 
 from ..core import UserData, Usso, get_authorization_scheme_param