From ab70687c6196f021e6800e8ea424517c1b9a1130 Mon Sep 17 00:00:00 2001 From: Houkime <> Date: Mon, 19 Dec 2022 12:57:32 +0000 Subject: [PATCH] fix(tokens-repository) :make NONE-uses-left eternally valid and test for it --- .../tokens/json_tokens_repository.py | 3 +- .../tokens/redis_tokens_repository.py | 5 +- .../test_repository/test_tokens_repository.py | 74 +++++++------------ 3 files changed, 32 insertions(+), 50 deletions(-) diff --git a/selfprivacy_api/repositories/tokens/json_tokens_repository.py b/selfprivacy_api/repositories/tokens/json_tokens_repository.py index b4c0ab2..c599e0f 100644 --- a/selfprivacy_api/repositories/tokens/json_tokens_repository.py +++ b/selfprivacy_api/repositories/tokens/json_tokens_repository.py @@ -98,7 +98,8 @@ class JsonTokensRepository(AbstractTokensRepository): """Decrement recovery key use count by one""" if self.is_recovery_key_valid(): with WriteUserData(UserDataFiles.TOKENS) as tokens: - tokens["recovery_token"]["uses_left"] -= 1 + if tokens["recovery_token"]["uses_left"] is not None: + tokens["recovery_token"]["uses_left"] -= 1 def get_new_device_key(self) -> NewDeviceKey: """Creates and returns the new device key""" diff --git a/selfprivacy_api/repositories/tokens/redis_tokens_repository.py b/selfprivacy_api/repositories/tokens/redis_tokens_repository.py index b1fb4b0..2fb6180 100644 --- a/selfprivacy_api/repositories/tokens/redis_tokens_repository.py +++ b/selfprivacy_api/repositories/tokens/redis_tokens_repository.py @@ -92,8 +92,9 @@ class RedisTokensRepository(AbstractTokensRepository): """Decrement recovery key use count by one""" if self.is_recovery_key_valid(): uses_left = self.get_recovery_key().uses_left - r = self.connection - r.hset(RECOVERY_KEY_REDIS_KEY, "uses_left", uses_left - 1) + if uses_left is not None: + r = self.connection + r.hset(RECOVERY_KEY_REDIS_KEY, "uses_left", uses_left - 1) def _get_stored_new_device_key(self) -> Optional[NewDeviceKey]: """Retrieves new device key that is already stored.""" diff --git a/tests/test_graphql/test_repository/test_tokens_repository.py b/tests/test_graphql/test_repository/test_tokens_repository.py index 43f7626..7a80b03 100644 --- a/tests/test_graphql/test_repository/test_tokens_repository.py +++ b/tests/test_graphql/test_repository/test_tokens_repository.py @@ -3,6 +3,7 @@ # pylint: disable=missing-function-docstring from datetime import datetime +from mnemonic import Mnemonic import pytest @@ -132,21 +133,6 @@ def mock_recovery_key_generate(mocker): return mock -@pytest.fixture -def mock_recovery_key_generate_for_mnemonic(mocker): - mock = mocker.patch( - "selfprivacy_api.models.tokens.recovery_key.RecoveryKey.generate", - autospec=True, - return_value=RecoveryKey( - key="ed653e4b8b042b841d285fa7a682fa09e925ddb2d8906f54", - created_at=datetime(2022, 7, 15, 17, 41, 31, 675698), - expires_at=None, - uses_left=1, - ), - ) - return mock - - @pytest.fixture def empty_json_repo(empty_keys): repo = JsonTokensRepository() @@ -397,46 +383,40 @@ def test_use_not_found_mnemonic_recovery_key(some_tokens_repo): ) -def test_use_mnemonic_recovery_key_when_empty(empty_repo): - repo = empty_repo - - with pytest.raises(RecoveryKeyNotFound): - assert ( - repo.use_mnemonic_recovery_key( - mnemonic_phrase="captain ribbon toddler settle symbol minute step broccoli bless universe divide bulb", - device_name="primary_token", - ) - is None - ) +@pytest.fixture(params=["recovery_uses_1", "recovery_eternal"]) +def recovery_key_uses_left(request): + if request.param == "recovery_uses_1": + return 1 + if request.param == "recovery_eternal": + return None -# agnostic test mixed with an implementation test -def test_use_mnemonic_recovery_key( - some_tokens_repo, mock_recovery_key_generate_for_mnemonic, mock_generate_token -): +def test_use_mnemonic_recovery_key(some_tokens_repo, recovery_key_uses_left): repo = some_tokens_repo - assert repo.create_recovery_key(uses_left=1, expiration=None) is not None - - test_token = Token( - token="ur71mC4aiI6FIYAN--cTL-38rPHS5D6NuB1bgN_qKF4", - device_name="newdevice", - created_at=datetime(2022, 11, 14, 6, 6, 32, 777123), - ) - assert ( - repo.use_mnemonic_recovery_key( - mnemonic_phrase="uniform clarify napkin bid dress search input armor police cross salon because myself uphold slice bamboo hungry park", - device_name="newdevice", - ) - == test_token + repo.create_recovery_key(uses_left=recovery_key_uses_left, expiration=None) + is not None + ) + assert repo.is_recovery_key_valid() + recovery_key = repo.get_recovery_key() + + token = repo.use_mnemonic_recovery_key( + mnemonic_phrase=Mnemonic(language="english").to_mnemonic( + bytes.fromhex(recovery_key.key) + ), + device_name="newdevice", ) - assert test_token in repo.get_tokens() + assert token.device_name == "newdevice" + assert token in repo.get_tokens() + new_uses = None + if recovery_key_uses_left is not None: + new_uses = recovery_key_uses_left - 1 assert repo.get_recovery_key() == RecoveryKey( - key="ed653e4b8b042b841d285fa7a682fa09e925ddb2d8906f54", - created_at=datetime(2022, 7, 15, 17, 41, 31, 675698), + key=recovery_key.key, + created_at=recovery_key.created_at, expires_at=None, - uses_left=0, + uses_left=new_uses, )