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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xn-auth
-Version: 0.2.2.dev1
+Version: 0.2.2.dev3
 Summary: Auth adapter for XN-Api framework
 Author-email: Artemiev <mixartemev@gmail.com>
 License: MIT

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

@@ -1,7 +1,5 @@
-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
@@ -13,26 +11,14 @@ 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 FailReason, AuthFailReason
+from x_auth.enums import 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,
@@ -54,8 +40,8 @@ class BearerModel(HTTPBase):
 class BearerSecurity(SecurityBase):
     """HTTP Bearer token authentication"""
 
-    def __init__(self, model: BearerModel = BearerModel(), auto_error: bool = True, scheme_name: str = None):
-        self.model = model
+    def __init__(self, model_: BearerModel = BearerModel(), auto_error: bool = False, 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.dev1 → xn_auth-0.2.2.dev3}/x_auth/enums.py

@@ -25,14 +25,6 @@ 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.dev1/x_auth/model.py → xn_auth-0.2.2.dev3/x_auth/models.py

@@ -1,5 +1,6 @@
 from tortoise import fields
-from x_model.model import Model as BaseModel, TsTrait
+from x_auth.pydantic import AuthUser
+from x_model.models import Model as BaseModel, TsTrait
 
 from x_auth.enums import UserStatus, Role, Scope
 
@@ -29,5 +30,8 @@ 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.dev1 → xn_auth-0.2.2.dev3}/x_auth/router.py

@@ -1,11 +1,13 @@
 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 FailReason, AuthFailReason
+from x_auth.enums import AuthFailReason
 from x_auth import jwt_encode, HTTPException, AuthException, BearerSecurity
-from x_auth.model import User
+from x_auth.models import User
 from x_auth.pydantic import AuthUser, UserReg, Token
 
 
@@ -21,7 +23,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.model_validate(db_user, from_attributes=True)
+                auth_user: AuthUser = db_user.get_auth()
             except ConfigurationError:
                 raise AuthException(AuthFailReason.username, f"Not inicialized user model: {User})", 500)
             except Exception:
@@ -46,5 +48,4 @@ class AuthRouter:
             db_user: User = await self.db_user_model.create(**data)
         except IntegrityError as e:
             raise HTTPException(FailReason.body, e)
-        user: AuthUser = AuthUser.model_validate(db_user, from_attributes=True)
-        return self._user2tok(user)
+        return self._user2tok(db_user.get_auth())

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xn-auth
-Version: 0.2.2.dev1
+Version: 0.2.2.dev3
 Summary: Auth adapter for XN-Api framework
 Author-email: Artemiev <mixartemev@gmail.com>
 License: MIT

{xn_auth-0.2.2.dev1 → xn_auth-0.2.2.dev3}/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/model.py
+x_auth/models.py
 x_auth/pydantic.py
 x_auth/router.py
 xn_auth.egg-info/PKG-INFO