Merge pull request #723 from GSA/notify-api-714

switch to raw_get and raw_set to see exceptions

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")

app/user/rest.py

@@ -352,8 +352,10 @@ 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')}")
+    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)
@@ -361,8 +363,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)
+    redis_store.raw_set(key, recipient)
-    stored_recipient = redis_store.get(key)
+    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}"

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/<user_id>/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")
@@ -453,6 +462,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"
+
+    mocker.patch("app.celery.scheduled_tasks.redis_store.raw_set")
+
     admin_request.post(
         "user.send_user_2fa_code",
         code_type="email",
@@ -477,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",
@@ -551,6 +570,11 @@ 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")