xn-auth 0.2.29.dev1__py3-none-any.whl → 0.2.31__py3-none-any.whl

x_auth/controller.py

@@ -7,7 +7,7 @@ from litestar.exceptions import NotAuthorizedException
 from litestar.security.jwt import JWTCookieAuth
 
 from x_auth.middleware import JWTAuthMiddleware, Tok
-from x_auth.models import UserTg
+from x_auth.models import User
 from x_auth.types import AuthUser
 
 
@@ -20,7 +20,7 @@ async def revoked_token_handler(token: Tok, _cn: ASGIConnection) -> bool:
 
 
 class Auth:
-    def __init__(self, sec: str, user_model: type[UserTg] = UserTg, exc_paths: list[str] = None):
+    def __init__(self, sec: str, user_model: type[User] = User, exc_paths: list[str] = None):
         self.jwt = JWTCookieAuth(  # [AuthUser, Tok]
             retrieve_user_handler=retrieve_user_handler,
             revoked_token_handler=revoked_token_handler,

x_auth/models.py

@@ -142,10 +142,38 @@ class Proxy(Model, TsTrait):
             return reps
 
 
+class Dc(TortModel):
+    id: int = SmallIntField(True)
+    ip = CharField(15, unique=True)
+    pub = CharField(495)
+
+    apps: BackwardFKRelation["App"]
+
+
+class Fcm(TortModel):
+    id: int = SmallIntField(True)
+    json: dict = JSONField(default={})
+
+    apps: BackwardFKRelation["App"]
+
+
+class App(TortModel):
+    hsh = CharField(32, unique=True)
+    dc: ForeignKeyRelation[Dc] = ForeignKeyField("models.Dc", "apps", default=2)
+    dc_id: int
+    title = CharField(127)
+    short = CharField(95)
+    fcm: ForeignKeyNullableRelation[Fcm] = ForeignKeyField("models.Fcm", "apps", null=True)
+    fcm_id: int
+
+    sessions: BackwardFKRelation["Session"]
+
+
 class Session(TortModel):
     id = CharField(127, primary_key=True)
     dc_id = IntField(null=True)
-    api_id = IntField(null=True)
+    api: ForeignKeyRelation[App] = ForeignKeyField("models.App", "sessions")
+    api_id: int
     test_mode = BooleanField(default=False)
     auth_key = BinaryField(null=True)
     date = IntField(null=True)  # todo: refact to datetime?

{xn_auth-0.2.29.dev1.dist-info → xn_auth-0.2.31.dist-info}/METADATA

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

xn_auth-0.2.31.dist-info/RECORD

@@ -0,0 +1,10 @@
+x_auth/controller.py,sha256=0QhqmqXOqFaWIUTWHlJKITQNmJQ5kXZOkLg7wSUTh60,2240
+x_auth/enums.py,sha256=kmkX-j1bWNpel6_-fw2YtMEmJSAj9w2iizkG03s3ZSU,631
+x_auth/exceptions.py,sha256=2B4okJxhPyNqTJXlSTfblJUQJ60bLGXdgJIu6ue7S6w,162
+x_auth/middleware.py,sha256=JfssQomDv0J_69GfS2a_2_uyRzs26zSY6IW1Vk7m8K0,2900
+x_auth/models.py,sha256=etxzc8ejaF4c2zhP6S1X4ysLW3By0dl3OfbxfgfKIrM,7396
+x_auth/types.py,sha256=j3WGcyH24DmFEdTT6U7xzb_fEm1tFcBZsANKMy7bydo,689
+xn_auth-0.2.31.dist-info/METADATA,sha256=O7wgwTNe1P4Vy0YHJ3jjJlEGCWzHRGW1cJPLnl_vs2E,799
+xn_auth-0.2.31.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+xn_auth-0.2.31.dist-info/top_level.txt,sha256=ydMDkzxgQPtW-E_MNDfUAroAFZvWSqU-x_kZSA7NSFo,7
+xn_auth-0.2.31.dist-info/RECORD,,

xn_auth-0.2.29.dev1.dist-info/RECORD

@@ -1,10 +0,0 @@
-x_auth/controller.py,sha256=0Z9kogEQ3tgXiO9Wv06dzb7RtWfIuybjqqAJoQ46j5I,2246
-x_auth/enums.py,sha256=kmkX-j1bWNpel6_-fw2YtMEmJSAj9w2iizkG03s3ZSU,631
-x_auth/exceptions.py,sha256=2B4okJxhPyNqTJXlSTfblJUQJ60bLGXdgJIu6ue7S6w,162
-x_auth/middleware.py,sha256=JfssQomDv0J_69GfS2a_2_uyRzs26zSY6IW1Vk7m8K0,2900
-x_auth/models.py,sha256=5mfvjbARdRFeDq_XIUmQxyFKoK8jQI6CrO1Fbp6glT0,6684
-x_auth/types.py,sha256=j3WGcyH24DmFEdTT6U7xzb_fEm1tFcBZsANKMy7bydo,689
-xn_auth-0.2.29.dev1.dist-info/METADATA,sha256=vkBOI_MFfz8UYe9alir17Ugg2ZKAL2yHgtY_onbIElI,804
-xn_auth-0.2.29.dev1.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-xn_auth-0.2.29.dev1.dist-info/top_level.txt,sha256=ydMDkzxgQPtW-E_MNDfUAroAFZvWSqU-x_kZSA7NSFo,7
-xn_auth-0.2.29.dev1.dist-info/RECORD,,