usso 0.27.1__tar.gz → 0.27.2__tar.gz

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

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

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

@@ -1,13 +1,11 @@
 from urllib.parse import urlparse
 
 import requests
-from singleton import Singleton
 
 from ..core import is_expired
 
 
-class BaseUssoSession(metaclass=Singleton):
-
+class BaseUssoSession:
     def __init__(
         self,
         usso_base_url: str | None = None,

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

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