xn-auth 0.2.51.dev1__tar.gz → 0.2.52__tar.gz

{xn_auth-0.2.51.dev1/xn_auth.egg-info → xn_auth-0.2.52}/PKG-INFO

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

{xn_auth-0.2.51.dev1 → xn_auth-0.2.52}/x_auth/controller.py

@@ -1,3 +1,4 @@
+import logging
 from base64 import b64encode
 from datetime import timedelta
 
@@ -38,8 +39,7 @@ class Auth:
         )
 
         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
+            db_user, cr = await user_model.tg_upsert(user)  # on login: update user in db from tg
             if user.allows_write_to_pm is None:
                 try:
                     await Bot(sec).send_chat_action(user.id, "typing")
@@ -77,7 +77,9 @@ class Auth:
             try:
                 twaid: WebAppInitData = safe_parse_webapp_init_data(self.jwt.token_secret, tid)
             except ValueError as e:
+                logging.error(e)
                 raise NotAuthorizedException(detail=f"Tg Initdata invalid {e}")
+            logging.warning({tid: twaid})
             return await user_proc(twaid.user)
 
         self.tma_handler = tma

{xn_auth-0.2.51.dev1 → xn_auth-0.2.52}/x_auth/models.py

@@ -82,7 +82,7 @@ class User(Model):
         return (await cls[int(sid)]).blocked
 
     @classmethod
-    async def tg_upsert(cls, u: PyroUser | AioUser, blocked: bool = None) -> tuple["User", bool]:
+    async def tg_upsert(cls, u: PyroUser | AioUser | WebAppUser, blocked: bool = None) -> tuple["User", bool]:
         user_in: dict = await cls.tg2in(u, blocked)
         return await cls.update_or_create(user_in, username_id=u.id)
 

{xn_auth-0.2.51.dev1 → xn_auth-0.2.52/xn_auth.egg-info}/PKG-INFO

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