xn-auth 0.2.38.dev1__py3-none-any.whl → 0.2.40__py3-none-any.whl

x_auth/controller.py

@@ -1,6 +1,7 @@
 from datetime import timedelta
 
-from aiogram.utils.web_app import WebAppInitData, safe_parse_webapp_init_data
+from aiogram.utils.auth_widget import check_signature
+from aiogram.utils.web_app import WebAppInitData, safe_parse_webapp_init_data, WebAppUser
 from litestar import Response, post
 from litestar.connection import ASGIConnection
 from litestar.exceptions import NotAuthorizedException
@@ -8,7 +9,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
+from x_auth.types import AuthUser, TgUser
 
 
 async def retrieve_user_handler(token: Tok, _cn: ASGIConnection) -> AuthUser:
@@ -33,20 +34,32 @@ class Auth:
             exclude=["/schema", "/auth", "/public"] + (exc_paths or []),
         )
 
-        @post("/auth/tma", tags=["Auth"], description="Gen JWToken from tg initData")
-        async def tma(tid: str) -> Response[user_model.in_type(True)]:
-            try:
-                twaid: WebAppInitData = safe_parse_webapp_init_data(self.jwt.token_secret, tid)
-            except ValueError:
-                raise NotAuthorizedException(detail="Tg Initdata invalid")
-            user_in = await user_model.tg2in(twaid.user)
+        async def user_proc(user: WebAppUser) -> Response[WebAppUser]:
+            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_model.validate(dict(db_user)),
+                response_body=user,
             )
             res.cookies[0].httponly = False
             return res
 
-        self.handler = tma
+        # login for api endpoint
+        @post("/auth/twa", tags=["Auth"], description="Gen JWToken from tg login widget")
+        async def twa(data: TgUser) -> Response[WebAppUser]:  # 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]:
+            try:
+                twaid: WebAppInitData = safe_parse_webapp_init_data(self.jwt.token_secret, tid)
+            except ValueError:
+                raise NotAuthorizedException(detail="Tg Initdata invalid")
+            return await user_proc(twaid.user)
+
+        self.tma_handler = tma
+        self.twa_handler = twa

x_auth/models.py

@@ -1,9 +1,11 @@
 from datetime import datetime
 
+from aiogram.utils.web_app import WebAppUser
 from aiohttp import ClientSession
 from msgspec import convert
 from pyrogram.enums.client_platform import ClientPlatform
