xn-auth 0.2.55__py3-none-any.whl → 0.2.56__py3-none-any.whl

x_auth/exceptions.py

@@ -2,4 +2,4 @@ from jwt import ExpiredSignatureError
 
 
 class ExpiredSignature(Exception):
-    def __init__(self, _uid: int, _encoded_token: str, _e: ExpiredSignatureError): ...
+    def __init__(self, uid: int, encoded_token: str, secret: str, _e: ExpiredSignatureError): ...

x_auth/middleware.py

@@ -38,8 +38,8 @@ class Tok(Token):
                 }
             )
             tok = convert(payload, cls, strict=False)
-            encoded_token = tok.encode(secret, algorithms[0])  # check where from getting algorithms
-            raise ExpiredSignature(int(payload["sub"]), encoded_token, e)
+            encoded_token = tok.encode(secret, algorithms[0])
+            raise ExpiredSignature(int(payload["sub"]), encoded_token, secret, e)
 
 
 class JWTAuthMiddleware(JWTCookieAuthenticationMiddleware):
@@ -47,10 +47,17 @@ class JWTAuthMiddleware(JWTCookieAuthenticationMiddleware):
         try:
             await super().__call__(scope, receive, send)
         except ExpiredSignature as e:
-            uid, uet, _e = e.args  # uid, updated encoded token
-            if await scope["app"].state.get("user_model").is_blocked(uid):
+            uid, uet, secret, _e = e.args  # uid, updated encoded token
+            blocked, role = await scope["app"].state.get("user_model").permissions(uid)
+            if blocked:
                 logging.error(f"User#{uid} can't refresh. Blocked!")
                 raise _e
+            payload = Tok.decode_payload(uet, secret, ["HS256"])
+            if role.value != payload["extras"]["role"]:
+                # update user role in jwtoken
+                payload["extras"]["role"] = role.value
+                tok = convert(payload, Tok, strict=False)
+                uet = tok.encode(secret, "HS256")
 
             async def send_wrapper(msg: Message) -> None:
                 if msg["type"] == "http.response.start":

x_auth/models.py

@@ -78,8 +78,9 @@ class User(Model):
         return user_dict
 
     @classmethod
-    async def is_blocked(cls, sid: str) -> bool:
-        return (await cls[int(sid)]).blocked
+    async def permissions(cls, self_id: str) -> tuple[bool, Role]:
+        user = await cls[self_id]
+        return user.blocked, user.role
 
     @classmethod
     async def tg_upsert(cls, u: PyroUser | AioUser | WebAppUser, blocked: bool = None) -> tuple["User", bool]:

{xn_auth-0.2.55.dist-info → xn_auth-0.2.56.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xn-auth
-Version: 0.2.55
+Version: 0.2.56
 Summary: Auth adapter for XN-Api framework
 Author-email: Artemiev <mixartemev@gmail.com>
 License: MIT
@@ -22,6 +22,10 @@ Requires-Dist: twine; extra == "dev"
 # X-Auth
 ###### JWT authentication for x-api
 
+JWT cookie based Auth Middleware for ASGI framework.
+Stores in user_id, issued and expired dates, user role and blocked state.
+When token expired, it is automatically fetching user from db, and if he is not blocked now, then updates issue/expire dates, and user role if it was changed after the last user fetch.
+
 #### Requirements
 - Python >= 3.12
 

xn_auth-0.2.56.dist-info/RECORD

@@ -0,0 +1,10 @@
+x_auth/controller.py,sha256=6AMvrhfW_2UEZhx4f9xFT0EC9YVNsS2tY4Lf8867VVU,3862
+x_auth/enums.py,sha256=pciVrb92S9YQFMhHe6pKNYwcvtevwfMXIiG1WxAEa-Q,761
+x_auth/exceptions.py,sha256=kQeaxTzlJMZo7md6maBVrcOppMk2oRU5leAQmxGKcXQ,173
+x_auth/middleware.py,sha256=10iz4fPPUuLyrHUBrlWwESnGlsurCtuPCI746Vc9xtA,3328
+x_auth/models.py,sha256=uGQOqGl-3tGLFOKPQ7dk4N1orOLfugGdfHfoQ_-rNLM,9257
+x_auth/types.py,sha256=MD7wDLZ2Lf_G2LWeyZEPaY1zSaz3atn4JYGk4cFjZ74,1529
+xn_auth-0.2.56.dist-info/METADATA,sha256=IAZygy74Tox5UIYqkg2B8eGqyIm-CtAlq2PwIjgm7EQ,1136
+xn_auth-0.2.56.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+xn_auth-0.2.56.dist-info/top_level.txt,sha256=ydMDkzxgQPtW-E_MNDfUAroAFZvWSqU-x_kZSA7NSFo,7
+xn_auth-0.2.56.dist-info/RECORD,,

xn_auth-0.2.55.dist-info/RECORD

@@ -1,10 +0,0 @@
-x_auth/controller.py,sha256=6AMvrhfW_2UEZhx4f9xFT0EC9YVNsS2tY4Lf8867VVU,3862
-x_auth/enums.py,sha256=pciVrb92S9YQFMhHe6pKNYwcvtevwfMXIiG1WxAEa-Q,761
-x_auth/exceptions.py,sha256=2B4okJxhPyNqTJXlSTfblJUQJ60bLGXdgJIu6ue7S6w,162
-x_auth/middleware.py,sha256=KLRv60Ih1a4yobn-jcjysV-m0i5tu0bKKlpcaC3Ghbs,2984
-x_auth/models.py,sha256=V3lvrUVtS5viyqO_-Y7u2zQep5bRjPOpWmc5kweMrN0,9211
-x_auth/types.py,sha256=MD7wDLZ2Lf_G2LWeyZEPaY1zSaz3atn4JYGk4cFjZ74,1529
-xn_auth-0.2.55.dist-info/METADATA,sha256=xgbgLpgaZM_43TyDet3XrXgzE1jEk9rCONEfR2MxvG8,823
-xn_auth-0.2.55.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-xn_auth-0.2.55.dist-info/top_level.txt,sha256=ydMDkzxgQPtW-E_MNDfUAroAFZvWSqU-x_kZSA7NSFo,7
-xn_auth-0.2.55.dist-info/RECORD,,