xn-auth 0.2.44__tar.gz → 0.2.46__tar.gz

{xn_auth-0.2.44/xn_auth.egg-info → xn_auth-0.2.46}/PKG-INFO

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

{xn_auth-0.2.44 → xn_auth-0.2.46}/x_auth/controller.py

@@ -22,7 +22,7 @@ async def revoked_token_handler(token: Tok, _cn: ASGIConnection) -> bool:
 
 
 class Auth:
-    def __init__(self, sec: str, user_model: type[User] = User, exc_paths: list[str] = None):
+    def __init__(self, sec: str, user_model: type[User] = User, exc_paths: list[str] = None, domain: str = ".xync.net"):
         self.jwt = JWTCookieAuth(  # [AuthUser, Tok]
             retrieve_user_handler=retrieve_user_handler,
             revoked_token_handler=revoked_token_handler,
@@ -30,7 +30,7 @@ class Auth:
             authentication_middleware_class=JWTAuthMiddleware,
             token_secret=sec,
             token_cls=Tok,
-            domain=".xync.net",
+            domain=domain,
             # endpoints excluded from authentication: (login and openAPI docs)
             exclude=["/schema", "/auth", "/public"] + (exc_paths or []),
         )
@@ -42,7 +42,7 @@ class Auth:
                 identifier=str(db_user.id),
                 token_extras={"role": db_user.role, "blocked": db_user.blocked},
                 response_body=XyncUser.model_validate(
-                    {**user.model_dump(), "pub": db_user.pub and b64encode(db_user.pub)}
+                    {**user.model_dump(), "xid": db_user.id, "pub": db_user.pub and b64encode(db_user.pub)}
                 ),
             )
             res.cookies[0].httponly = False

{xn_auth-0.2.44 → xn_auth-0.2.46}/x_auth/models.py

@@ -54,6 +54,7 @@ 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 = UniqBinaryField(unique=True, null=True)  # len=32
     pub = UniqBinaryField(unique=True, null=True)  # len=32
 
     app: BackwardOneToOneRelation["App"]
@@ -67,7 +68,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],
+                "pic": hasattr(u, "photo_url") and u.photo_url.replace("https://t.me/i/userpic/320/", "")[:-4],
             }
         )
         if blocked is not None:

{xn_auth-0.2.44 → xn_auth-0.2.46}/x_auth/types.py

@@ -9,6 +9,10 @@ from x_auth.enums import Role
 
 
 class Xs(Struct):
+    @classmethod
+    def dec_hook(cls, *args, **kwargs):
+        pass
+
     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}
 
@@ -18,7 +22,7 @@ class Xs(Struct):
     @classmethod
     def load(cls, obj, **kwargs) -> Self:
         dct = dict(obj)
-        return convert({**dct, **kwargs}, cls)  # , strict=False
+        return convert({**dct, **kwargs}, cls, dec_hook=cls.dec_hook)  # , strict=False
 
 
 class AuthUser(Struct):
@@ -63,4 +67,5 @@ class TgUser(Xs):
 
 
 class XyncUser(WebAppUser):
+    xid: int
     pub: bytes | None

{xn_auth-0.2.44 → xn_auth-0.2.46/xn_auth.egg-info}/PKG-INFO

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