From a2ac47b0f5604b0e49274840e1598ca071e81036 Mon Sep 17 00:00:00 2001 From: Houkime <> Date: Fri, 23 Dec 2022 11:14:52 +0000 Subject: [PATCH] refactor(tokens-repo): delete delete_token from auth utils --- selfprivacy_api/actions/api_tokens.py | 4 ++-- selfprivacy_api/utils/auth.py | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/selfprivacy_api/actions/api_tokens.py b/selfprivacy_api/actions/api_tokens.py index 8044a76..bd1d4fe 100644 --- a/selfprivacy_api/actions/api_tokens.py +++ b/selfprivacy_api/actions/api_tokens.py @@ -6,7 +6,6 @@ from mnemonic import Mnemonic from selfprivacy_api.utils.auth import ( - delete_token, get_recovery_token_status, get_tokens_info, is_recovery_token_exists, @@ -58,7 +57,8 @@ def delete_api_token(caller_token: str, token_name: str) -> None: raise CannotDeleteCallerException("Cannot delete caller's token") if not TOKEN_REPO.is_token_name_exists(token_name): raise NotFoundException("Token not found") - delete_token(token_name) + token = TOKEN_REPO.get_token_by_name(token_name) + TOKEN_REPO.delete_token(token) def refresh_api_token(caller_token: str) -> str: diff --git a/selfprivacy_api/utils/auth.py b/selfprivacy_api/utils/auth.py index 1d6939e..e1c3b7e 100644 --- a/selfprivacy_api/utils/auth.py +++ b/selfprivacy_api/utils/auth.py @@ -124,12 +124,6 @@ def create_token(name): return token -def delete_token(token_name): - """Delete token""" - with WriteUserData(UserDataFiles.TOKENS) as tokens: - tokens["tokens"] = [t for t in tokens["tokens"] if t["name"] != token_name] - - def is_recovery_token_exists(): """Check if recovery token exists""" with ReadUserData(UserDataFiles.TOKENS) as tokens: