usso 0.28.22__tar.gz → 0.28.24__tar.gz

{usso-0.28.22/src/usso.egg-info → usso-0.28.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: usso
-Version: 0.28.22
+Version: 0.28.24
 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.28.22 → usso-0.28.24}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "usso"
-version = "0.28.22"
+version = "0.28.24"
 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.28.22 → usso-0.28.24}/pytest.ini

@@ -8,8 +8,6 @@ asyncio_default_fixture_loop_scope = session
 
 addopts = 
     --cov=src/usso/integrations/fastapi
-    --cov=src/usso/auth
-    --cov=src/usso/models
     ; --cov=src/usso/session
     --cov=src/usso/utils
     ; --cov=src/usso

{usso-0.28.22 → usso-0.28.24}/src/usso/__init__.py

@@ -5,9 +5,10 @@ with Python frameworks, enabling secure and seamless authentication
 across microservices.
 """
 
-from .auth import APIHeaderConfig, AuthConfig, HeaderConfig, UssoAuth
+from .client import AuthConfig, UssoAuth
+from .config import APIHeaderConfig, HeaderConfig
 from .exceptions import USSOException
-from .models.user import UserData
+from .user import UserData
 
 __version__ = "0.28.0"
 

{usso-0.28.22/src/usso/auth → usso-0.28.24/src/usso}/api_key.py

@@ -1,10 +1,11 @@
 import logging
+import os
 
 import cachetools.func
 import httpx
 
-from ..exceptions import USSOException
-from ..models.user import UserData
+from .exceptions import USSOException
+from .user import UserData
 
 logger = logging.getLogger("usso")
 
@@ -33,7 +34,11 @@ def fetch_api_key_data(api_key_verify_url: str, api_key: str):
         USSOException: If the API key is invalid or verification fails
     """
     try:
-        response = httpx.post(api_key_verify_url, json={"api_key": api_key})
+        response = httpx.post(
+            api_key_verify_url,
+            json={"api_key": api_key},
+            proxy=os.getenv("PROXY"),
+        )
         response.raise_for_status()
         return UserData(**response.json())
     except Exception as e:

{usso-0.28.22/src/usso/auth → usso-0.28.24/src/usso}/client.py

@@ -3,10 +3,10 @@ import logging
 import usso_jwt.exceptions
 import usso_jwt.schemas
 
-from ..exceptions import _handle_exception
-from ..models.user import UserData
 from .api_key import fetch_api_key_data
 from .config import AuthConfig, AvailableJwtConfigs
+from .exceptions import _handle_exception
+from .user import UserData
 
 logger = logging.getLogger("usso")
 

{usso-0.28.22/src/usso/auth → usso-0.28.24/src/usso}/config.py

@@ -4,8 +4,8 @@ from typing import Any, Literal, Union
 import usso_jwt.config
 from pydantic import BaseModel, model_validator
 
-from ..models.user import UserData
-from ..utils.string_utils import get_authorization_scheme_param
+from .user import UserData
+from .utils.string_utils import get_authorization_scheme_param
 
 
 class HeaderConfig(BaseModel):

{usso-0.28.22 → usso-0.28.24}/src/usso/exceptions.py

@@ -8,11 +8,14 @@ error_messages = {
     "expired_signature": "Unauthorized. The JWT is expired.",
     "unauthorized": "Unauthorized",
     "invalid_token_type": "Unauthorized. Token type must be 'access'",
+    "permission_denied": "Permission denied",
 }
 
 
 class USSOException(Exception):
-    def __init__(self, status_code: int, error: str, message: str = None):
+    def __init__(
+        self, status_code: int, error: str, message: dict | None = None
+    ):
         self.status_code = status_code
         self.error = error
         self.message = message
@@ -21,6 +24,19 @@ class USSOException(Exception):
         super().__init__(message)
 
 
