xn-auth 0.2.2.dev3__tar.gz → 0.2.4__tar.gz

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

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

@@ -55,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
@@ -63,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.dev3 → xn_auth-0.2.4}/x_auth/depend.py

@@ -4,7 +4,7 @@ from fastapi import Depends, Security
 from fastapi.security import SecurityScopes
 from starlette.requests import HTTPConnection
 
-from x_auth.enums import AuthFailReason, UserStatus, Scope
+from x_auth.enums import AuthFailReason, Scope
 from x_auth import AuthUser, AuthException, BearerSecurity
 
 
@@ -19,7 +19,7 @@ class Depend:
         self.AUTHENTICATED = Depends(get_authenticated_user)
 
         def is_active(auth_user: AuthUser = self.AUTHENTICATED):
-            if auth_user.status < UserStatus.TEST:
+            if auth_user.status < 2:
                 raise AuthException(AuthFailReason.status, parent=f"{auth_user.status.name} status denied")
 
         self.ACTIVE = Depends(is_active)

{xn_auth-0.2.2.dev3 → xn_auth-0.2.4}/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.dev3 → xn_auth-0.2.4}/x_auth/router.py

@@ -1,9 +1,11 @@
 from datetime import timedelta
+
+from starlette.responses import JSONResponse
 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 AuthFailReason
 from x_auth import jwt_encode, HTTPException, AuthException, BearerSecurity
@@ -14,9 +16,17 @@ 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,
+        domain: str,
+        db_user_model: type(User) = User,
+        backend: AuthenticationBackend = None,
+        scheme: BearerSecurity = BearerSecurity(),
+    ):
         self.depend = Depend(scheme)
         self.secret = secret
+        self.domain = domain
         self.db_user_model = db_user_model
 
         # api refresh token
@@ -35,11 +45,14 @@ 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:
-        return Token(access_token=jwt_encode(user, self.secret, self.expires), user=user)
+    def _user2tok(self, user: AuthUser) -> Token | JSONResponse:
+        token = Token(access_token=jwt_encode(user, self.secret, self.expires), user=user)
+        resp = JSONResponse(token.model_dump())
+        resp.set_cookie("access_token", token.access_token, domain=f".{self.domain}", samesite="none", secure=True)
+        return resp
 
     # api reg endpoint
     async def reg(self, user_reg_input: UserReg) -> Token:
@@ -49,3 +62,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.dev3 → xn_auth-0.2.4/xn_auth.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xn-auth
-Version: 0.2.2.dev3
+Version: 0.2.4
 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.dev3 → xn_auth-0.2.4}/xn_auth.egg-info/requires.txt

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