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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xn-auth
-Version: 0.2.2.dev1
+Version: 0.2.2.dev2
 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.dev2}/x_auth/__init__.py

@@ -54,8 +54,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.dev2}/x_auth/model.py

@@ -1,4 +1,5 @@
 from tortoise import fields
+from x_auth.pydantic import AuthUser
 from x_model.model 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.dev2}/x_auth/router.py

@@ -21,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.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 +46,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.dev2/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.dev2
 Summary: Auth adapter for XN-Api framework
 Author-email: Artemiev <mixartemev@gmail.com>
 License: MIT