usso 0.23.2__tar.gz → 0.24.1__tar.gz

{usso-0.23.2/src/usso.egg-info → usso-0.24.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: usso
-Version: 0.23.2
+Version: 0.24.1
 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>
@@ -27,7 +27,7 @@ License: Copyright (c) 2016 The Python Packaging Authority (PyPA)
 Project-URL: Homepage, https://github.com/ussoio/usso-python
 Project-URL: Bug Reports, https://github.com/ussoio/usso-python/issues
 Project-URL: Funding, https://github.com/ussoio/usso-python
-Project-URL: Say Thanks!, https://github.com/ussoio/usso-python
+Project-URL: Say Thanks!, https://saythanks.io/to/mahdikiani
 Project-URL: Source, https://github.com/ussoio/usso-python
 Keywords: usso,sso,authentication,security,fastapi,django
 Classifier: Development Status :: 3 - Alpha

{usso-0.23.2 → usso-0.24.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "usso"
-version = "0.23.2"
+version = "0.24.1"
 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"
@@ -40,7 +40,7 @@ optional-dependencies = {"fastapi" = ["fastapi>=0.65.0", "uvicorn[standard]>=0.1
 "Homepage" = "https://github.com/ussoio/usso-python"
 "Bug Reports" = "https://github.com/ussoio/usso-python/issues"
 "Funding" = "https://github.com/ussoio/usso-python"
-"Say Thanks!" = "https://github.com/ussoio/usso-python"
+"Say Thanks!" = "https://saythanks.io/to/mahdikiani"
 "Source" = "https://github.com/ussoio/usso-python"
 
 [project.scripts]

usso-0.24.1/src/usso/__init__.py

@@ -0,0 +1,4 @@
+from .core import UserData, Usso
+from .exceptions import USSOException
+
+__all__ = ["UserData", "Usso", "USSOException"]

{usso-0.23.2 → usso-0.24.1}/src/usso/api.py

@@ -2,6 +2,7 @@ import logging
 
 import requests
 from singleton import Singleton
+
 from usso.core import UserData, Usso
 
 
@@ -87,9 +88,7 @@ class UssoAPI(metaclass=Singleton):
     def get_users(self, **kwargs) -> list[UserData]:
         users_dict = self._request(endpoint="website/users", **kwargs)
 
-        return [
-            UserData(user_id=user.get("uid"), **user) for user in users_dict
-        ]
+        return [UserData(user_id=user.get("uid"), **user) for user in users_dict]
 
     def get_user(self, user_id: str, **kwargs) -> UserData:
         user_dict = self._request(
@@ -145,9 +144,7 @@ class UssoAPI(metaclass=Singleton):
         return UserData(user_id=user_dict.get("uid"), **user_dict)
 
     def get_user_payload(self, user_id: str, **kwargs) -> dict:
-        return self._request(
-            endpoint=f"website/users/{user_id}/payload", **kwargs
-        )
+        return self._request(endpoint=f"website/users/{user_id}/payload", **kwargs)
 
     def update_user_payload(
         self,

{usso-0.23.2 → usso-0.24.1}/src/usso/async_api.py

@@ -2,6 +2,7 @@ import logging
 
 import aiohttp
 from singleton import Singleton
+
 from usso.core import UserData, Usso
 
 
@@ -39,7 +40,7 @@ class AsyncUssoAPI(metaclass=Singleton):
                 if kwargs.get("raise_exception", True):
                     resp.raise_for_status()
                 self.access_token = (await resp.json()).get("access_token")
-        
+
     def _access_valid(self) -> bool:
         if not self.access_token:
             return False
@@ -86,13 +87,11 @@ class AsyncUssoAPI(metaclass=Singleton):
                     logging.error(f"Response: {resp.text}")
                     raise e
                 return await resp.json()
-        
+
     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
-        ]
+        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(

{usso-0.23.2 → usso-0.24.1}/src/usso/async_session.py

@@ -1,7 +1,7 @@
 from datetime import datetime
-import jwt
+
 import aiohttp
-import asyncio
+import jwt
 
 
 class AsyncUssoSession(aiohttp.ClientSession):
@@ -46,4 +46,3 @@ class AsyncUssoSession(aiohttp.ClientSession):
 
     async def __aexit__(self, exc_type, exc_value, traceback):
         await self.close()
-

{usso-0.23.2 → usso-0.24.1}/src/usso/b64tools.py

@@ -3,9 +3,7 @@ import uuid
 
 
 def b64_encode_uuid(uuid_str: uuid.UUID | str):
-    uuid_UUID = (
-        uuid_str if isinstance(uuid_str, uuid.UUID) else uuid.UUID(uuid_str)
-    )
+    uuid_UUID = uuid_str if isinstance(uuid_str, uuid.UUID) else uuid.UUID(uuid_str)
     uuid_bytes = uuid_UUID.bytes
     encoded_uuid = base64.urlsafe_b64encode(uuid_bytes).decode()
     return encoded_uuid

usso-0.24.1/src/usso/django/middleware.py

@@ -0,0 +1,88 @@
+import logging
+
+from django.conf import settings
+from django.contrib.auth.models import User
+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")
+
+
+class USSOAuthenticationMiddleware(MiddlewareMixin):
+
+    def process_request(self, request: HttpRequest):
+        """
+        Middleware to authenticate users by JWT token and create or return a user in the database.
+        """
+        try:
+            logger.debug("Processing request in USSO authentication middleware")
+
+            # Extract and verify JWT from Authorization header or cookies
+            user_data = self.jwt_access_security(request)
+
+            if user_data:
+                # Check database for the user or create a new one
+                user = self.get_or_create_user(user_data)
+                # Attach the user to the request
+                request.user = user
+            else:
+                return JsonResponse(
+                    {"error": "Authentication failed: No valid JWT token provided."},
+                    status=401,
+                )
+        except USSOException as e:
+            # Handle any errors raised by USSO authentication
+            return JsonResponse({"error": str(e)}, status=401)
+
+    def get_request_token(self, request: HttpRequest) -> str | None:
+        authorization = request.headers.get("Authorization")
+        if authorization:
+            scheme, credentials = Usso(
+                jwks_url=settings.USSO_JWK_URL
+            ).get_authorization_scheme_param(authorization)
+            if scheme.lower() == "bearer":
+                return credentials  # Bearer token
+
+        return request.COOKIES.get("usso_access_token")
+
+    def jwt_access_security(self, request: HttpRequest) -> UserData | None:
+        """Return the user associated with a token value."""
+        token = self.get_request_token(request)
+        if not token:
+            raise USSOException(
+                status_code=401,
+                error="unauthorized",
+            )
+
+        # Get user data from the token
+        return Usso(jwks_url=settings.USSO_JWK_URL).user_data_from_token(token)
+
+    def get_or_create_user(self, user_data: UserData) -> User:
+        """
+        Check if a user exists by phone. If not, create a new user and return it.
+        """
+        phone = user_data.phone
+        email = user_data.email or f"{user_data.user_id}@example.com"  # Fallback email
+
+        try:
+            # Try to get the user by phone
+            user, created = User.objects.get_or_create(
+                username=phone,
+                defaults={
+                    "first_name": user_data.user_id,
+                    "email": email,
+                },
+            )
+
+            if created:
+                logger.info(f"New user created with phone: {phone}")
+
+            return user
+
+        except IntegrityError as e:
+            logger.error(f"Integrity error while creating user: {str(e)}")
+            raise ValueError(f"Error while creating user: {str(e)}")

usso-0.24.1/src/usso/fastapi/integration.py

@@ -0,0 +1,56 @@
+import logging
+
+from fastapi import Request, WebSocket
+from starlette.status import HTTP_401_UNAUTHORIZED
+
+from usso.core import UserData, Usso
+from usso.exceptions import USSOException
+
+logger = logging.getLogger("usso")
+
+
+def get_request_token(request: Request | WebSocket) -> UserData | None:
+    authorization = request.headers.get("Authorization")
+    if authorization:
+        scheme, credentials = Usso().get_authorization_scheme_param(authorization)
+        if scheme.lower() == "bearer":
+            token = credentials
+
+    else:
+        cookie_token = request.cookies.get("usso_access_token")
+        if cookie_token:
+            token = cookie_token
+
+    return token
+
+
+def jwt_access_security_None(request: Request) -> UserData | None:
+    """Return the user associated with a token value."""
+    token = get_request_token(request)
+    if not token:
+        return None
+    return Usso().user_data_from_token(token, raise_exception=False)
+
+
+def jwt_access_security(request: Request) -> UserData | None:
+    """Return the user associated with a token value."""
+    token = get_request_token(request)
+    if not token:
+        raise USSOException(
+            status_code=HTTP_401_UNAUTHORIZED,
+            error="unauthorized",
+        )
+
+    return Usso().user_data_from_token(token)
+
+
+def jwt_access_security_ws(websocket: WebSocket) -> UserData | None:
+    """Return the user associated with a token value."""
+    token = get_request_token(websocket)
+    if not token:
+        raise USSOException(
+            status_code=HTTP_401_UNAUTHORIZED,
+            error="unauthorized",
+        )
+
+    return Usso().user_data_from_token(token)

{usso-0.23.2 → usso-0.24.1/src/usso.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: usso
-Version: 0.23.2
+Version: 0.24.1
 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>
@@ -27,7 +27,7 @@ License: Copyright (c) 2016 The Python Packaging Authority (PyPA)
 Project-URL: Homepage, https://github.com/ussoio/usso-python
 Project-URL: Bug Reports, https://github.com/ussoio/usso-python/issues
 Project-URL: Funding, https://github.com/ussoio/usso-python
-Project-URL: Say Thanks!, https://github.com/ussoio/usso-python
+Project-URL: Say Thanks!, https://saythanks.io/to/mahdikiani
 Project-URL: Source, https://github.com/ussoio/usso-python
 Keywords: usso,sso,authentication,security,fastapi,django
 Classifier: Development Status :: 3 - Alpha

{usso-0.23.2 → usso-0.24.1}/src/usso.egg-info/SOURCES.txt

@@ -16,6 +16,8 @@ src/usso.egg-info/dependency_links.txt
 src/usso.egg-info/entry_points.txt
 src/usso.egg-info/requires.txt
 src/usso.egg-info/top_level.txt
+src/usso/django/__init__.py
+src/usso/django/middleware.py
 src/usso/fastapi/__init__.py
 src/usso/fastapi/integration.py
 tests/test_api.py

usso-0.23.2/src/usso/__init__.py

@@ -1,3 +0,0 @@
-from .core import UserData, Usso
-
-__all__ = ["UserData", "Usso"]

usso-0.23.2/src/usso/fastapi/integration.py

@@ -1,56 +0,0 @@
-import logging
-
-from fastapi import Request, WebSocket
-from starlette.status import HTTP_401_UNAUTHORIZED
-from usso.core import UserData, Usso
-from usso.exceptions import USSOException
-
-logger = logging.getLogger("usso")
-
-
-async def jwt_access_security(request: Request) -> UserData | None:
-    """Return the user associated with a token value."""
-    kwargs = {}
-    authorization = request.headers.get("Authorization")
-    if authorization:
-        scheme, credentials = Usso().get_authorization_scheme_param(
-            authorization
-        )
-        if scheme.lower() == "bearer":
-            token = credentials
-            return Usso().user_data_from_token(token, **kwargs)
-
-    cookie_token = request.cookies.get("usso_access_token")
-    if cookie_token:
-        return Usso().user_data_from_token(cookie_token, **kwargs)
-
-    if kwargs.get("raise_exception", True):
-        raise USSOException(
-            status_code=HTTP_401_UNAUTHORIZED,
-            error="unauthorized",
-        )
-    return None
-
-
-async def jwt_access_security_ws(websocket: WebSocket) -> UserData | None:
-    """Return the user associated with a token value."""
-    kwargs = {}
-    authorization = websocket.headers.get("Authorization")
-    if authorization:
-        scheme, credentials = Usso().get_authorization_scheme_param(
-            authorization
-        )
-        if scheme.lower() == "bearer":
-            token = credentials
-            return Usso().user_data_from_token(token, **kwargs)
-
-    cookie_token = websocket.cookies.get("usso_access_token")
-    if cookie_token:
-        return Usso().user_data_from_token(cookie_token, **kwargs)
-
-    if kwargs.get("raise_exception", True):
-        raise USSOException(
-            status_code=HTTP_401_UNAUTHORIZED,
-            error="unauthorized",
-        )
-    return None