From 8235c3595c63f611903c91be0d0f8cab34c07d0a Mon Sep 17 00:00:00 2001
From: Houkime <>
Date: Mon, 26 Dec 2022 15:20:58 +0000
Subject: [PATCH] refactor(tokens-repo): delete is_token_valid from auth utils

---
 selfprivacy_api/actions/api_tokens.py | 5 +++++
 selfprivacy_api/dependencies.py       | 2 +-
 selfprivacy_api/graphql/__init__.py   | 2 +-
 selfprivacy_api/utils/auth.py         | 7 -------
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/selfprivacy_api/actions/api_tokens.py b/selfprivacy_api/actions/api_tokens.py
index 3b180e8..57828bc 100644
--- a/selfprivacy_api/actions/api_tokens.py
+++ b/selfprivacy_api/actions/api_tokens.py
@@ -39,6 +39,11 @@ def get_api_tokens_with_caller_flag(caller_token: str) -> list[TokenInfoWithIsCa
     ]
 
 
+def is_token_valid(token) -> bool:
+    """Check if token is valid"""
+    return TOKEN_REPO.is_token_valid(token)
+
+
 class NotFoundException(Exception):
     """Not found exception"""
 
diff --git a/selfprivacy_api/dependencies.py b/selfprivacy_api/dependencies.py
index 9568a40..1348f65 100644
--- a/selfprivacy_api/dependencies.py
+++ b/selfprivacy_api/dependencies.py
@@ -2,7 +2,7 @@ from fastapi import Depends, HTTPException, status
 from fastapi.security import APIKeyHeader
 from pydantic import BaseModel
 
-from selfprivacy_api.utils.auth import is_token_valid
+from selfprivacy_api.actions.api_tokens import is_token_valid
 
 
 class TokenHeader(BaseModel):
diff --git a/selfprivacy_api/graphql/__init__.py b/selfprivacy_api/graphql/__init__.py
index 7372197..6124a1a 100644
--- a/selfprivacy_api/graphql/__init__.py
+++ b/selfprivacy_api/graphql/__init__.py
@@ -4,7 +4,7 @@ import typing
 from strawberry.permission import BasePermission
 from strawberry.types import Info
 
-from selfprivacy_api.utils.auth import is_token_valid
+from selfprivacy_api.actions.api_tokens import is_token_valid
 
 
 class IsAuthenticated(BasePermission):
diff --git a/selfprivacy_api/utils/auth.py b/selfprivacy_api/utils/auth.py
index 2995aea..48cf450 100644
--- a/selfprivacy_api/utils/auth.py
+++ b/selfprivacy_api/utils/auth.py
@@ -66,13 +66,6 @@ def _validate_token_name(name):
     return name
 
 
-def is_token_valid(token):
-    """Check if token is valid"""
-    if token in _get_tokens():
-        return True
-    return False
-
-
 class BasicTokenInfo(BaseModel):
     """Token info"""