From c3cb60f3b098e9d719525214ed83c250181a099e Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Thu, 11 Jan 2024 11:11:12 -0800
Subject: [PATCH] fix registration so email gets sent

---
 app/delivery/send_to_providers.py | 24 ++++++++++++++----------
 app/user/rest.py                  |  8 +++++++-
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/app/delivery/send_to_providers.py b/app/delivery/send_to_providers.py
index e370a1111..d874106d2 100644
--- a/app/delivery/send_to_providers.py
+++ b/app/delivery/send_to_providers.py
@@ -69,29 +69,30 @@ def send_sms_to_provider(notification):
 
                 # We start by trying to get the phone number from a job in s3.  If we fail, we assume
                 # the phone number is for the verification code on login, which is not a job.
-                my_phone = None
+                recipient = None
                 try:
-                    my_phone = get_phone_number_from_s3(
+                    recipient = get_phone_number_from_s3(
                         notification.service_id,
                         notification.job_id,
                         notification.job_row_number,
                     )
                 except BaseException:
+                    # It is our 2facode, maybe
                     key = f"2facode-{notification.id}".replace(" ", "")
-                    my_phone = redis_store.raw_get(key)
+                    recipient = redis_store.raw_get(key)
 
-                    if my_phone:
-                        my_phone = my_phone.decode("utf-8")
+                    if recipient:
+                        recipient = recipient.decode("utf-8")
 
-                if my_phone is None:
+                if recipient is None:
                     si = notification.service_id
                     ji = notification.job_id
                     jrn = notification.job_row_number
                     raise Exception(
-                        f"The phone number for (Service ID: {si}; Job ID: {ji}; Job Row Number {jrn} was not found."
+                        f"The recipient for (Service ID: {si}; Job ID: {ji}; Job Row Number {jrn} was not found."
                     )
                 send_sms_kwargs = {
-                    "to": my_phone,
+                    "to": recipient,
                     "content": str(template),
                     "reference": str(notification.id),
                     "sender": notification.reply_to_text,
@@ -132,10 +133,13 @@ def send_email_to_provider(notification):
         plain_text_email = PlainTextEmailTemplate(
             template_dict, values=notification.personalisation
         )
+        # Someone needs an email, possibly new registration
+        recipient = redis_store.get(f"email-address-{notification.id}").decode("utf-8")
+
         if notification.key_type == KEY_TYPE_TEST:
             notification.reference = str(create_uuid())
             update_notification_to_sending(notification, provider)
-            send_email_response(notification.reference, notification.to)
+            send_email_response(notification.reference, recipient)
         else:
             from_address = '"{}" <{}@{}>'.format(
                 service.name,
@@ -145,7 +149,7 @@ def send_email_to_provider(notification):
 
             reference = provider.send_email(
                 from_address,
-                notification.normalised_to,
+                recipient,
                 plain_text_email.subject,
                 body=str(plain_text_email),
                 html_body=str(html_email),
diff --git a/app/user/rest.py b/app/user/rest.py
index e98151f1e..303c1a39c 100644
--- a/app/user/rest.py
+++ b/app/user/rest.py
@@ -353,7 +353,7 @@ def create_2fa_code(
 
     key = f"2facode-{saved_notification.id}".replace(" ", "")
     recipient = str(recipient)
-    redis_store.raw_set(key, recipient)
+    redis_store.raw_set(key, recipient, ex=60 * 60)
 
     # Assume that we never want to observe the Notify service's research mode
     # setting for this notification - we still need to be able to log into the
@@ -431,6 +431,12 @@ def send_new_user_email_verification(user_id):
         key_type=KEY_TYPE_NORMAL,
         reply_to_text=service.get_default_reply_to_email_address(),
     )
+
+    redis_store.set(
+        f"email-address-{saved_notification.id}",
+        str(user_to_send_to.email_address),
+        ex=60 * 60,
+    )
     current_app.logger.info("Sending notification to queue")
 
     send_notification_to_queue(saved_notification, queue=QueueNames.NOTIFY)