Merge main fix conflicts

app/main/views/platform_admin.py

@@ -662,7 +662,21 @@ def create_global_stats(services):
         "email": {"delivered": 0, "failed": 0, "requested": 0},
         "sms": {"delivered": 0, "failed": 0, "requested": 0},
     }
+    # Issue #1323. The back end is now sending 'failure' instead of
+    # 'failed'.  Adjust it here, but keep it flexible in case
+    # the backend reverts to 'failed'.
     for service in services:
+        if service["statistics"]["sms"].get("failure") is not None:
+            service["statistics"]["sms"]["failed"] = service["statistics"]["sms"][
+                "failure"
+            ]
+        if service["statistics"]["email"].get("failure") is not None:
+            service["statistics"]["email"]["failed"] = service["statistics"]["email"][
+                "failure"
+            ]
+
+    for service in services:
+
         for msg_type, status in itertools.product(
             ("sms", "email"), ("delivered", "failed", "requested")
         ):

app/main/views/register.py

@@ -160,13 +160,16 @@ def set_up_your_profile():
         # create the user
         # TODO we have to provide something for password until that column goes away
         # TODO ideally we would set the user's preferred timezone here as well
-        user = User.register(
-            name=form.name.data,
-            email_address=user_email,
-            mobile_number=form.mobile_number.data,
-            password=str(uuid.uuid4()),
-            auth_type="sms_auth",
-        )
+
+        user = user_api_client.get_user_by_uuid_or_email(user_uuid, user_email)
+        if user is None:
+            user = User.register(
+                name=form.name.data,
+                email_address=user_email,
+                mobile_number=form.mobile_number.data,
+                password=str(uuid.uuid4()),
+                auth_type="sms_auth",
+            )
 
         # activate the user
         user = user_api_client.get_user_by_uuid_or_email(user_uuid, user_email)

app/main/views/send.py

@@ -470,7 +470,7 @@ def send_one_off_step(service_id, template_id, step_index):
     )
 
 
-def _check_messages(service_id, template_id, upload_id, preview_row):
+def _check_messages(service_id, template_id, upload_id, preview_row, **kwargs):
     try:
         # The happy path is that the job doesn’t already exist, so the
         # API will return a 404 and the client will raise HTTPError.
@@ -510,11 +510,7 @@ def _check_messages(service_id, template_id, upload_id, preview_row):
         show_recipient=False,
         email_reply_to=email_reply_to,
         sms_sender=sms_sender,
-    )
-    simplifed_template = get_template(
-        db_template,
-        current_service,
-        show_recipient=False,
+        **kwargs,
     )
 
     allow_list = []
@@ -535,7 +531,7 @@ def _check_messages(service_id, template_id, upload_id, preview_row):
         allow_list = None
     recipients = RecipientCSV(
         contents,
-        template=template or simplifed_template,
+        template=template,
         max_initial_rows_shown=50,
         max_errors_shown=50,
         guestlist=allow_list,
@@ -569,9 +565,6 @@ def _check_messages(service_id, template_id, upload_id, preview_row):
 
     if preview_row < len(recipients) + 2:
         template.values = recipients[preview_row - 2].recipient_and_personalisation
-        simplifed_template.values = recipients[
-            preview_row - 2
-        ].recipient_and_personalisation
     elif preview_row > 2:
         abort(404)
 
@@ -599,7 +592,6 @@ def _check_messages(service_id, template_id, upload_id, preview_row):
             service_id, template.id, db_template["version"], original_file_name
         ),
         template_id=template_id,
-        simplifed_template=simplifed_template,
     )
 
 
@@ -658,7 +650,9 @@ def check_messages(service_id, template_id, upload_id, row_index=2):
 @user_has_permissions("send_messages", restrict_admin_usage=True)
 def preview_job(service_id, template_id, upload_id, row_index=2):
     session["scheduled_for"] = request.form.get("scheduled_for", "")
-    data = _check_messages(service_id, template_id, upload_id, row_index)
+    data = _check_messages(
+        service_id, template_id, upload_id, row_index, force_hide_sender=True
+    )
 
     return render_template(
         "views/check/preview.html",
@@ -825,11 +819,11 @@ def send_one_off_to_myself(service_id, template_id):
 def check_notification(service_id, template_id):
     return render_template(
         "views/notifications/check.html",
-        **_check_notification(service_id, template_id),
+        **_check_notification(service_id, template_id, show_recipient=True),
     )
 
 
-def _check_notification(service_id, template_id, exception=None):
+def _check_notification(service_id, template_id, exception=None, **kwargs):
     db_template = current_service.get_template_with_user_permission_or_403(
         template_id, current_user
     )
@@ -842,13 +836,9 @@ def _check_notification(service_id, template_id, exception=None):
     template = get_template(
         db_template,
         current_service,
-        show_recipient=True,
         email_reply_to=email_reply_to,
         sms_sender=sms_sender,
-    )
-    simplifed_template = get_template(
-        db_template,
-        current_service,
+        **kwargs,
     )
     placeholders = fields_to_fill_in(template)
 
@@ -874,7 +864,6 @@ def _check_notification(service_id, template_id, exception=None):
         back_link_from_preview=back_link_from_preview,
         choose_time_form=choose_time_form,
         **(get_template_error_dict(exception) if exception else {}),
-        simplifed_template=simplifed_template,
     )
 
 
@@ -924,7 +913,9 @@ def preview_notification(service_id, template_id):
 
     return render_template(
         "views/notifications/preview.html",
-        **_check_notification(service_id, template_id),
+        **_check_notification(
+            service_id, template_id, show_recipient=False, force_hide_sender=True
+        ),
         scheduled_for=session["scheduled_for"],
         recipient=recipient,
     )

app/main/views/sign_in.py

@@ -16,6 +16,7 @@ from flask import (
     url_for,
 )
 from flask_login import current_user
+from notifications_utils.url_safe_token import generate_token
 
 from app import login_manager, user_api_client
 from app.main import main
@@ -62,6 +63,10 @@ def _get_access_token(code, state):
     url = f"{base_url}{cli_assert}&{cli_assert_type}&{code_param}&grant_type=authorization_code"
     headers = {"Authorization": "Bearer %s" % token}
     response = requests.post(url, headers=headers)
+    if response.json().get("access_token") is None:
+        # Capture the response json here so it hopefully shows up in error reports
+        current_app.logger.error(f"Error when getting access token {response.json()}")
+        raise KeyError(f"'access_token' {response.json()}")
     access_token = response.json()["access_token"]
     return access_token
 
@@ -83,13 +88,17 @@ def _do_login_dot_gov():
     code = request.args.get("code")
     state = request.args.get("state")
     login_gov_error = request.args.get("error")
-    if code and state:
-        access_token = _get_access_token(code, state)
-        user_email, user_uuid = _get_user_email_and_uuid(access_token)
-        redirect_url = request.args.get("next")
+
+    if login_gov_error:
+        current_app.logger.error(f"login.gov error: {login_gov_error}")
+        raise Exception(f"Could not login with login.gov {login_gov_error}")
+    elif code and state:
 
         # activate the user
         try:
+            access_token = _get_access_token(code, state)
+            user_email, user_uuid = _get_user_email_and_uuid(access_token)
+            redirect_url = request.args.get("next")
             user = user_api_client.get_user_by_uuid_or_email(user_uuid, user_email)
             activate_user(user["id"])
         except BaseException as be:  # noqa B036
@@ -98,9 +107,6 @@ def _do_login_dot_gov():
 
         return redirect(url_for("main.show_accounts_or_dashboard", next=redirect_url))
 
-    elif login_gov_error:
-        current_app.logger.error(f"login.gov error: {login_gov_error}")
-        raise Exception(f"Could not login with login.gov {login_gov_error}")
     # end login.gov
 
 
@@ -175,7 +181,16 @@ def sign_in():
 
     other_device = current_user.logged_in_elsewhere()
 
-    initial_signin_url = os.getenv("LOGIN_DOT_GOV_INITIAL_SIGNIN_URL")
+    token = generate_token(
+        str(request.remote_addr),
+        current_app.config["SECRET_KEY"],
+        current_app.config["DANGEROUS_SALT"],
+    )
+    url = os.getenv("LOGIN_DOT_GOV_INITIAL_SIGNIN_URL")
+    # handle unit tests
+    if url is not None:
+        url = url.replace("NONCE", token)
+        url = url.replace("STATE", token)
 
     return render_template(
         "views/signin.html",
@@ -184,7 +199,7 @@ def sign_in():
         other_device=other_device,
         login_gov_enabled=True,
         password_reset_url=password_reset_url,
-        initial_signin_url=initial_signin_url,
+        initial_signin_url=url,
     )
 
 

app/main/views/verify.py

@@ -99,7 +99,9 @@ def activate_user(user_id):
     if invited_org_user:
         user_api_client.add_user_to_organization(invited_org_user.organization, user_id)
     elif redis_client.get(f"organization-invite-{user.email_address}"):
-        organization_id = redis_client.get(f"organization-invite-{user.email_address}")
+        organization_id = redis_client.raw_get(
+            f"organization-invite-{user.email_address}"
+        )
         user_api_client.add_user_to_organization(
             organization_id.decode("utf8"), user_id
         )