+class PermissionDenied(USSOException):
+    def __init__(
+        self,
+        error: str = "permission_denied",
+        message: dict = None,
+        detail: str = None,
+        **kwargs,
+    ):
+        super().__init__(
+            403, error=error, message=message, detail=detail, **kwargs
+        )
+
+
 def _handle_exception(error_type: str, **kwargs):
     """Handle JWT-related exceptions."""
     if kwargs.get("raise_exception", True):

{usso-0.28.22 → usso-0.28.24}/src/usso/integrations/fastapi/dependency.py

@@ -2,11 +2,10 @@ import logging
 
 from fastapi import Request, WebSocket
 
-from ...auth import UssoAuth
-from ...auth.config import AuthConfig, AvailableJwtConfigs
+from ...client import UssoAuth
+from ...config import AuthConfig, AvailableJwtConfigs
 from ...exceptions import _handle_exception
-from ...models.user import UserData
-from ...utils.method_utils import instance_method
+from ...user import UserData
 
 logger = logging.getLogger("usso")
 
@@ -28,7 +27,6 @@ class USSOAuthentication(UssoAuth):
     def __call__(self, request: Request) -> UserData:
         return self.usso_access_security(request)
 
-    @instance_method
     def get_request_jwt(self, request: Request | WebSocket) -> str | None:
         for jwt_config in self.jwt_configs:
             token = jwt_config.get_jwt(request)
@@ -36,7 +34,6 @@ class USSOAuthentication(UssoAuth):
                 return token
         return None
 
-    @instance_method
     def get_request_api_key(self, request: Request | WebSocket) -> str | None:
         for jwt_config in self.jwt_configs:
             token = jwt_config.get_api_key(request)

{usso-0.28.22 → usso-0.28.24/src/usso.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: usso
-Version: 0.28.22
+Version: 0.28.24
 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.28.22 → usso-0.28.24}/src/usso.egg-info/SOURCES.txt

@@ -4,30 +4,28 @@ README.md
 pyproject.toml
 pytest.ini
 src/usso/__init__.py
+src/usso/api_key.py
+src/usso/authorization.py
+src/usso/client.py
+src/usso/config.py
 src/usso/exceptions.py
+src/usso/user.py
 src/usso.egg-info/PKG-INFO
 src/usso.egg-info/SOURCES.txt
 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/auth/__init__.py
-src/usso/auth/api_key.py
-src/usso/auth/authorization.py
-src/usso/auth/client.py
-src/usso/auth/config.py
 src/usso/integrations/django/__init__.py
 src/usso/integrations/django/middleware.py
 src/usso/integrations/fastapi/__init__.py
 src/usso/integrations/fastapi/dependency.py
 src/usso/integrations/fastapi/handler.py
-src/usso/models/user.py
 src/usso/session/__init__.py
 src/usso/session/async_session.py
 src/usso/session/base_session.py
 src/usso/session/session.py
 src/usso/utils/__init__.py
-src/usso/utils/method_utils.py
 src/usso/utils/string_utils.py
 tests/test_authorization.py
 tests/test_fastapi.py

{usso-0.28.22 → usso-0.28.24}/tests/test_authorization.py

@@ -1,6 +1,6 @@
 import pytest
 
-from src.usso.auth.authorization import (
+from src.usso.authorization import (
     check_access,
     has_subset_scope,
     is_path_match,

usso-0.28.22/src/usso/auth/__init__.py

@@ -1,9 +0,0 @@
-"""USSO Authentication Module.
-
-This module provides the core authentication functionality for USSO.
-"""
-
-from .client import UssoAuth
-from .config import APIHeaderConfig, AuthConfig, HeaderConfig
-
-__all__ = ["UssoAuth", "AuthConfig", "HeaderConfig", "APIHeaderConfig"]

usso-0.28.22/src/usso/utils/method_utils.py

@@ -1,12 +0,0 @@
-class instance_method:
-    def __init__(self, func):
-        self.func = func
-
-    def __get__(self, instance, owner):
-        def wrapper(*args, **kwargs):
-            if instance is not None:
-                return self.func(instance, *args, **kwargs)
-            else:
-                return self.func(owner(), *args, **kwargs)
-
-        return wrapper