xn-auth 0.2.2.dev2__tar.gz → 0.2.3__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xn-auth
-Version: 0.2.2.dev2
+Version: 0.2.3
 Summary: Auth adapter for XN-Api framework
 Author-email: Artemiev <mixartemev@gmail.com>
 License: MIT
@@ -16,7 +16,6 @@ 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.dev2 → xn_auth-0.2.3}/pyproject.toml

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

{xn_auth-0.2.2.dev2 → xn_auth-0.2.3}/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,
@@ -69,7 +55,7 @@ class BearerSecurity(SecurityBase):
                 return None
         if scheme.lower() != self.model.scheme:
             if self.auto_error:
-                raise AuthException(reason=AuthFailReason.scheme, parent="Not Bearer scheme")
+                raise AuthException(reason=AuthFailReason.scheme, parent="Invaid scheme")
             else:
                 return None
         return credentials
@@ -77,9 +63,10 @@ class BearerSecurity(SecurityBase):
 
 def on_error(_: HTTPConnection, exc: AuthException) -> Response:
     hdr = {}
-    if exc.status_code == 303 and "/login" in (r.path for r in _.app.routes):
+    status = getattr(exc, "status_code", 401)
+    if status == 303 and "/login" in (r.path for r in _.app.routes):
         hdr = {"Location": "/login"}
-    resp = Response(str(exc), status_code=exc.status_code, headers=hdr)
+    resp = Response(exc.__repr__(), status_code=status, headers=hdr)
     resp.delete_cookie(cookie_name)
     return resp
 

{xn_auth-0.2.2.dev2 → xn_auth-0.2.3}/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.dev2/x_auth/model.py → xn_auth-0.2.3/x_auth/models.py

@@ -1,6 +1,6 @@
 from tortoise import fields
 from x_auth.pydantic import AuthUser
-from x_model.model import Model as BaseModel, TsTrait
+from x_model.models import Model as BaseModel, TsTrait
 
 from x_auth.enums import UserStatus, Role, Scope
 

{xn_auth-0.2.2.dev2 → xn_auth-0.2.3}/x_auth/pydantic.py

@@ -6,18 +6,10 @@ from x_auth.enums import UserStatus, Role
 
 class UserReg(BaseModel):
     username: str
+    status: UserStatus = UserStatus.WAIT
+    role: Role = Role.READER
     email: str | None = None
     phone: int | None = None
-    role: Role = Role.READER
-    status: UserStatus = UserStatus.WAIT
-
-
-class UserUpdate(BaseModel):
-    username: str
-    status: UserStatus
-    email: str | None
-    phone: int | None
-    role: Role
 
 
 class AuthUser(BaseModel, BaseUser):
@@ -29,7 +21,7 @@ class AuthUser(BaseModel, BaseUser):
     @computed_field
     @property
     def is_authenticated(self) -> bool:
-        return self.status > UserStatus.BANNED
+        return bool(self.status)
 
     @computed_field
     @property

{xn_auth-0.2.2.dev2 → xn_auth-0.2.3}/x_auth/router.py

@@ -1,18 +1,26 @@
 from datetime import timedelta
 from tortoise.exceptions import IntegrityError, ConfigurationError
+from starlette.authentication import AuthenticationBackend
+from fastapi.routing import APIRoute
+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
 
 
 class AuthRouter:
     expires = timedelta(minutes=15)
 
-    def __init__(self, secret: str, db_user_model: type(User) = User, scheme: BearerSecurity = BearerSecurity()):
+    def __init__(
+        self,
+        secret: str,
+        db_user_model: type(User) = User,
+        backend: AuthenticationBackend = None,
+        scheme: BearerSecurity = BearerSecurity(),
+    ):
         self.depend = Depend(scheme)
         self.secret = secret
         self.db_user_model = db_user_model
@@ -33,7 +41,7 @@ class AuthRouter:
             "reg": (self.reg, "POST"),
             "refresh": (refresh, "GET"),
         }
-        self.backend = AuthBackend(secret, scheme)
+        self.backend = backend or AuthBackend(secret, scheme)
 
     # API ENDOINTS
     def _user2tok(self, user: AuthUser) -> Token:
@@ -47,3 +55,16 @@ class AuthRouter:
         except IntegrityError as e:
             raise HTTPException(FailReason.body, e)
         return self._user2tok(db_user.get_auth())
+
+    def get_routes(self) -> list[APIRoute]:
+        return [
+            APIRoute(
+                "/" + path,
+                func,
+                tags=["Auth"],
+                methods=[method],
+                name=path.title(),
+                operation_id=path,
+            )
+            for path, (func, method) in self.routes.items()
+        ]

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xn-auth
-Version: 0.2.2.dev2
+Version: 0.2.3
 Summary: Auth adapter for XN-Api framework
 Author-email: Artemiev <mixartemev@gmail.com>
 License: MIT
@@ -16,7 +16,6 @@ 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.dev2 → xn_auth-0.2.3}/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

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

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