xn-auth 0.2.2__tar.gz → 0.2.2.dev1__tar.gz

{xn_auth-0.2.2/xn_auth.egg-info → xn_auth-0.2.2.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xn-auth
-Version: 0.2.2
+Version: 0.2.2.dev1
 Summary: Auth adapter for XN-Api framework
 Author-email: Artemiev <mixartemev@gmail.com>
 License: MIT
@@ -16,6 +16,7 @@ Requires-Dist: xn-model
 Provides-Extra: dev
 Requires-Dist: build; extra == "dev"
 Requires-Dist: python-dotenv; extra == "dev"
+Requires-Dist: setuptools_scm; extra == "dev"
 Requires-Dist: twine; extra == "dev"
 
 # X-Auth

{xn_auth-0.2.2 → xn_auth-0.2.2.dev1}/pyproject.toml

@@ -14,14 +14,15 @@ dependencies = [
     "fastapi",
     'pwdlib[argon2]',
     "python-jose[cryptography]",
-    "xn-model"
+    "xn-model",
 ]
 
 [project.optional-dependencies]
 dev = [
     "build",
     "python-dotenv",
-    "twine"
+    "setuptools_scm",
+    "twine",
 ]
 
 [project.urls]

{xn_auth-0.2.2 → xn_auth-0.2.2.dev1}/x_auth/__init__.py

@@ -1,5 +1,7 @@
+import logging
 from datetime import timedelta
 
+from fastapi import HTTPException as BaseHTTPException
 from fastapi.openapi.models import HTTPBase, SecuritySchemeType
 from fastapi.security.base import SecurityBase
 from fastapi.security.utils import get_authorization_scheme_param
@@ -11,14 +13,26 @@ from starlette.authentication import AuthenticationError
 from starlette.requests import HTTPConnection
 from starlette.responses import Response
 from tortoise.timezone import now
-from x_model import HTTPException
 
-from x_auth.enums import AuthFailReason
+from x_auth.enums import FailReason, AuthFailReason
 from x_auth.pydantic import AuthUser
 
 cookie_name = "access_token"
 
 
+class HTTPException(BaseHTTPException):
+    def __init__(
+        self,
+        reason: FailReason | AuthFailReason,
+        parent: Exception | str = None,
+        status_: status = status.HTTP_400_BAD_REQUEST,
+        hdrs: dict = None,
+    ) -> None:
+        detail = f"{reason.name}{f': {parent}' if parent else ''}"
+        logging.error(detail)
+        super().__init__(status_, detail, hdrs)
+
+
 class AuthException(HTTPException, AuthenticationError):
     def __init__(
         self,
@@ -40,8 +54,8 @@ class BearerModel(HTTPBase):
 class BearerSecurity(SecurityBase):
     """HTTP Bearer token authentication"""
 
-    def __init__(self, model_: BearerModel = BearerModel(), auto_error: bool = False, scheme_name: str = None):
-        self.model = model_
+    def __init__(self, model: BearerModel = BearerModel(), auto_error: bool = True, scheme_name: str = None):
+        self.model = model
         self.scheme_name = scheme_name or self.__class__.__name__
         self.auto_error = auto_error
 

{xn_auth-0.2.2 → xn_auth-0.2.2.dev1}/x_auth/enums.py

@@ -25,6 +25,14 @@ class Role(IntEnum):
         return [scope.name for scope in Scope if self.value & scope.value]
 
 
+class FailReason(IntEnum):
+    path = 8
+    query = 9
+    body = 10
+    method = 11
+    protocol = 12
+
+
 class AuthFailReason(IntEnum):
     no_token = 0
     username = 1

xn_auth-0.2.2/x_auth/models.py → xn_auth-0.2.2.dev1/x_auth/model.py

@@ -1,6 +1,5 @@
 from tortoise import fields
-from x_auth.pydantic import AuthUser
-from x_model.models import Model as BaseModel, TsTrait
+from x_model.model import Model as BaseModel, TsTrait
 
 from x_auth.enums import UserStatus, Role, Scope
 
@@ -30,8 +29,5 @@ class User(Model, TsTrait):
     def _can(self, scope: Scope) -> bool:
         return bool(self.role.value & scope)
 
-    def get_auth(self) -> AuthUser:
-        return AuthUser.model_validate(self, from_attributes=True)
-
     class Meta:
         table_description = "Users"

{xn_auth-0.2.2 → xn_auth-0.2.2.dev1}/x_auth/router.py

@@ -1,13 +1,11 @@
 from datetime import timedelta
 from tortoise.exceptions import IntegrityError, ConfigurationError
-from x_model import FailReason
-
 from x_auth.backend import AuthBackend
 
 from x_auth.depend import Depend
-from x_auth.enums import AuthFailReason
+from x_auth.enums import FailReason, AuthFailReason
 from x_auth import jwt_encode, HTTPException, AuthException, BearerSecurity
-from x_auth.models import User
+from x_auth.model import User
 from x_auth.pydantic import AuthUser, UserReg, Token
 
 
@@ -23,7 +21,7 @@ class AuthRouter:
         async def refresh(auth_user: AuthUser = self.depend.AUTHENTICATED) -> Token:
             try:
                 db_user: User = await self.db_user_model[auth_user.id]
-                auth_user: AuthUser = db_user.get_auth()
+                auth_user = AuthUser.model_validate(db_user, from_attributes=True)
             except ConfigurationError:
                 raise AuthException(AuthFailReason.username, f"Not inicialized user model: {User})", 500)
             except Exception:
@@ -48,4 +46,5 @@ class AuthRouter:
             db_user: User = await self.db_user_model.create(**data)
         except IntegrityError as e:
             raise HTTPException(FailReason.body, e)
-        return self._user2tok(db_user.get_auth())
+        user: AuthUser = AuthUser.model_validate(db_user, from_attributes=True)
+        return self._user2tok(user)

{xn_auth-0.2.2 → xn_auth-0.2.2.dev1/xn_auth.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xn-auth
-Version: 0.2.2
+Version: 0.2.2.dev1
 Summary: Auth adapter for XN-Api framework
 Author-email: Artemiev <mixartemev@gmail.com>
 License: MIT
@@ -16,6 +16,7 @@ Requires-Dist: xn-model
 Provides-Extra: dev
 Requires-Dist: build; extra == "dev"
 Requires-Dist: python-dotenv; extra == "dev"
+Requires-Dist: setuptools_scm; extra == "dev"
 Requires-Dist: twine; extra == "dev"
 
 # X-Auth

{xn_auth-0.2.2 → xn_auth-0.2.2.dev1}/xn_auth.egg-info/SOURCES.txt

@@ -8,7 +8,7 @@ x_auth/__init__.py
 x_auth/backend.py
 x_auth/depend.py
 x_auth/enums.py
-x_auth/models.py
+x_auth/model.py
 x_auth/pydantic.py
 x_auth/router.py
 xn_auth.egg-info/PKG-INFO

{xn_auth-0.2.2 → xn_auth-0.2.2.dev1}/xn_auth.egg-info/requires.txt

@@ -6,4 +6,5 @@ xn-model
 [dev]
 build
 python-dotenv
+setuptools_scm
 twine