Browse Source

取消token失效限制

boweniac 2 months ago
parent
commit
38e6fc6159
3 changed files with 6 additions and 6 deletions
  1. 1 1
      app/admin/schema/token.py
  2. 1 1
      common/dataclasses.py
  3. 4 4
      common/security/jwt_call_center.py

+ 1 - 1
app/admin/schema/token.py

@@ -13,7 +13,7 @@ class GetSwaggerToken(SchemaBase):
 class AccessTokenBase(SchemaBase):
 class AccessTokenBase(SchemaBase):
     access_token: str
     access_token: str
     access_token_type: str = 'Bearer'
     access_token_type: str = 'Bearer'
-    access_token_expire_time: datetime
+    access_token_expire_time: datetime | None
 
 
 
 
 class GetNewToken(AccessTokenBase):
 class GetNewToken(AccessTokenBase):

+ 1 - 1
common/dataclasses.py

@@ -51,7 +51,7 @@ class NewToken:
 @dataclasses.dataclass
 @dataclasses.dataclass
 class AccessToken:
 class AccessToken:
     access_token: str
     access_token: str
-    access_token_expire_time: datetime
+    access_token_expire_time: datetime | None
 
 
 
 
 @dataclasses.dataclass
 @dataclasses.dataclass

+ 4 - 4
common/security/jwt_call_center.py

@@ -32,12 +32,12 @@ async def create_access_token(sub: str) -> AccessToken:
     :param multi_login: multipoint login for user
     :param multi_login: multipoint login for user
     :return:
     :return:
     """
     """
-    expire = timezone.now() + timedelta(seconds=settings.TOKEN_EXPIRE_SECONDS)
+    # expire = timezone.now() + timedelta(seconds=settings.TOKEN_EXPIRE_SECONDS)
 
 
-    to_encode = {'exp': expire, 'sub': sub}
+    to_encode = {'sub': sub}
     access_token = jwt.encode(to_encode, settings.TOKEN_SECRET_KEY, settings.TOKEN_ALGORITHM)
     access_token = jwt.encode(to_encode, settings.TOKEN_SECRET_KEY, settings.TOKEN_ALGORITHM)
 
 
-    return AccessToken(access_token=access_token, access_token_expire_time=expire)
+    return AccessToken(access_token=access_token, access_token_expire_time=None)
 
 
 
 
 def get_token(request: Request) -> str:
 def get_token(request: Request) -> str:
@@ -66,7 +66,7 @@ def jwt_decode(token: str) -> int:
         if not user_id:
         if not user_id:
             raise TokenError(msg='Token 无效')
             raise TokenError(msg='Token 无效')
     except ExpiredSignatureError:
     except ExpiredSignatureError:
-        raise TokenError(msg='Token 已过期')
+        raise TokenError(msg='Token 无效')
     except (JWTError, Exception):
     except (JWTError, Exception):
         raise TokenError(msg='Token 无效')
         raise TokenError(msg='Token 无效')
     return user_id
     return user_id