-from pyrogram.types import User as TgUser
+from pyrogram.types import User as PyroUser
+from aiogram.types import User as AioUser
 from tortoise.fields import (
     BigIntField,
     BooleanField,
@@ -31,7 +33,6 @@ from tortoise import Model as TortModel
 from x_model.types import BaseUpd
 
 from x_auth.enums import Lang, Role, PeerType
-from x_auth.types import AuthUser
 
 
 class Username(TortModel):
@@ -48,6 +49,7 @@ class User(Model):
     username: OneToOneRelation[Username] = OneToOneField("models.Username", "user")
     username_id: int
     first_name: str | None = CharField(63)
+    pic: str | None = CharField(127, null=True)
     last_name: str | None = CharField(31, null=True)
     blocked: bool = BooleanField(default=False)
     lang: Lang | None = IntEnumField(Lang, default=Lang.ru, null=True)
@@ -55,11 +57,8 @@ class User(Model):
 
     app: BackwardOneToOneRelation["App"]
 
-    def get_auth(self) -> AuthUser:
-        return AuthUser.model_validate(self, from_attributes=True)
-
     @classmethod
-    async def tg2in(cls, u: TgUser, blocked: bool = None) -> BaseUpd:
+    async def tg2in(cls, u: PyroUser | AioUser | WebAppUser, blocked: bool = None) -> BaseUpd:
         un, _ = await cls._meta.fields_map["username"].related_model.update_or_create({"username": u.username}, id=u.id)
         user = cls.validate(
             {
@@ -67,6 +66,7 @@ class User(Model):
                 "last_name": u.last_name,
                 "username_id": un.id,
                 "lang": u.language_code and Lang[u.language_code],
+                "pic": u.photo_url and u.photo_url.replace("https://t.me/i/userpic/320/", "")[:-4],
             }
         )
         if blocked is not None:
@@ -78,7 +78,7 @@ class User(Model):
         return (await cls[int(sid)]).blocked
 
     @classmethod
-    async def pyro_upsert(cls, u: TgUser, blocked: bool = None) -> tuple["User", bool]:
+    async def tg_upsert(cls, u: PyroUser | AioUser, blocked: bool = None) -> tuple["User", bool]:
         user_in: cls.in_type() = await cls.tg2in(u, blocked)
         prms = user_in.df_unq()
         return await cls.update_or_create(**prms)
@@ -87,13 +87,6 @@ class User(Model):
     #     abstract = True
 
 
-# @pre_save(User)
-# async def username(_meta, user: User, _db, _updated: dict) -> None:
-#     if user.username_id:
-#         return
-#     user.username = await Username.create(name=user.username)
-
-
 class Country(Model):
     id = SmallIntField(True)
     code: int | None = IntField(null=True)
@@ -170,6 +163,7 @@ class Proxy(Model, TsTrait):
         return dict(scheme="socks5", hostname=self.host, port=self.port, username=self.username, password=self.password)
 
     def str(self):
+        # noinspection HttpUrlsUsage
         return f"http://{self.username}:{self.password}@{self.host}:{self.port}"
 
 

x_auth/types.py

@@ -1,11 +1,25 @@
 from datetime import datetime
-from typing import Literal
+from json import dumps
+from typing import Literal, Self
 
-from msgspec import Struct
+from msgspec import Struct, to_builtins, convert
 
 from x_auth.enums import Role
 
 
+class Xs(Struct):
+    def dump(self, nones: bool = False) -> dict:
+        return {k: v for k, v in to_builtins(self).items() if nones or v is not None}
+
+    def json(self, nones: bool = False) -> str:
+        return dumps(self.dump())
+
+    @classmethod
+    def load(cls, obj, **kwargs) -> Self:
+        dct = dict(obj)
+        return convert({**dct, **kwargs}, cls)  # , strict=False
+
+
 class AuthUser(Struct):
     id: int
     blocked: bool
@@ -35,3 +49,13 @@ class Replacement(Struct):
     proxy_port: int
     proxy_country_code: str
     created_at: datetime
+
+
+class TgUser(Xs):
+    id: int
+    first_name: str
+    auth_date: int
+    hash: str
+    username: str | None = None
+    photo_url: str | None = None
+    last_name: str | None = None

{xn_auth-0.2.38.dev1.dist-info → xn_auth-0.2.40.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xn-auth
-Version: 0.2.38.dev1
+Version: 0.2.40
 Summary: Auth adapter for XN-Api framework
 Author-email: Artemiev <mixartemev@gmail.com>
 License: MIT
@@ -10,6 +10,7 @@ Keywords: litestar,jwt,auth
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 Requires-Dist: aiogram
+Requires-Dist: kurigram
 Requires-Dist: msgspec
 Requires-Dist: pyjwt
 Requires-Dist: xn-model

xn_auth-0.2.40.dist-info/RECORD

@@ -0,0 +1,10 @@
+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,,

xn_auth-0.2.38.dev1.dist-info/RECORD

@@ -1,10 +0,0 @@
-x_auth/controller.py,sha256=0QhqmqXOqFaWIUTWHlJKITQNmJQ5kXZOkLg7wSUTh60,2240
-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=bTSehdkdsF4YzhGnAmpsPXiLFyq8lG0l30kpgfXA8ZE,8859
-x_auth/types.py,sha256=j3WGcyH24DmFEdTT6U7xzb_fEm1tFcBZsANKMy7bydo,689
-xn_auth-0.2.38.dev1.dist-info/METADATA,sha256=awMEXeoPJJTXmdPdVcYnpe_6c2oPgOhWbfd1qWaUpgM,804
-xn_auth-0.2.38.dev1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-xn_auth-0.2.38.dev1.dist-info/top_level.txt,sha256=ydMDkzxgQPtW-E_MNDfUAroAFZvWSqU-x_kZSA7NSFo,7
-xn_auth-0.2.38.dev1.dist-info/RECORD,,