diff --git a/selfprivacy_api/graphql/queries/api_queries.py b/selfprivacy_api/graphql/queries/api_queries.py index 7cf7c3e2..cf562316 100644 --- a/selfprivacy_api/graphql/queries/api_queries.py +++ b/selfprivacy_api/graphql/queries/api_queries.py @@ -11,11 +11,6 @@ from selfprivacy_api.actions.api_tokens import ( from selfprivacy_api.graphql import IsAuthenticated from selfprivacy_api.dependencies import get_api_version as get_api_version_dependency -from selfprivacy_api.utils.auth import ( - is_recovery_token_exists, - is_recovery_token_valid, -) - def get_api_version() -> str: """Get API version""" @@ -44,16 +39,8 @@ class ApiRecoveryKeyStatus: def get_recovery_key_status() -> ApiRecoveryKeyStatus: """Get recovery key status""" - if not is_recovery_token_exists(): - return ApiRecoveryKeyStatus( - exists=False, - valid=False, - creation_date=None, - expiration_date=None, - uses_left=None, - ) status = get_api_recovery_token_status() - if status is None: + if status is None or not status.exists: return ApiRecoveryKeyStatus( exists=False, valid=False, @@ -63,7 +50,7 @@ def get_recovery_key_status() -> ApiRecoveryKeyStatus: ) return ApiRecoveryKeyStatus( exists=True, - valid=is_recovery_token_valid(), + valid=status.valid, creation_date=status.date, expiration_date=status.expiration, uses_left=status.uses_left, diff --git a/selfprivacy_api/utils/auth.py b/selfprivacy_api/utils/auth.py index 53df5082..72c791b1 100644 --- a/selfprivacy_api/utils/auth.py +++ b/selfprivacy_api/utils/auth.py @@ -112,26 +112,6 @@ def create_token(name): return token -def is_recovery_token_exists(): - """Check if recovery token exists""" - with ReadUserData(UserDataFiles.TOKENS) as tokens: - return "recovery_token" in tokens - - -def is_recovery_token_valid(): - """Check if recovery token is valid""" - with ReadUserData(UserDataFiles.TOKENS) as tokens: - if "recovery_token" not in tokens: - return False - recovery_token = tokens["recovery_token"] - if "uses_left" in recovery_token and recovery_token["uses_left"] is not None: - if recovery_token["uses_left"] <= 0: - return False - if "expiration" not in recovery_token or recovery_token["expiration"] is None: - return True - return datetime.now() < parse_date(recovery_token["expiration"]) - - def _get_recovery_token(): """Get recovery token""" with ReadUserData(UserDataFiles.TOKENS) as tokens: