From 63c96ef96582933cd2c7efb4b77eab7c51694168 Mon Sep 17 00:00:00 2001 From: Untone Date: Mon, 2 Jun 2025 22:28:17 +0300 Subject: [PATCH] auth-fix --- auth/tokens/base.py | 10 +++++----- auth/tokens/oauth.py | 6 ++---- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/auth/tokens/base.py b/auth/tokens/base.py index b4443070..a207e2e1 100644 --- a/auth/tokens/base.py +++ b/auth/tokens/base.py @@ -28,13 +28,13 @@ class BaseTokenManager: Returns: str: Ключ токена """ - if token_type == TokenType.SESSION: + if token_type == "session": # noqa: S105 return f"session:{identifier}:{token}" - if token_type == TokenType.VERIFICATION: + if token_type == "verification": # noqa: S105 return f"verification_token:{token}" - if token_type == TokenType.OAUTH_ACCESS: + if token_type == "oauth_access": # noqa: S105 return f"oauth_access:{identifier}" - if token_type == TokenType.OAUTH_REFRESH: + if token_type == "oauth_refresh": # noqa: S105 return f"oauth_refresh:{identifier}" error_msg = f"Неизвестный тип токена: {token_type}" @@ -44,7 +44,7 @@ class BaseTokenManager: @lru_cache(maxsize=500) def _make_user_tokens_key(user_id: str, token_type: TokenType) -> str: """Создает ключ для списка токенов пользователя""" - if token_type == TokenType.SESSION: + if token_type == "session": # noqa: S105 return f"user_sessions:{user_id}" return f"user_tokens:{user_id}:{token_type}" diff --git a/auth/tokens/oauth.py b/auth/tokens/oauth.py index 2f25784b..b8ddaea8 100644 --- a/auth/tokens/oauth.py +++ b/auth/tokens/oauth.py @@ -81,10 +81,8 @@ class OAuthTokenManager(BaseTokenManager): async def get_token(self, user_id: int, provider: str, token_type: TokenType) -> Optional[TokenData]: """Получает токен""" - if isinstance(token_type, TokenType): - if token_type.startswith("oauth_"): - return await self._get_oauth_data_optimized(token_type, str(user_id), provider) # type: ignore[arg-type] - return await self._get_token_data_optimized(token_type, str(user_id), provider) # type: ignore[arg-type] + if token_type.startswith("oauth_"): + return await self._get_oauth_data_optimized(token_type, str(user_id), provider) return None async def _get_oauth_data_optimized(