From 7b2e59dede08c9c76ff2c2050e163dc76a4a6d10 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Wed, 10 Jan 2024 10:30:44 -0800 Subject: [PATCH 1/6] switch to raw_get and raw_set to see exceptions --- app/delivery/send_to_providers.py | 2 +- app/user/rest.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/delivery/send_to_providers.py b/app/delivery/send_to_providers.py index b258c41c4..407e39e66 100644 --- a/app/delivery/send_to_providers.py +++ b/app/delivery/send_to_providers.py @@ -78,7 +78,7 @@ def send_sms_to_provider(notification): ) except BaseException: key = f"2facode-{notification.id}".replace(" ", "") - my_phone = redis_store.get(key) + my_phone = redis_store.raw_get(key) if my_phone: my_phone = my_phone.decode("utf-8") diff --git a/app/user/rest.py b/app/user/rest.py index 026da6c70..e4544c083 100644 --- a/app/user/rest.py +++ b/app/user/rest.py @@ -352,7 +352,7 @@ def create_2fa_code( ) current_app.logger.info("TESTING REDIS") - redis_store.set("TESTKEY5", "WORKS") + redis_store.raw_set("TESTKEY5", "WORKS") current_app.logger.info(f"SHOULD SEE THE WORD 'WORKS' HERE: {redis_store.get('TESTKEY5')}") key = f"2facode-{saved_notification.id}".replace(" ", "") @@ -361,8 +361,8 @@ def create_2fa_code( current_app.logger.info( f"IN REST, WHERE WE SET THE VALUE, KEY IS {key} and value is {recipient}" ) - redis_store.set(key, recipient) - stored_recipient = redis_store.get(key) + redis_store.raw_set(key, recipient) + stored_recipient = redis_store.raw_get(key) # TODO REMOVE current_app.logger.info( f"IN REST, WHERE WE GET THE VALUE, KEY IS {key} and value is {stored_recipient}" From e15122d6f58e343859379d5e93c5bff367c99da8 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Wed, 10 Jan 2024 11:00:50 -0800 Subject: [PATCH 2/6] mock redis --- tests/app/user/test_rest_verify.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/app/user/test_rest_verify.py b/tests/app/user/test_rest_verify.py index 7e2dae307..e310ccf0e 100644 --- a/tests/app/user/test_rest_verify.py +++ b/tests/app/user/test_rest_verify.py @@ -453,6 +453,11 @@ def test_send_user_email_code( deliver_email = mocker.patch("app.celery.provider_tasks.deliver_email.apply_async") sample_user.auth_type = auth_type + mock_redis_get = mocker.patch("app.celery.scheduled_tasks.redis_store.raw_get") + mock_redis_get.return_value="foo" + + mock_redis_set = mocker.patch("app.celery.scheduled_tasks.redis_store.raw_set") + admin_request.post( "user.send_user_2fa_code", code_type="email", From f6ba9b4d7478d6358b8569d8a0a5f52f28c1e35d Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Wed, 10 Jan 2024 11:14:04 -0800 Subject: [PATCH 3/6] mock redis --- tests/app/user/test_rest_verify.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/app/user/test_rest_verify.py b/tests/app/user/test_rest_verify.py index e310ccf0e..3e1b3250b 100644 --- a/tests/app/user/test_rest_verify.py +++ b/tests/app/user/test_rest_verify.py @@ -456,7 +456,7 @@ def test_send_user_email_code( mock_redis_get = mocker.patch("app.celery.scheduled_tasks.redis_store.raw_get") mock_redis_get.return_value="foo" - mock_redis_set = mocker.patch("app.celery.scheduled_tasks.redis_store.raw_set") + mocker.patch("app.celery.scheduled_tasks.redis_store.raw_set") admin_request.post( "user.send_user_2fa_code", From 6f04915ee8d084442f7d3bab16b62c88151e17a3 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Wed, 10 Jan 2024 11:20:33 -0800 Subject: [PATCH 4/6] flake8 --- app/user/rest.py | 4 +++- tests/app/user/test_rest_verify.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/user/rest.py b/app/user/rest.py index e4544c083..6cfa8edea 100644 --- a/app/user/rest.py +++ b/app/user/rest.py @@ -353,7 +353,9 @@ def create_2fa_code( current_app.logger.info("TESTING REDIS") redis_store.raw_set("TESTKEY5", "WORKS") - current_app.logger.info(f"SHOULD SEE THE WORD 'WORKS' HERE: {redis_store.get('TESTKEY5')}") + current_app.logger.info( + f"SHOULD SEE THE WORD 'WORKS' HERE: {redis_store.get('TESTKEY5')}" + ) key = f"2facode-{saved_notification.id}".replace(" ", "") recipient = str(recipient) diff --git a/tests/app/user/test_rest_verify.py b/tests/app/user/test_rest_verify.py index 3e1b3250b..d7d42a019 100644 --- a/tests/app/user/test_rest_verify.py +++ b/tests/app/user/test_rest_verify.py @@ -454,7 +454,7 @@ def test_send_user_email_code( sample_user.auth_type = auth_type mock_redis_get = mocker.patch("app.celery.scheduled_tasks.redis_store.raw_get") - mock_redis_get.return_value="foo" + mock_redis_get.return_value = "foo" mocker.patch("app.celery.scheduled_tasks.redis_store.raw_set") From 97baa4c184da214eb0631ca72b6131b60f98144f Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Wed, 10 Jan 2024 11:38:23 -0800 Subject: [PATCH 5/6] flake8 --- tests/app/user/test_rest_verify.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/tests/app/user/test_rest_verify.py b/tests/app/user/test_rest_verify.py index d7d42a019..f6f29f518 100644 --- a/tests/app/user/test_rest_verify.py +++ b/tests/app/user/test_rest_verify.py @@ -206,6 +206,10 @@ def test_send_user_sms_code(client, sample_user, sms_code_template, mocker): """ notify_service = dao_fetch_service_by_id(current_app.config["NOTIFY_SERVICE_ID"]) + mock_redis_get = mocker.patch("app.celery.scheduled_tasks.redis_store.raw_get") + mock_redis_get.return_value = "foo" + + mocker.patch("app.celery.scheduled_tasks.redis_store.raw_set") auth_header = create_admin_authorization_header() mocked = mocker.patch("app.user.rest.create_secret_code", return_value="11111") mocker.patch("app.celery.provider_tasks.deliver_sms.apply_async") @@ -238,6 +242,11 @@ def test_send_user_code_for_sms_with_optional_to_field( """ Tests POST endpoint /user//sms-code with optional to field """ + + mock_redis_get = mocker.patch("app.celery.scheduled_tasks.redis_store.raw_get") + mock_redis_get.return_value = "foo" + + mocker.patch("app.celery.scheduled_tasks.redis_store.raw_set") to_number = "+447119876757" mocked = mocker.patch("app.user.rest.create_secret_code", return_value="11111") mocker.patch("app.celery.provider_tasks.deliver_sms.apply_async") @@ -482,6 +491,11 @@ def test_send_user_email_code_with_urlencoded_next_param( ): mocker.patch("app.celery.provider_tasks.deliver_email.apply_async") + mock_redis_get = mocker.patch("app.celery.scheduled_tasks.redis_store.raw_get") + mock_redis_get.return_value = "foo" + + mocker.patch("app.celery.scheduled_tasks.redis_store.raw_set") + data = {"to": None, "next": "/services"} admin_request.post( "user.send_user_2fa_code", @@ -556,6 +570,13 @@ def test_user_verify_email_code_fails_if_code_already_used( def test_send_user_2fa_code_sends_from_number_for_international_numbers( client, sample_user, mocker, sms_code_template ): + + + mock_redis_get = mocker.patch("app.celery.scheduled_tasks.redis_store.raw_get") + mock_redis_get.return_value = "foo" + + mocker.patch("app.celery.scheduled_tasks.redis_store.raw_set") + sample_user.mobile_number = "+601117224412" auth_header = create_admin_authorization_header() mocker.patch("app.user.rest.create_secret_code", return_value="11111") From ca199c44918710eb071d6d65c8d101509889e8a0 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Wed, 10 Jan 2024 11:49:20 -0800 Subject: [PATCH 6/6] flake8 --- tests/app/user/test_rest_verify.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/app/user/test_rest_verify.py b/tests/app/user/test_rest_verify.py index f6f29f518..bd89b9fd8 100644 --- a/tests/app/user/test_rest_verify.py +++ b/tests/app/user/test_rest_verify.py @@ -570,8 +570,6 @@ def test_user_verify_email_code_fails_if_code_already_used( def test_send_user_2fa_code_sends_from_number_for_international_numbers( client, sample_user, mocker, sms_code_template ): - - mock_redis_get = mocker.patch("app.celery.scheduled_tasks.redis_store.raw_get") mock_redis_get.return_value = "foo"