From 2a239e35ad3d1cf04cd23c0de569df7f282d5983 Mon Sep 17 00:00:00 2001
From: Houkime <>
Date: Wed, 21 Dec 2022 16:17:56 +0000
Subject: [PATCH] refactor(tokens-repo): delete is_token_name_pair_valid from
 auth

---
 selfprivacy_api/actions/api_tokens.py | 3 +--
 selfprivacy_api/utils/auth.py         | 9 ---------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/selfprivacy_api/actions/api_tokens.py b/selfprivacy_api/actions/api_tokens.py
index 38cd208..820d7c6 100644
--- a/selfprivacy_api/actions/api_tokens.py
+++ b/selfprivacy_api/actions/api_tokens.py
@@ -12,7 +12,6 @@ from selfprivacy_api.utils.auth import (
     is_recovery_token_exists,
     is_recovery_token_valid,
     is_token_name_exists,
-    is_token_name_pair_valid,
     get_token_name,
 )
 
@@ -56,7 +55,7 @@ class CannotDeleteCallerException(Exception):
 
 def delete_api_token(caller_token: str, token_name: str) -> None:
     """Delete the token"""
-    if is_token_name_pair_valid(token_name, caller_token):
+    if TOKEN_REPO.is_token_name_pair_valid(token_name, caller_token):
         raise CannotDeleteCallerException("Cannot delete caller's token")
     if not is_token_name_exists(token_name):
         raise NotFoundException("Token not found")
diff --git a/selfprivacy_api/utils/auth.py b/selfprivacy_api/utils/auth.py
index 1788f8f..a6c6299 100644
--- a/selfprivacy_api/utils/auth.py
+++ b/selfprivacy_api/utils/auth.py
@@ -79,15 +79,6 @@ def is_token_name_exists(token_name):
         return token_name in [t["name"] for t in tokens["tokens"]]
 
 
-def is_token_name_pair_valid(token_name, token):
-    """Check if token name and token pair exists"""
-    with ReadUserData(UserDataFiles.TOKENS) as tokens:
-        for t in tokens["tokens"]:
-            if t["name"] == token_name and t["token"] == token:
-                return True
-        return False
-
-
 def get_token_name(token: str) -> typing.Optional[str]:
     """Return the name of the token provided"""
     with ReadUserData(UserDataFiles.TOKENS) as tokens: