SelfPrivacy/selfprivacy-rest-api
1
0
Fork 0
mirror of https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git synced 2024-11-15 23:23:17 +00:00
Code Issues Projects Releases Wiki Activity

refactor(tokens-repo): delete get_recovery_key_status from auth utils

Browse source
This commit is contained in:
Houkime 2022-12-26 14:29:05 +00:00
parent 7cf295450b
commit 69577c2854
2 changed files with 8 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
selfprivacy_api/graphql/queries/api_queries.py
View file

@ -4,13 +4,14 @@ import datetime
import typing
import strawberry
from strawberry.types import Info
from selfprivacy_api.actions.api_tokens import get_api_tokens_with_caller_flag
from selfprivacy_api.actions.api_tokens import (
get_api_tokens_with_caller_flag,
get_api_recovery_token_status,
)
from selfprivacy_api.graphql import IsAuthenticated
from selfprivacy_api.utils import parse_date
from selfprivacy_api.dependencies import get_api_version as get_api_version_dependency
from selfprivacy_api.utils.auth import (
get_recovery_token_status,
is_recovery_token_exists,
is_recovery_token_valid,
)
@ -51,7 +52,7 @@ def get_recovery_key_status() -> ApiRecoveryKeyStatus:
expiration_date=None,
uses_left=None,
)
status = get_recovery_token_status()
status = get_api_recovery_token_status()
if status is None:
return ApiRecoveryKeyStatus(
exists=False,
@ -63,11 +64,9 @@ def get_recovery_key_status() -> ApiRecoveryKeyStatus:
return ApiRecoveryKeyStatus(
exists=True,
valid=is_recovery_token_valid(),
creation_date=parse_date(status["date"]),
expiration_date=parse_date(status["expiration"])
if status["expiration"] is not None
else None,
uses_left=status["uses_left"] if status["uses_left"] is not None else None,
creation_date=status.date,
expiration_date=status.expiration,
uses_left=status.uses_left,
)

17
selfprivacy_api/utils/auth.py
View file

@ -132,23 +132,6 @@ def is_recovery_token_valid():
return datetime.now() < parse_date(recovery_token["expiration"])
def get_recovery_token_status():
"""Get recovery token date of creation, expiration and uses left"""
with ReadUserData(UserDataFiles.TOKENS) as tokens:
if "recovery_token" not in tokens:
return None
recovery_token = tokens["recovery_token"]
return {
"date": recovery_token["date"],
"expiration": recovery_token["expiration"]
if "expiration" in recovery_token
else None,
"uses_left": recovery_token["uses_left"]
if "uses_left" in recovery_token
else None,
}
def _get_recovery_token():
"""Get recovery token"""
with ReadUserData(UserDataFiles.TOKENS) as tokens: