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

deploy
Houkime 2022-12-26 10:27:10 +00:00
parent 3f6aa9bd06
commit cb1906144c
4 changed files with 10 additions and 18 deletions

View File

@ -114,3 +114,11 @@ def get_new_api_recovery_key(
def delete_new_device_auth_token() -> None: def delete_new_device_auth_token() -> None:
TOKEN_REPO.delete_new_device_key() TOKEN_REPO.delete_new_device_key()
def get_new_device_auth_token() -> str:
"""Generate and store a new device auth token which is valid for 10 minutes
and return a mnemonic phrase representation
"""
key = TOKEN_REPO.get_new_device_key()
return Mnemonic(language="english").to_mnemonic(bytes.fromhex(key.key))

View File

@ -13,6 +13,7 @@ from selfprivacy_api.actions.api_tokens import (
get_new_api_recovery_key, get_new_api_recovery_key,
refresh_api_token, refresh_api_token,
delete_new_device_auth_token, delete_new_device_auth_token,
get_new_device_auth_token,
) )
from selfprivacy_api.graphql import IsAuthenticated from selfprivacy_api.graphql import IsAuthenticated
from selfprivacy_api.graphql.mutations.mutation_interface import ( from selfprivacy_api.graphql.mutations.mutation_interface import (
@ -21,7 +22,6 @@ from selfprivacy_api.graphql.mutations.mutation_interface import (
) )
from selfprivacy_api.utils.auth import ( from selfprivacy_api.utils.auth import (
get_new_device_auth_token,
use_new_device_auth_token, use_new_device_auth_token,
) )

View File

@ -13,12 +13,12 @@ from selfprivacy_api.actions.api_tokens import (
get_new_api_recovery_key, get_new_api_recovery_key,
refresh_api_token, refresh_api_token,
delete_new_device_auth_token, delete_new_device_auth_token,
get_new_device_auth_token,
) )
from selfprivacy_api.dependencies import TokenHeader, get_token_header from selfprivacy_api.dependencies import TokenHeader, get_token_header
from selfprivacy_api.utils.auth import ( from selfprivacy_api.utils.auth import (
get_new_device_auth_token,
use_mnemonic_recoverery_token, use_mnemonic_recoverery_token,
use_new_device_auth_token, use_new_device_auth_token,
) )

View File

@ -227,22 +227,6 @@ def use_mnemonic_recoverery_token(mnemonic_phrase, name):
return token return token
def get_new_device_auth_token() -> str:
"""Generate a new device auth token which is valid for 10 minutes
and return a mnemonic phrase representation
Write token to the new_device of the tokens.json file.
"""
token = secrets.token_bytes(16)
token_str = token.hex()
with WriteUserData(UserDataFiles.TOKENS) as tokens:
tokens["new_device"] = {
"token": token_str,
"date": str(datetime.now()),
"expiration": str(datetime.now() + timedelta(minutes=10)),
}
return Mnemonic(language="english").to_mnemonic(token)
def _get_new_device_auth_token(): def _get_new_device_auth_token():
"""Get new device auth token. If it is expired, return None""" """Get new device auth token. If it is expired, return None"""
with ReadUserData(UserDataFiles.TOKENS) as tokens: with ReadUserData(UserDataFiles.TOKENS) as tokens: