xn-auth 0.2.40__py3-none-any.whl → 0.2.41__py3-none-any.whl

x_auth/controller.py

@@ -1,3 +1,4 @@
+from base64 import b64encode
 from datetime import timedelta
 
 from aiogram.utils.auth_widget import check_signature
@@ -9,7 +10,7 @@ from litestar.security.jwt import JWTCookieAuth
 
 from x_auth.middleware import JWTAuthMiddleware, Tok
 from x_auth.models import User
-from x_auth.types import AuthUser, TgUser
+from x_auth.types import AuthUser, TgUser, XyncUser
 
 
 async def retrieve_user_handler(token: Tok, _cn: ASGIConnection) -> AuthUser:
@@ -34,31 +35,31 @@ class Auth:
             exclude=["/schema", "/auth", "/public"] + (exc_paths or []),
         )
 
-        async def user_proc(user: WebAppUser) -> Response[WebAppUser]:
+        async def user_proc(user: WebAppUser) -> Response[XyncUser]:
             user_in = await user_model.tg2in(user)
             db_user, cr = await user_model.update_or_create(**user_in.df_unq())  # on login: update user in db from tg
             res = self.jwt.login(
                 identifier=str(db_user.id),
                 token_extras={"role": db_user.role, "blocked": db_user.blocked},
-                response_body=user,
+                response_body=XyncUser.model_validate({**user.model_dump(), "pub": b64encode(db_user.pub)}),
             )
             res.cookies[0].httponly = False
             return res
 
         # login for api endpoint
         @post("/auth/twa", tags=["Auth"], description="Gen JWToken from tg login widget")
-        async def twa(data: TgUser) -> Response[WebAppUser]:  # widget
+        async def twa(data: TgUser) -> Response[XyncUser]:  # widget
             dct = data.dump()
             if not check_signature(self.jwt.token_secret, dct.pop("hash"), **dct):
                 raise NotAuthorizedException("Tg login widget data invalid")
             return await user_proc(WebAppUser(**dct))
 
         @post("/auth/tma", tags=["Auth"], description="Gen JWToken from tg initData")
-        async def tma(tid: str) -> Response[WebAppUser]:
+        async def tma(tid: str) -> Response[XyncUser]:
             try:
                 twaid: WebAppInitData = safe_parse_webapp_init_data(self.jwt.token_secret, tid)
-            except ValueError:
-                raise NotAuthorizedException(detail="Tg Initdata invalid")
+            except ValueError as e:
+                raise NotAuthorizedException(detail=f"Tg Initdata invalid {e}")
             return await user_proc(twaid.user)
 
         self.tma_handler = tma

x_auth/models.py

@@ -35,6 +35,10 @@ from x_model.types import BaseUpd
 from x_auth.enums import Lang, Role, PeerType
 
 
+class UniqBinaryField(BinaryField):
+    indexable = True
+
+
 class Username(TortModel):
     id: int = BigIntField(True, description="tg_id")
     username: str = CharField(127, null=True)
@@ -54,6 +58,8 @@ class User(Model):
     blocked: bool = BooleanField(default=False)
     lang: Lang | None = IntEnumField(Lang, default=Lang.ru, null=True)
     role: Role = IntEnumField(Role, default=Role.READER)
+    # prv = BinaryField(null=True)  # len=32
+    pub = UniqBinaryField(unique=True, null=True)  # len=32
 
     app: BackwardOneToOneRelation["App"]
 

x_auth/types.py

@@ -2,6 +2,7 @@ from datetime import datetime
 from json import dumps
 from typing import Literal, Self
 
+from aiogram.utils.web_app import WebAppUser
 from msgspec import Struct, to_builtins, convert
 
 from x_auth.enums import Role
@@ -59,3 +60,7 @@ class TgUser(Xs):
     username: str | None = None
     photo_url: str | None = None
     last_name: str | None = None
+
+
+class XyncUser(WebAppUser):
+    pub: bytes

{xn_auth-0.2.40.dist-info → xn_auth-0.2.41.dist-info}/METADATA

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

xn_auth-0.2.41.dist-info/RECORD

@@ -0,0 +1,10 @@
+x_auth/controller.py,sha256=KGbXT-hX7Rp6eYZJGx_-ioAr3As73bbKjPhow41c1SE,2973
+x_auth/enums.py,sha256=l4NTYsA-h0gyOp4PUe40Lb8LKoA94zL6EDkCmoGmBL0,732
+x_auth/exceptions.py,sha256=2B4okJxhPyNqTJXlSTfblJUQJ60bLGXdgJIu6ue7S6w,162
+x_auth/middleware.py,sha256=JfssQomDv0J_69GfS2a_2_uyRzs26zSY6IW1Vk7m8K0,2900
+x_auth/models.py,sha256=kDk0je7f2TcfRrnCeTbB99ERBJmDaxGGjvIm53BIaYM,8996
+x_auth/types.py,sha256=GTjNOm7XkyYDCdIaqByP2LzHnwCJRkWGOwdc4tVWFy0,1400
+xn_auth-0.2.41.dist-info/METADATA,sha256=lPj2C37gFR3GN2b1xvIMxBzWbyU6KtTurQfNc3QBcTU,823
+xn_auth-0.2.41.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+xn_auth-0.2.41.dist-info/top_level.txt,sha256=ydMDkzxgQPtW-E_MNDfUAroAFZvWSqU-x_kZSA7NSFo,7
+xn_auth-0.2.41.dist-info/RECORD,,

xn_auth-0.2.40.dist-info/RECORD

@@ -1,10 +0,0 @@
-x_auth/controller.py,sha256=8OVENJa5rUHui-8qswKBs2wYnU_PzQ74cDneszehcxo,2857
-x_auth/enums.py,sha256=l4NTYsA-h0gyOp4PUe40Lb8LKoA94zL6EDkCmoGmBL0,732
-x_auth/exceptions.py,sha256=2B4okJxhPyNqTJXlSTfblJUQJ60bLGXdgJIu6ue7S6w,162
-x_auth/middleware.py,sha256=JfssQomDv0J_69GfS2a_2_uyRzs26zSY6IW1Vk7m8K0,2900
-x_auth/models.py,sha256=m_7ANZMcuxRAW56dgGt86r843Wdib436xV-_e4CBLZ0,8832
-x_auth/types.py,sha256=zojizO58op_BUFvmxSaOtNoPB_liBCY3x3Ff80bgBMo,1310
-xn_auth-0.2.40.dist-info/METADATA,sha256=fKBWmd-GVj257JtxRFmPlvdRrRDtA20P3vyq6ZpdIIw,823
-xn_auth-0.2.40.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-xn_auth-0.2.40.dist-info/top_level.txt,sha256=ydMDkzxgQPtW-E_MNDfUAroAFZvWSqU-x_kZSA7NSFo,7
-xn_auth-0.2.40.dist-info/RECORD,,