From 0021d6425332ab81cdcf1e8f73ae6669416c5504 Mon Sep 17 00:00:00 2001
From: Jonathan Bobel <jonathan.bobel@gsa.gov>
Date: Tue, 30 Jan 2024 15:23:21 -0500
Subject: [PATCH 01/89] 1166 - Adjusting the card width and wrapping styles

---
 app/assets/javascripts/collapsibleCheckboxes.js      |  2 +-
 .../sass/uswds/_uswds-theme-custom-styles.scss       | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/collapsibleCheckboxes.js b/app/assets/javascripts/collapsibleCheckboxes.js
index f67cad80a..93645f002 100644
--- a/app/assets/javascripts/collapsibleCheckboxes.js
+++ b/app/assets/javascripts/collapsibleCheckboxes.js
@@ -65,7 +65,7 @@
 
     return $(`<div class="selection-footer${stickyClass}">
               <button
-                class="govuk-button govuk-button--secondary selection-footer__button"
+                class="usa-button usa-button--outline selection-footer__button"
                 aria-expanded="${expanded ? 'true' : 'false'}"
                 aria-controls="${this.fieldsetId}">
               ${buttonContent}
diff --git a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
index b5f2147cd..dcb7bb1dd 100644
--- a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
+++ b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
@@ -140,15 +140,17 @@ td.table-empty-message {
 }
 
 .user-list {
-   display: inline-flex;
+   display: flex;
    flex-wrap: wrap;
-   gap: units(4);
+   justify-content: space-between;
+   padding: 1rem;
    .user-list-item {
       @include at-media(desktop) {
-         flex: 1 1 calc(50% - units(2));
-         flex-grow: 0;
+         width: calc(50% - units(1));
+         margin-bottom: 1rem;
+         box-sizing: border-box;
       }
-      flex: 1 1 calc(100% - units(2));
+      // flex: 1 1 calc(100% - units(2));
       border: 1px solid color('gray-cool-10');
       padding: units(2);
       .tick-cross-list-permissions {

From f97bfa863f17964f03aa8af8dcac84963acf943a Mon Sep 17 00:00:00 2001
From: Jonathan Bobel <jonathan.bobel@gsa.gov>
Date: Tue, 30 Jan 2024 15:28:15 -0500
Subject: [PATCH 02/89] Updated button styles

---
 app/assets/javascripts/collapsibleCheckboxes.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/collapsibleCheckboxes.js b/app/assets/javascripts/collapsibleCheckboxes.js
index 93645f002..696d7e1c1 100644
--- a/app/assets/javascripts/collapsibleCheckboxes.js
+++ b/app/assets/javascripts/collapsibleCheckboxes.js
@@ -65,7 +65,7 @@
 
     return $(`<div class="selection-footer${stickyClass}">
               <button
-                class="usa-button usa-button--outline selection-footer__button"
+                class="govuk-button govuk-button--secondary selection-footer__button usa-button usa-button--outline"
                 aria-expanded="${expanded ? 'true' : 'false'}"
                 aria-controls="${this.fieldsetId}">
               ${buttonContent}

From 4e63a601e97833cf115f0570decfdbdd5c322a0d Mon Sep 17 00:00:00 2001
From: Jonathan Bobel <jonathan.bobel@gsa.gov>
Date: Wed, 31 Jan 2024 11:10:46 -0500
Subject: [PATCH 03/89] Bug - very small content update on pricing page

---
 app/templates/views/pricing/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/pricing/index.html b/app/templates/views/pricing/index.html
index 436da7735..73c67770e 100644
--- a/app/templates/views/pricing/index.html
+++ b/app/templates/views/pricing/index.html
@@ -30,7 +30,7 @@ more parts towards the allowance if you:</p>
 </ul>
 
 <h3 class="font-body-lg" id="long-text-messages">Long text messages</h3>
-<p>If a text message is longer than 160 characters (including spaces), it counts as more than one message.</p>
+<p>If a text message is longer than 160 characters (including spaces), it counts as more than one message part.</p>
 
 <div class="bottom-gutter-3-2">
   {% call mapping_table(

From 10f732b3903f1785e5045c3523d40a943421b93a Mon Sep 17 00:00:00 2001
From: Andrew Shumway <ashumway@flexion.us>
Date: Thu, 1 Feb 2024 11:37:31 -0700
Subject: [PATCH 04/89] Bundle stats with service object

---
 app/__init__.py                              | 4 ++++
 tests/app/main/views/test_api_integration.py | 3 +++
 tests/conftest.py                            | 2 ++
 3 files changed, 9 insertions(+)

diff --git a/app/__init__.py b/app/__init__.py
index af9b3f9a9..9879431e2 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -381,6 +381,10 @@ def load_service_before_request():
                 request_ctx.service = Service(
                     service_api_client.get_service(service_id)["data"]
                 )
+                stats = service_api_client.get_service_statistics(
+                    service_id, limit_days=7
+                )
+                request_ctx.service.stats = stats
             except HTTPError as exc:
                 # if service id isn't real, then 404 rather than 500ing later because we expect service to be set
                 if exc.status_code == 404:
diff --git a/tests/app/main/views/test_api_integration.py b/tests/app/main/views/test_api_integration.py
index 3b326d55f..c1ca57f22 100644
--- a/tests/app/main/views/test_api_integration.py
+++ b/tests/app/main/views/test_api_integration.py
@@ -325,6 +325,7 @@ def test_route_permissions(
         def _get(mocker):
             return {"count": 0}
 
+        mocker.patch("app.service_api_client.get_service_statistics")
         mocker.patch(
             "app.service_api_client.get_global_notification_count", side_effect=_get
         )
@@ -358,6 +359,8 @@ def test_route_invalid_permissions(
         def _get(mocker):
             return {"count": 0}
 
+        mocker.patch("app.service_api_client.get_service_statistics")
+
         mocker.patch(
             "app.service_api_client.get_global_notification_count", side_effect=_get
         )
diff --git a/tests/conftest.py b/tests/conftest.py
index ec4ff8ad1..122b76826 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -2319,6 +2319,8 @@ def client_request(logged_in_client, mocker, service_one):  # noqa (C901 too com
     def _get(mocker):
         return {"count": 0}
 
+    mocker.patch("app.service_api_client.get_service_statistics")
+
     mocker.patch(
         "app.service_api_client.get_global_notification_count", side_effect=_get
     )

From 80135b2ff647567d41773ea1960815be48ac0a23 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Mon, 5 Feb 2024 12:27:40 -0800
Subject: [PATCH 05/89] notify-api-771 fix columns in reports

---
 app/utils/csv.py            | 62 ++++++++++++++++++-------------------
 tests/app/utils/test_csv.py | 48 +++++++++++++---------------
 2 files changed, 51 insertions(+), 59 deletions(-)

diff --git a/app/utils/csv.py b/app/utils/csv.py
index 7cfcb8975..9531e0b5d 100644
--- a/app/utils/csv.py
+++ b/app/utils/csv.py
@@ -78,21 +78,21 @@ def generate_notifications_csv(**kwargs):
             template=get_sample_template(kwargs["template_type"]),
         )
         original_column_headers = original_upload.column_headers
-        fieldnames = (
-            ["Row number"]
-            + original_column_headers
-            + [
-                "Template",
-                "Type",
-                "Sent by",
-                "Job",
-                "Carrier",
-                "Carrier Response",
-                "Status",
-                "Time",
-            ]
-        )
+        fieldnames = [
+            "Template",
+            "Type",
+            "Sent by",
+            "Job",
+            "Carrier",
+            "Carrier Response",
+            "Status",
+            "Time",
+        ]
+        for header in original_column_headers:
+            fieldnames.append(header)
+
     else:
+        # TODO This is deprecated because everything should be a job now, is it ever invoked?
         fieldnames = [
             "Recipient",
             "Template",
@@ -104,6 +104,7 @@ def generate_notifications_csv(**kwargs):
             "Status",
             "Time",
         ]
+        current_app.logger.warning("Invoking deprecated report format")
 
     yield ",".join(fieldnames) + "\n"
 
@@ -118,26 +119,23 @@ def generate_notifications_csv(**kwargs):
 
             current_app.logger.info(f"\n\n{notification}")
             if kwargs.get("job_id"):
-                values = (
-                    [
-                        notification["row_number"],
-                    ]
-                    + [
+                values = [
+                    notification["template_name"],
+                    notification["template_type"],
+                    notification["created_by_name"],
+                    notification["job_name"],
+                    notification["carrier"],
+                    notification["provider_response"],
+                    notification["status"],
+                    preferred_tz_created_at,
+                ]
+                for header in original_column_headers:
+                    values.append(
                         original_upload[notification["row_number"] - 1].get(header).data
-                        for header in original_column_headers
-                    ]
-                    + [
-                        notification["template_name"],
-                        notification["template_type"],
-                        notification["created_by_name"],
-                        notification["job_name"],
-                        notification["carrier"],
-                        notification["provider_response"],
-                        notification["status"],
-                        preferred_tz_created_at,
-                    ]
-                )
+                    )
+
             else:
+                # TODO This is deprecated, should not be invoked.  See above
                 values = [
                     notification["recipient"],
                     notification["template_name"],
diff --git a/tests/app/utils/test_csv.py b/tests/app/utils/test_csv.py
index b237d8ad5..c39414ae5 100644
--- a/tests/app/utils/test_csv.py
+++ b/tests/app/utils/test_csv.py
@@ -46,9 +46,6 @@ def _get_notifications_csv(
             "notifications": [
                 {
                     "row_number": row_number + i,
-                    "to": recipient,
-                    "recipient": recipient,
-                    "client_reference": "ref 1234",
                     "template_name": template_name,
                     "template_type": template_type,
                     "template": {"name": template_name, "template_type": template_type},
@@ -60,6 +57,9 @@ def _get_notifications_csv(
                     "updated_at": None,
                     "created_by_name": created_by_name,
                     "created_by_email_address": created_by_email_address,
+                    "to": recipient,
+                    "recipient": recipient,
+                    "client_reference": "ref 1234",
                 }
                 for i in range(rows)
             ],
@@ -130,8 +130,6 @@ def test_generate_notifications_csv_without_job(
             2028675309
         """,
             [
-                "Row number",
-                "phone_number",
                 "Template",
                 "Type",
                 "Sent by",
@@ -140,10 +138,9 @@ def test_generate_notifications_csv_without_job(
                 "Carrier Response",
                 "Status",
                 "Time",
+                "phone_number",
             ],
             [
-                "1",
-                "2028675309",
                 "foo",
                 "sms",
                 "Fake Person",
@@ -152,6 +149,7 @@ def test_generate_notifications_csv_without_job(
                 "Did not like it",
                 "Delivered",
                 "1943-04-19 08:00:00 AM US/Eastern",
+                "2028675309",
             ],
         ),
         (
@@ -160,11 +158,6 @@ def test_generate_notifications_csv_without_job(
             2028675309,  🐜,🐝,🦀
         """,
             [
-                "Row number",
-                "phone_number",
-                "a",
-                "b",
-                "c",
                 "Template",
                 "Type",
                 "Sent by",
@@ -173,13 +166,12 @@ def test_generate_notifications_csv_without_job(
                 "Carrier Response",
                 "Status",
                 "Time",
+                "phone_number",
+                "a",
+                "b",
+                "c",
             ],
             [
-                "1",
-                "2028675309",
-                "🐜",
-                "🐝",
-                "🦀",
                 "foo",
                 "sms",
                 "Fake Person",
@@ -188,6 +180,10 @@ def test_generate_notifications_csv_without_job(
                 "Did not like it",
                 "Delivered",
                 "1943-04-19 08:00:00 AM US/Eastern",
+                "2028675309",
+                "🐜",
+                "🐝",
+                "🦀",
             ],
         ),
         (
@@ -196,11 +192,6 @@ def test_generate_notifications_csv_without_job(
             "2028675309","🐜,🐜","🐝,🐝","🦀"
         """,
             [
-                "Row number",
-                "phone_number",
-                "a",
-                "b",
-                "c",
                 "Template",
                 "Type",
                 "Sent by",
@@ -209,13 +200,12 @@ def test_generate_notifications_csv_without_job(
                 "Carrier Response",
                 "Status",
                 "Time",
+                "phone_number",
+                "a",
+                "b",
+                "c",
             ],
             [
-                "1",
-                "2028675309",
-                "🐜,🐜",
-                "🐝,🐝",
-                "🦀",
                 "foo",
                 "sms",
                 "Fake Person",
@@ -224,6 +214,10 @@ def test_generate_notifications_csv_without_job(
                 "Did not like it",
                 "Delivered",
                 "1943-04-19 08:00:00 AM US/Eastern",
+                "2028675309",
+                "🐜,🐜",
+                "🐝,🐝",
+                "🦀",
             ],
         ),
     ],

From 456091996e33b51e53c52f2a322df7696490dfff Mon Sep 17 00:00:00 2001
From: Jonathan Bobel <jonathan.bobel@gsa.gov>
Date: Wed, 7 Feb 2024 13:57:21 -0500
Subject: [PATCH 06/89] 1190 - bug - URL not wrapping in table

---
 app/assets/sass/uswds/_uswds-theme-custom-styles.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
index b5f2147cd..8e841d225 100644
--- a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
+++ b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
@@ -354,6 +354,7 @@ td.table-empty-message {
    }
    .file-list-hint {
       margin: 0;
+      word-break: break-word;
    }
    .table-field, .table-field-right-aligned {
       width: 50%;

From 330fad469e21ddb1d8b695213e82097ffc6ad759 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 7 Feb 2024 12:14:00 -0800
Subject: [PATCH 07/89] make ChooseTimeForm time zone aware

---
 app/main/forms.py                             |  2 +-
 tests/app/main/forms/test_choose_time_form.py | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/main/forms.py b/app/main/forms.py
index d9a35b72a..76b695dd8 100644
--- a/app/main/forms.py
+++ b/app/main/forms.py
@@ -70,7 +70,7 @@ from app.utils.user_permissions import all_ui_permissions, permission_options
 def get_time_value_and_label(future_time):
     preferred_tz = pytz.timezone(get_user_preferred_timezone())
     return (
-        future_time.astimezone(preferred_tz).replace(tzinfo=None).isoformat(),
+        future_time.astimezone(preferred_tz).isoformat(),
         "{} at {} {}".format(
             get_human_day(future_time.astimezone(preferred_tz)),
             get_human_time(future_time.astimezone(preferred_tz)),
diff --git a/tests/app/main/forms/test_choose_time_form.py b/tests/app/main/forms/test_choose_time_form.py
index e87c96744..4f8b13aa4 100644
--- a/tests/app/main/forms/test_choose_time_form.py
+++ b/tests/app/main/forms/test_choose_time_form.py
@@ -10,21 +10,21 @@ def test_form_contains_next_24h(notify_admin):
 
     # Friday
     assert choices[0] == ("", "Now")
-    assert choices[1] == ("2016-01-01T07:00:00", "Today at 7am US/Eastern")
-    assert choices[13] == ("2016-01-01T19:00:00", "Today at 7pm US/Eastern")
+    assert choices[1] == ("2016-01-01T07:00:00-05:00", "Today at 7am US/Eastern")
+    assert choices[13] == ("2016-01-01T19:00:00-05:00", "Today at 7pm US/Eastern")
 
     # Saturday
-    assert choices[14] == ("2016-01-01T20:00:00", "Today at 8pm US/Eastern")
-    assert choices[37] == ("2016-01-02T19:00:00", "Tomorrow at 7pm US/Eastern")
+    assert choices[14] == ("2016-01-01T20:00:00-05:00", "Today at 8pm US/Eastern")
+    assert choices[37] == ("2016-01-02T19:00:00-05:00", "Tomorrow at 7pm US/Eastern")
 
     # Sunday
-    assert choices[38] == ("2016-01-02T20:00:00", "Tomorrow at 8pm US/Eastern")
+    assert choices[38] == ("2016-01-02T20:00:00-05:00", "Tomorrow at 8pm US/Eastern")
 
     # Monday
-    assert choices[62] == ("2016-01-03T20:00:00", "Sunday at 8pm US/Eastern")
-    assert choices[80] == ("2016-01-04T14:00:00", "Monday at 2pm US/Eastern")
-    assert choices[84] == ("2016-01-04T18:00:00", "Monday at 6pm US/Eastern")
-    assert choices[85] == ("2016-01-04T19:00:00", "Monday at 7pm US/Eastern")
+    assert choices[62] == ("2016-01-03T20:00:00-05:00", "Sunday at 8pm US/Eastern")
+    assert choices[80] == ("2016-01-04T14:00:00-05:00", "Monday at 2pm US/Eastern")
+    assert choices[84] == ("2016-01-04T18:00:00-05:00", "Monday at 6pm US/Eastern")
+    assert choices[85] == ("2016-01-04T19:00:00-05:00", "Monday at 7pm US/Eastern")
 
     with pytest.raises(IndexError):
         assert choices[

From fb469545b48cc09c6441fd8ecaaddd645f7bd1e5 Mon Sep 17 00:00:00 2001
From: Jonathan Bobel <jonathan.bobel@gsa.gov>
Date: Thu, 8 Feb 2024 12:09:01 -0500
Subject: [PATCH 08/89] 1154 - pushing up this change so Ken can take a look

---
 app/main/forms.py | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/app/main/forms.py b/app/main/forms.py
index d9a35b72a..6f22734d2 100644
--- a/app/main/forms.py
+++ b/app/main/forms.py
@@ -1239,22 +1239,27 @@ class ChangeNameForm(StripWhitespaceForm):
 class ChangePreferredTimezoneForm(StripWhitespaceForm):
     def __init__(self, *args, **kwargs):
         super(ChangePreferredTimezoneForm, self).__init__(*args, **kwargs)
-        self.new_preferred_timezone.choices = [
-            ("America/Puerto_Rico", "America/Puerto_Rico"),
-            ("US/Eastern", "US/Eastern"),
-            ("US/Central", "US/Central"),
-            ("US/Mountain", "US/Mountain"),
-            ("US/Pacific", "US/Pacific"),
-            ("US/Alaska", "US/Alaska"),
-            ("US/Hawaii", "US/Hawaii"),
-            ("US/Aleutian", "US/Aleutian"),
-            ("US/Samoa", "US/Samoa"),
-        ]
 
-    new_preferred_timezone = GovukRadiosField(
-        "What timezone would you like to use?",
-        default="US/Eastern",
-    )
+        # Get the current preferred timezone from the form data
+        current_timezone = kwargs.get('obj', None).new_preferred_timezone if 'obj' in kwargs else "US/Eastern"
+
+        # Set the choices
+        self.new_preferred_timezone = GovukRadiosField(
+            label="What timezone would you like to use?",
+            choices=[
+                ("America/Puerto_Rico", "America/Puerto_Rico"),
+                ("US/Eastern", "US/Eastern"),
+                ("US/Central", "US/Central"),
+                ("US/Mountain", "US/Mountain"),
+                ("US/Pacific", "US/Pacific"),
+                ("US/Alaska", "US/Alaska"),
+                ("US/Hawaii", "US/Hawaii"),
+                ("US/Aleutian", "US/Aleutian"),
+                ("US/Samoa", "US/Samoa"),
+            ],
+            default=current_timezone
+        )
+
 
 
 class ChangeEmailForm(StripWhitespaceForm):

From 7832797628acee9a7e976f6abc892f4d284af469 Mon Sep 17 00:00:00 2001
From: Jonathan Bobel <jonathan.bobel@gsa.gov>
Date: Thu, 8 Feb 2024 15:10:07 -0500
Subject: [PATCH 09/89] Just removing the default selection

---
 app/main/forms.py | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/app/main/forms.py b/app/main/forms.py
index 6f22734d2..93ccd8a55 100644
--- a/app/main/forms.py
+++ b/app/main/forms.py
@@ -1239,27 +1239,21 @@ class ChangeNameForm(StripWhitespaceForm):
 class ChangePreferredTimezoneForm(StripWhitespaceForm):
     def __init__(self, *args, **kwargs):
         super(ChangePreferredTimezoneForm, self).__init__(*args, **kwargs)
+        self.new_preferred_timezone.choices = [
+            ("America/Puerto_Rico", "America/Puerto_Rico"),
+            ("US/Eastern", "US/Eastern"),
+            ("US/Central", "US/Central"),
+            ("US/Mountain", "US/Mountain"),
+            ("US/Pacific", "US/Pacific"),
+            ("US/Alaska", "US/Alaska"),
+            ("US/Hawaii", "US/Hawaii"),
+            ("US/Aleutian", "US/Aleutian"),
+            ("US/Samoa", "US/Samoa"),
+        ]
 
-        # Get the current preferred timezone from the form data
-        current_timezone = kwargs.get('obj', None).new_preferred_timezone if 'obj' in kwargs else "US/Eastern"
-
-        # Set the choices
-        self.new_preferred_timezone = GovukRadiosField(
-            label="What timezone would you like to use?",
-            choices=[
-                ("America/Puerto_Rico", "America/Puerto_Rico"),
-                ("US/Eastern", "US/Eastern"),
-                ("US/Central", "US/Central"),
-                ("US/Mountain", "US/Mountain"),
-                ("US/Pacific", "US/Pacific"),
-                ("US/Alaska", "US/Alaska"),
-                ("US/Hawaii", "US/Hawaii"),
-                ("US/Aleutian", "US/Aleutian"),
-                ("US/Samoa", "US/Samoa"),
-            ],
-            default=current_timezone
-        )
-
+    new_preferred_timezone = GovukRadiosField(
+        "What timezone would you like to use?",
+    )
 
 
 class ChangeEmailForm(StripWhitespaceForm):

From 2aa9f2c532fa2880a5eef70754a48efa7d02dcb6 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Fri, 9 Feb 2024 07:27:28 -0800
Subject: [PATCH 10/89] remove carrier column

---
 app/utils/csv.py            |  4 ----
 tests/app/utils/test_csv.py | 16 ++++------------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/app/utils/csv.py b/app/utils/csv.py
index 9531e0b5d..679bdb84a 100644
--- a/app/utils/csv.py
+++ b/app/utils/csv.py
@@ -83,7 +83,6 @@ def generate_notifications_csv(**kwargs):
             "Type",
             "Sent by",
             "Job",
-            "Carrier",
             "Carrier Response",
             "Status",
             "Time",
@@ -99,7 +98,6 @@ def generate_notifications_csv(**kwargs):
             "Type",
             "Sent by",
             "Job",
-            "Carrier",
             "Carrier Response",
             "Status",
             "Time",
@@ -124,7 +122,6 @@ def generate_notifications_csv(**kwargs):
                     notification["template_type"],
                     notification["created_by_name"],
                     notification["job_name"],
-                    notification["carrier"],
                     notification["provider_response"],
                     notification["status"],
                     preferred_tz_created_at,
@@ -142,7 +139,6 @@ def generate_notifications_csv(**kwargs):
                     notification["template_type"],
                     notification["created_by_name"] or "",
                     notification["job_name"] or "",
-                    notification["carrier"],
                     notification["provider_response"],
                     notification["status"],
                     preferred_tz_created_at,
diff --git a/tests/app/utils/test_csv.py b/tests/app/utils/test_csv.py
index c39414ae5..a3dc446d2 100644
--- a/tests/app/utils/test_csv.py
+++ b/tests/app/utils/test_csv.py
@@ -18,7 +18,6 @@ def _get_notifications_csv(
     template_name="foo",
     template_type="sms",
     job_name="bar.csv",
-    carrier="ATT Mobility",
     provider_response="Did not like it",
     status="Delivered",
     created_at="1943-04-19 12:00:00",
@@ -50,7 +49,6 @@ def _get_notifications_csv(
                     "template_type": template_type,
                     "template": {"name": template_name, "template_type": template_type},
                     "job_name": job_name,
-                    "carrier": carrier,
                     "provider_response": provider_response,
                     "status": status,
                     "created_at": created_at,
@@ -90,15 +88,15 @@ def get_notifications_csv_mock(
         (
             None,
             [
-                "Recipient,Template,Type,Sent by,Job,Carrier,Carrier Response,Status,Time\n",
-                "foo@bar.com,foo,sms,,,ATT Mobility,Did not like it,Delivered,1943-04-19 08:00:00 AM US/Eastern\r\n",
+                "Recipient,Template,Type,Sent by,Job,Carrier Response,Status,Time\n",
+                "foo@bar.com,foo,sms,,,Did not like it,Delivered,1943-04-19 08:00:00 AM US/Eastern\r\n",
             ],
         ),
         (
             "Anne Example",
             [
-                "Recipient,Template,Type,Sent by,Job,Carrier,Carrier Response,Status,Time\n",
-                "foo@bar.com,foo,sms,Anne Example,,ATT Mobility,Did not like it,Delivered,1943-04-19 08:00:00 AM US/Eastern\r\n",  # noqa
+                "Recipient,Template,Type,Sent by,Job,Carrier Response,Status,Time\n",
+                "foo@bar.com,foo,sms,Anne Example,,Did not like it,Delivered,1943-04-19 08:00:00 AM US/Eastern\r\n",  # noqa
             ],
         ),
     ],
@@ -134,7 +132,6 @@ def test_generate_notifications_csv_without_job(
                 "Type",
                 "Sent by",
                 "Job",
-                "Carrier",
                 "Carrier Response",
                 "Status",
                 "Time",
@@ -145,7 +142,6 @@ def test_generate_notifications_csv_without_job(
                 "sms",
                 "Fake Person",
                 "bar.csv",
-                "ATT Mobility",
                 "Did not like it",
                 "Delivered",
                 "1943-04-19 08:00:00 AM US/Eastern",
@@ -162,7 +158,6 @@ def test_generate_notifications_csv_without_job(
                 "Type",
                 "Sent by",
                 "Job",
-                "Carrier",
                 "Carrier Response",
                 "Status",
                 "Time",
@@ -176,7 +171,6 @@ def test_generate_notifications_csv_without_job(
                 "sms",
                 "Fake Person",
                 "bar.csv",
-                "ATT Mobility",
                 "Did not like it",
                 "Delivered",
                 "1943-04-19 08:00:00 AM US/Eastern",
@@ -196,7 +190,6 @@ def test_generate_notifications_csv_without_job(
                 "Type",
                 "Sent by",
                 "Job",
-                "Carrier",
                 "Carrier Response",
                 "Status",
                 "Time",
@@ -210,7 +203,6 @@ def test_generate_notifications_csv_without_job(
                 "sms",
                 "Fake Person",
                 "bar.csv",
-                "ATT Mobility",
                 "Did not like it",
                 "Delivered",
                 "1943-04-19 08:00:00 AM US/Eastern",

From 48f1c7c8647227bdefe66f6f2de49cb4a7d3d7e7 Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Fri, 9 Feb 2024 17:43:01 -0500
Subject: [PATCH 11/89] Admin:  Add a pull request template

This changeset adds a template to the repository for our pull requests.  The intention is two-fold:

- To make it easier to know what information and details to include in our pull requests
- To improve the quality and usefulness of our pull requests

This is a start and we will be adjusting this over time as we learn more and refine our process.

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 .github/pull_request_template.md | 79 ++++++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 .github/pull_request_template.md

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 000000000..cb6b2c84b
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,79 @@
+<!--
+Please follow the instructions found in this pull request template so that we
+have all of the relevant details needed for our work.
+
+At the minimum, please be sure to fill in all sections found below and also do
+the following:
+
+- Provide an appropriate and descriptive title for the pull request
+- Link the pull request to its corresponding issue (must be done after creating
+  the pull request itself)
+- Assign yourself as the author
+- Attach the appropriate labels to it
+- Set it to be on the Notify.gov project board
+- Select one or more reviewers from the team or mark the pull request as a draft
+  depending on its current state
+   - If the pull request is a draft, please be sure to add reviewers once it is
+     ready for review and mark it ready for review
+
+For each section, please delete the instructions/sample text (that includes this
+text, though it is wrapped in an HTML comment just in case) and put in your own
+information.  Thank you!
+-->
+
+*A note to PR reviewers: it may be helpful to review our
+[code review documentation](https://github.com/GSA/notifications-api/blob/main/docs/all.md#code-reviews)
+to know what to keep in mind while reviewing pull requests.*
+
+## Description
+
+Please enter a clear description about your proposed changes and what the
+expected outcome(s) is/are from there.  If there are complex implementation
+details within the changes, this is a great place to explain those details using
+plain language.
+
+This should include:
+
+- Links to issues that this PR addresses
+- Screenshots or screen captures of any visible changes, especially for UI work
+- Dependency changes
+
+If there are any caveats, known issues, follow-up items, etc., make a quick note
+of them here as well, though more details are probably warranted in the issue
+itself in this case.
+
+## TODO (optional)
+
+If you're opening a draft PR, it might be helpful to list any outstanding work,
+especially if you're asking folks to take a look before it's ready for full
+review.  In this case, create a small checklist with the outstanding items:
+
+- [ ] TODO item 1
+- [ ] TODO item 2
+- [ ] TODO item ...
+
+## Security Considerations
+
+Please think about the security compliance aspect of your changes and what the
+potential impacts might be.
+
+**NOTE:  Please be mindful of sharing sensitive information here!  If you're not
+sure of what to write, please ask the team first before writing anything here.**
+
+Relevant details could include (and are not limited to) the following:
+
+- Handling secrets/credential management (or specifically calling out that there
+  is nothing to handle)
+- Any adjustments to the flow of data in and out the system, or even within it
+- Connecting or disconnecting any external services to the application
+- Handling of any sensitive information, such as PII
+- Handling of information within log statements or other application monitoring
+  services/hooks
+- The inclusion of a new external dependency or the removal of an existing one
+- ... (anything else relevant from a security compliance perspective)
+
+There are some cases where there are no security considerations to be had, e.g.,
+updating our documentation with publicly available information.  In those cases
+it is fine to simply put something like this:
+
+- None; this is a documentation update with publicly available information.

From 72aa14fd3b97e901d9415f1da0fdcd505f654e95 Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Fri, 9 Feb 2024 17:09:48 -0800
Subject: [PATCH 12/89] fixed duplicates to notification by adding aggregate

---
 app/main/views/dashboard.py                  | 21 +++++--
 app/templates/views/dashboard/dashboard.html | 63 ++++++++++----------
 2 files changed, 46 insertions(+), 38 deletions(-)

diff --git a/app/main/views/dashboard.py b/app/main/views/dashboard.py
index a88203ae7..7356f586b 100644
--- a/app/main/views/dashboard.py
+++ b/app/main/views/dashboard.py
@@ -29,6 +29,7 @@ from app.utils.csv import Spreadsheet
 from app.utils.pagination import generate_next_dict, generate_previous_dict
 from app.utils.time import get_current_financial_year
 from app.utils.user import user_has_permissions
+from collections import defaultdict
 
 
 @main.route("/services/<uuid:service_id>/dashboard")
@@ -47,22 +48,31 @@ def service_dashboard(service_id):
     if not current_user.has_permissions("view_activity"):
         return redirect(url_for("main.choose_template", service_id=service_id))
 
-    notifications = notification_api_client.get_notifications_for_service(
+    notifications_response = notification_api_client.get_notifications_for_service(
         service_id=service_id,
     )["notifications"]
-
     job_response = job_api_client.get_jobs(service_id)
-
     service_data_retention_days = 7
-    jobs = [
+
+    aggregate_notifications_by_job = defaultdict(list)
+    for notification in notifications_response:
+        job_id = notification.get("job", {}).get("id")
+        if job_id:
+            aggregate_notifications_by_job[job_id].append(notification)
+
+    job_and_notifications = [
         {
             "job_id": job["id"],
             "time_left": get_time_left(job["created_at"]),
             "download_link": url_for(
                 ".view_job_csv", service_id=current_service.id, job_id=job["id"]
             ),
+            "view_job_link": url_for(
+                ".view_job", service_id=current_service.id, job_id=job["id"]
+            ),
             "notification_count": job["notification_count"],
             "created_by": job["created_by"],
+            "notifications": aggregate_notifications_by_job.get(job["id"], []),
         }
         for job in job_response["data"]
     ]
@@ -70,8 +80,7 @@ def service_dashboard(service_id):
         "views/dashboard/dashboard.html",
         updates_url=url_for(".service_dashboard_updates", service_id=service_id),
         partials=get_dashboard_partials(service_id),
-        notifications=notifications,
-        jobs=jobs,
+        job_and_notifications=job_and_notifications,
         service_data_retention_days=service_data_retention_days,
     )
 
diff --git a/app/templates/views/dashboard/dashboard.html b/app/templates/views/dashboard/dashboard.html
index 9c51ea47c..de7f3b372 100644
--- a/app/templates/views/dashboard/dashboard.html
+++ b/app/templates/views/dashboard/dashboard.html
@@ -28,7 +28,6 @@
     {{ ajax_block(partials, updates_url, 'totals') }}
 
     {{ ajax_block(partials, updates_url, 'template-statistics') }}
-
     <h2 class="margin-top-4 margin-bottom-1">Recent Batches</h2>
     <div class='job-table'>
       <table class="usa-table usa-table--borderless width-full">
@@ -55,37 +54,37 @@
           </tr>
         </thead>
         <tbody>
-          {% for notification in notifications[:5] %}
-            {% if notification %}
-              <tr class="table-row" id="{{ notification.job.id }}">
-                <th class="table-field">
-                  {{ notification.job.original_file_name if notification.job.original_file_name else 'Manually entered number'}}
-                  <br>
-                  <a class="usa-link file-list-filename" href="/services/{{ notification.service }}/jobs/{{ notification.job.id }}">View Batch</a>
-                </th>
-                <th class="table-field">
-                  {{ notification.template.name }}
-                </th>
-                <th class="table-field">
-                  {{ notification.created_at | format_datetime_short_america }}
-                </th>
-                <th class="table-field">
-                  {{ notification.created_by.name }}
-                </th>
-                {% set job_available = jobs|selectattr('job_id', 'equalto', notification.job.id)|first %}
-                <th class="table-field">
-                  {{ job_available.notification_count if job_available else ''}}
-                </th>
-                <th class="table-field">
-                  {% if job_available and job_available.time_left != "Data no longer available" %}
-                    <a class="usa-link file-list-filename" href="{{ job_available.download_link }}">
-                      {{ "Download" if job_available.job_id else '' }}</a>
-                    <span class="usa-hint">{{ job_available.time_left }}</span>
-                  {% elif job_available %}
-                    <span>{{ job_available.time_left }}</span>
-                  {% endif %}
-                </th>
-              </tr>
+          {% for job in job_and_notifications[:5] %}
+            {% if job.job_id and job.notifications %}
+              {% for notification in job.notifications %}
+                <tr class="table-row" id="{{ job.job_id }}">
+                  <th class="table-field">
+                    {{ notification.job.original_file_name if notification.job.original_file_name else 'Manually entered number'}}
+                    <br>
+                    <a class="usa-link file-list-filename" href="{{ job.view_job_link }}">View Batch</a>
+                  </th>
+                  <th class="table-field">
+                    {{ notification.template.name }}
+                  </th>
+                  <th class="table-field">
+                    {{ notification.created_at | format_datetime_short_america }}
+                  </th>
+                  <th class="table-field">
+                    {{ notification.created_by.name }}
+                  </th>
+                  <th class="table-field">
+                    {{ job.notification_count}}
+                  </th>
+                  <th class="table-field">
+                    {% if notification and job.time_left != "Data no longer available" %}
+                      <a class="usa-link file-list-filename" href="{{ job.download_link }}">Download</a>
+                      <span class="usa-hint">{{ job.time_left }}</span>
+                    {% elif job %}
+                      <span>{{ job.time_left }}</span>
+                    {% endif %}
+                  </th>
+                </tr>
+              {% endfor %}
             {% endif %}
           {% endfor %}
         </tbody>

From b7f21a6efd68f16cfff3f5928827e56878af3e60 Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Fri, 9 Feb 2024 17:15:44 -0800
Subject: [PATCH 13/89] update sort imports

---
 app/main/views/dashboard.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/main/views/dashboard.py b/app/main/views/dashboard.py
index 7356f586b..305c13763 100644
--- a/app/main/views/dashboard.py
+++ b/app/main/views/dashboard.py
@@ -1,4 +1,5 @@
 import calendar
+from collections import defaultdict
 from datetime import datetime
 from functools import partial
 from itertools import groupby
@@ -29,7 +30,7 @@ from app.utils.csv import Spreadsheet
 from app.utils.pagination import generate_next_dict, generate_previous_dict
 from app.utils.time import get_current_financial_year
 from app.utils.user import user_has_permissions
-from collections import defaultdict
+
 
 
 @main.route("/services/<uuid:service_id>/dashboard")

From 7b8a187db0373c29cc214640f8e784fc1b768856 Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Fri, 9 Feb 2024 17:19:15 -0800
Subject: [PATCH 14/89] update sort imports

---
 app/main/views/dashboard.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/main/views/dashboard.py b/app/main/views/dashboard.py
index 305c13763..29a3dba08 100644
--- a/app/main/views/dashboard.py
+++ b/app/main/views/dashboard.py
@@ -32,7 +32,6 @@ from app.utils.time import get_current_financial_year
 from app.utils.user import user_has_permissions
 
 
-
 @main.route("/services/<uuid:service_id>/dashboard")
 @user_has_permissions("view_activity", "send_messages")
 def old_service_dashboard(service_id):

From b034f1eb799919dba617da111738b45822c83717 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Mon, 12 Feb 2024 10:53:15 -0800
Subject: [PATCH 15/89] clean up login.gov link

---
 app/templates/views/signin.html | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/templates/views/signin.html b/app/templates/views/signin.html
index d47b4cc80..a19376d7c 100644
--- a/app/templates/views/signin.html
+++ b/app/templates/views/signin.html
@@ -29,10 +29,9 @@
     {% else %}
       <h1 class="font-body-2xl margin-bottom-3">Sign in</h1>
       {% if login_gov_enabled %}
-      <p>
-        Test login.gov authentication:
-        <a class="usa-link" href="{{ initial_signin_url }}">Login.gov</a>.
+        <a class="usa-link" href="{{ initial_signin_url }}">Sign in with Login.gov</a>
       </p>
+      <h4 class="margin-bottom-3">Or:</h4>
       {% endif %}
     {% endif %}
 

From ef5ed8ecabe533cce5c7bb881d053d7ceaa1fd71 Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Mon, 12 Feb 2024 15:29:26 -0800
Subject: [PATCH 16/89] updated pytest

---
 app/main/views/dashboard.py                  |  9 ++--
 app/templates/views/dashboard/dashboard.html | 47 +++++++++++---------
 tests/app/main/views/test_dashboard.py       | 29 ++++++++----
 3 files changed, 51 insertions(+), 34 deletions(-)

diff --git a/app/main/views/dashboard.py b/app/main/views/dashboard.py
index 29a3dba08..b6370a4b2 100644
--- a/app/main/views/dashboard.py
+++ b/app/main/views/dashboard.py
@@ -48,10 +48,8 @@ def service_dashboard(service_id):
     if not current_user.has_permissions("view_activity"):
         return redirect(url_for("main.choose_template", service_id=service_id))
 
-    notifications_response = notification_api_client.get_notifications_for_service(
-        service_id=service_id,
-    )["notifications"]
-    job_response = job_api_client.get_jobs(service_id)
+    job_response = job_api_client.get_jobs(service_id)["data"]
+    notifications_response = notification_api_client.get_notifications_for_service(service_id)["notifications"]
     service_data_retention_days = 7
 
     aggregate_notifications_by_job = defaultdict(list)
@@ -70,11 +68,12 @@ def service_dashboard(service_id):
             "view_job_link": url_for(
                 ".view_job", service_id=current_service.id, job_id=job["id"]
             ),
+            "created_at": job["created_at"],
             "notification_count": job["notification_count"],
             "created_by": job["created_by"],
             "notifications": aggregate_notifications_by_job.get(job["id"], []),
         }
-        for job in job_response["data"]
+        for job in job_response
     ]
     return render_template(
         "views/dashboard/dashboard.html",
diff --git a/app/templates/views/dashboard/dashboard.html b/app/templates/views/dashboard/dashboard.html
index de7f3b372..b5ca04c42 100644
--- a/app/templates/views/dashboard/dashboard.html
+++ b/app/templates/views/dashboard/dashboard.html
@@ -29,8 +29,8 @@
 
     {{ ajax_block(partials, updates_url, 'template-statistics') }}
     <h2 class="margin-top-4 margin-bottom-1">Recent Batches</h2>
-    <div class='job-table'>
-      <table class="usa-table usa-table--borderless width-full">
+    <div>
+      <table class="usa-table usa-table--borderless job-table">
         <thead class="table-field-headings">
           <tr>
             <th scope="col" class="table-field-heading-first file-name">
@@ -54,39 +54,44 @@
           </tr>
         </thead>
         <tbody>
-          {% for job in job_and_notifications[:5] %}
-            {% if job.job_id and job.notifications %}
-              {% for notification in job.notifications %}
+          {% if job_and_notifications %}
+            {% for job in job_and_notifications %}
+              {% if job.job_id and job.notifications %}
+                {% set notification = job.notifications[0] %}
                 <tr class="table-row" id="{{ job.job_id }}">
-                  <th class="table-field">
+                  <td class="table-field">
                     {{ notification.job.original_file_name if notification.job.original_file_name else 'Manually entered number'}}
                     <br>
                     <a class="usa-link file-list-filename" href="{{ job.view_job_link }}">View Batch</a>
-                  </th>
-                  <th class="table-field">
+                  </td>
+                  <td class="table-field">
                     {{ notification.template.name }}
-                  </th>
-                  <th class="table-field">
-                    {{ notification.created_at | format_datetime_short_america }}
-                  </th>
-                  <th class="table-field">
+                  </td>
+                  <td class="table-field">
+                    {{ job.created_at | format_datetime_short_america }}
+                  </td>
+                  <td class="table-field">
                     {{ notification.created_by.name }}
-                  </th>
-                  <th class="table-field">
+                  </td>
+                  <td class="table-field">
                     {{ job.notification_count}}
-                  </th>
-                  <th class="table-field">
+                  </td>
+                  <td class="table-field">
                     {% if notification and job.time_left != "Data no longer available" %}
                       <a class="usa-link file-list-filename" href="{{ job.download_link }}">Download</a>
                       <span class="usa-hint">{{ job.time_left }}</span>
                     {% elif job %}
                       <span>{{ job.time_left }}</span>
                     {% endif %}
-                  </th>
+                  </td>
                 </tr>
-              {% endfor %}
-            {% endif %}
-          {% endfor %}
+              {% endif %}
+            {% endfor %}
+          {% else %}
+            <tr class="table-row">
+              <td class="table-empty-message" colspan="10">No batched job messages found &thinsp;(messages are kept for {{ service_data_retention_days }} days).</td>
+            </tr>
+        {% endif %}
         </tbody>
       </table>
     </div>
diff --git a/tests/app/main/views/test_dashboard.py b/tests/app/main/views/test_dashboard.py
index 8e9ecb531..53a8a7feb 100644
--- a/tests/app/main/views/test_dashboard.py
+++ b/tests/app/main/views/test_dashboard.py
@@ -40,7 +40,7 @@ FAKE_ONE_OFF_NOTIFICATION = {
             "created_by": {
                 "email_address": "grsrbsrgsrf@fake.gov",
                 "id": "de059e0a-42e5-48bb-939e-4f76804ab739",
-                "name": "grsrbsrgsrf",
+                "name": "mocked_user",
             },
             "document_download_count": None,
             "id": "a3442b43-0ba1-4854-9e0a-d2fba1cc9b81",
@@ -71,7 +71,7 @@ FAKE_ONE_OFF_NOTIFICATION = {
             "template": {
                 "content": "((day of week)) and ((fave color))",
                 "id": "bd9caa7e-00ee-4c5a-839e-10ae1a7e6f73",
-                "name": "personalized",
+                "name": "Template Testing",
                 "redact_personalisation": False,
                 "subject": None,
                 "template_type": "sms",
@@ -94,7 +94,7 @@ MOCK_JOBS = {
                 "id": "mocked_user_id",
                 "name": "mocked_user",
             },
-            "id": "mocked_notification_id",
+            "id": "55b242b5-9f62-4271-aff7-039e9c320578",
             "job_status": "finished",
             "notification_count": 1,
             "original_file_name": "mocked_file.csv",
@@ -113,6 +113,19 @@ MOCK_JOBS = {
     ]
 }
 
+MOCK_JOBS_AND_NOTIFICATIONS = [
+    {
+        "created_at": MOCK_JOBS["data"][0]["created_at"],
+        "created_by": MOCK_JOBS["data"][0]["created_by"],
+        "download_link": "/services/21b3ee3d-1cb0-4666-bfa0-9c5ac26d3fe3/jobs/463b5ecb-4e32-43e5-aa90-0234d19fceaa.csv",
+        "job_id": "55b242b5-9f62-4271-aff7-039e9c320578",
+        "notification_count": MOCK_JOBS["data"][0]["notification_count"],
+        "notifications": FAKE_ONE_OFF_NOTIFICATION["notifications"],
+        "time_left": "Data available for 7 days",
+        "view_job_link": "/services/21b3ee3d-1cb0-4666-bfa0-9c5ac26d3fe3/jobs/463b5ecb-4e32-43e5-aa90-0234d19fceaa"
+    },
+]
+
 stub_template_stats = [
     {
         "template_type": "sms",
@@ -1855,11 +1868,11 @@ def test_service_dashboard_shows_batched_jobs(
 
     page = client_request.get("main.service_dashboard", service_id=SERVICE_ONE_ID)
 
-    job_table = page.find("div", class_="job-table")
+    job_table_body = page.find("table", class_="job-table")
 
-    # Check if the "Job" table exists
-    assert job_table is not None
+    rows = job_table_body.find_all("tbody")[0].find_all("tr")
 
-    table_rows = job_table.find_all("tbody")[0].find_all("tr")
+    # # Check if the "Job" table exists
+    assert job_table_body is not None
 
-    assert len(table_rows) == 1
+    assert len(rows) == 1

From dd902468f27b2f033224a480c1304b1def10fa39 Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Mon, 12 Feb 2024 16:33:41 -0800
Subject: [PATCH 17/89] updated css table widths

---
 .../uswds/_uswds-theme-custom-styles.scss     | 45 ++++++++++---------
 app/templates/views/dashboard/dashboard.html  | 24 +++++-----
 2 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
index b5f2147cd..21d760659 100644
--- a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
+++ b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
@@ -378,28 +378,29 @@ td.table-empty-message {
 }
 
 .job-table {
-   .usa-table {
-      thead th.file-name {
-         width: 25%;
-      }
-      thead th.template {
-         width: 20%;
-      }
-      thead th.time-sent {
-         width: 30%;
-      }
-      thead th.sender {
-         width: 15%;
-      }
-      thead th.\#-of-recipients {
-         width: 5%;
-      }
-      thead th.report {
-         width: 5%;
-      }
-      th {
-         padding: 0.5rem 0.5rem;
-      }
+   width: 100%;
+   border-collapse: collapse;
+   td.file-name {
+      width: 25%;
+      overflow-wrap: anywhere;
+   }
+   td.template {
+      width: 20%;
+   }
+   td.time-sent {
+      width: 20%;
+   }
+   td.sender {
+      width: 15%;
+   }
+   td.count-of-recipients {
+      width: 5%;
+   }
+   td.report {
+      width: 5%;
+   }
+   th {
+      padding: 0.5rem 0.5rem;
    }
 }
 
diff --git a/app/templates/views/dashboard/dashboard.html b/app/templates/views/dashboard/dashboard.html
index b5ca04c42..133b0a720 100644
--- a/app/templates/views/dashboard/dashboard.html
+++ b/app/templates/views/dashboard/dashboard.html
@@ -33,22 +33,22 @@
       <table class="usa-table usa-table--borderless job-table">
         <thead class="table-field-headings">
           <tr>
-            <th scope="col" class="table-field-heading-first file-name">
+            <th scope="col" class="table-field-heading-first">
               <span>File name</span>
             </th>
-            <th scope="col" class="table-field-heading template">
+            <th scope="col" class="table-field-heading">
               <span>Template</span>
             </th>
-            <th scope="col" class="table-field-heading time-sent">
+            <th scope="col" class="table-field-heading">
               <span>Time sent</span>
             </th>
-            <th scope="col" class="table-field-heading sender">
+            <th scope="col" class="table-field-heading">
               <span>Sender</span>
             </th>
-            <th scope="col" class="table-field-heading #-of-recipients">
+            <th scope="col" class="table-field-heading">
               <span># of Recipients</span>
             </th>
-            <th scope="col" class="table-field-heading report">
+            <th scope="col" class="table-field-heading">
               <span>Report</span>
             </th>
           </tr>
@@ -59,24 +59,24 @@
               {% if job.job_id and job.notifications %}
                 {% set notification = job.notifications[0] %}
                 <tr class="table-row" id="{{ job.job_id }}">
-                  <td class="table-field">
+                  <td class="table-field file-name">
                     {{ notification.job.original_file_name if notification.job.original_file_name else 'Manually entered number'}}
                     <br>
                     <a class="usa-link file-list-filename" href="{{ job.view_job_link }}">View Batch</a>
                   </td>
-                  <td class="table-field">
+                  <td class="table-field template">
                     {{ notification.template.name }}
                   </td>
-                  <td class="table-field">
+                  <td class="table-field time-sent">
                     {{ job.created_at | format_datetime_short_america }}
                   </td>
-                  <td class="table-field">
+                  <td class="table-field sender">
                     {{ notification.created_by.name }}
                   </td>
-                  <td class="table-field">
+                  <td class="table-field count-of-recipients">
                     {{ job.notification_count}}
                   </td>
-                  <td class="table-field">
+                  <td class="table-field report">
                     {% if notification and job.time_left != "Data no longer available" %}
                       <a class="usa-link file-list-filename" href="{{ job.download_link }}">Download</a>
                       <span class="usa-hint">{{ job.time_left }}</span>

From 49c5f57d8185f5b181ba4c6bfdb9cd553b5262f0 Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Mon, 12 Feb 2024 16:34:54 -0800
Subject: [PATCH 18/89] limit 5 in table

---
 app/templates/views/dashboard/dashboard.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/dashboard/dashboard.html b/app/templates/views/dashboard/dashboard.html
index 133b0a720..3ea62a273 100644
--- a/app/templates/views/dashboard/dashboard.html
+++ b/app/templates/views/dashboard/dashboard.html
@@ -55,7 +55,7 @@
         </thead>
         <tbody>
           {% if job_and_notifications %}
-            {% for job in job_and_notifications %}
+            {% for job in job_and_notifications[:5] %}
               {% if job.job_id and job.notifications %}
                 {% set notification = job.notifications[0] %}
                 <tr class="table-row" id="{{ job.job_id }}">

From 53549495ea8777e0b51e708bb4b7ea952c4bfe39 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 14 Feb 2024 10:39:52 -0800
Subject: [PATCH 19/89] remove Type and change Job to Batch File

---
 app/utils/csv.py            |  8 ++------
 tests/app/utils/test_csv.py | 20 +++++++-------------
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/app/utils/csv.py b/app/utils/csv.py
index 679bdb84a..ff3c43335 100644
--- a/app/utils/csv.py
+++ b/app/utils/csv.py
@@ -80,9 +80,8 @@ def generate_notifications_csv(**kwargs):
         original_column_headers = original_upload.column_headers
         fieldnames = [
             "Template",
-            "Type",
             "Sent by",
-            "Job",
+            "Batch File",
             "Carrier Response",
             "Status",
             "Time",
@@ -95,9 +94,8 @@ def generate_notifications_csv(**kwargs):
         fieldnames = [
             "Recipient",
             "Template",
-            "Type",
             "Sent by",
-            "Job",
+            "Batch File",
             "Carrier Response",
             "Status",
             "Time",
@@ -119,7 +117,6 @@ def generate_notifications_csv(**kwargs):
             if kwargs.get("job_id"):
                 values = [
                     notification["template_name"],
-                    notification["template_type"],
                     notification["created_by_name"],
                     notification["job_name"],
                     notification["provider_response"],
@@ -136,7 +133,6 @@ def generate_notifications_csv(**kwargs):
                 values = [
                     notification["recipient"],
                     notification["template_name"],
-                    notification["template_type"],
                     notification["created_by_name"] or "",
                     notification["job_name"] or "",
                     notification["provider_response"],
diff --git a/tests/app/utils/test_csv.py b/tests/app/utils/test_csv.py
index a3dc446d2..6963aedfe 100644
--- a/tests/app/utils/test_csv.py
+++ b/tests/app/utils/test_csv.py
@@ -88,15 +88,15 @@ def get_notifications_csv_mock(
         (
             None,
             [
-                "Recipient,Template,Type,Sent by,Job,Carrier Response,Status,Time\n",
-                "foo@bar.com,foo,sms,,,Did not like it,Delivered,1943-04-19 08:00:00 AM US/Eastern\r\n",
+                "Recipient,Template,Sent by,Batch File,Carrier Response,Status,Time\n",
+                "foo@bar.com,foo,,,Did not like it,Delivered,1943-04-19 08:00:00 AM US/Eastern\r\n",
             ],
         ),
         (
             "Anne Example",
             [
-                "Recipient,Template,Type,Sent by,Job,Carrier Response,Status,Time\n",
-                "foo@bar.com,foo,sms,Anne Example,,Did not like it,Delivered,1943-04-19 08:00:00 AM US/Eastern\r\n",  # noqa
+                "Recipient,Template,Sent by,Batch File,Carrier Response,Status,Time\n",
+                "foo@bar.com,foo,Anne Example,,Did not like it,Delivered,1943-04-19 08:00:00 AM US/Eastern\r\n",  # noqa
             ],
         ),
     ],
@@ -129,9 +129,8 @@ def test_generate_notifications_csv_without_job(
         """,
             [
                 "Template",
-                "Type",
                 "Sent by",
-                "Job",
+                "Batch File",
                 "Carrier Response",
                 "Status",
                 "Time",
@@ -139,7 +138,6 @@ def test_generate_notifications_csv_without_job(
             ],
             [
                 "foo",
-                "sms",
                 "Fake Person",
                 "bar.csv",
                 "Did not like it",
@@ -155,9 +153,8 @@ def test_generate_notifications_csv_without_job(
         """,
             [
                 "Template",
-                "Type",
                 "Sent by",
-                "Job",
+                "Batch File",
                 "Carrier Response",
                 "Status",
                 "Time",
@@ -168,7 +165,6 @@ def test_generate_notifications_csv_without_job(
             ],
             [
                 "foo",
-                "sms",
                 "Fake Person",
                 "bar.csv",
                 "Did not like it",
@@ -187,9 +183,8 @@ def test_generate_notifications_csv_without_job(
         """,
             [
                 "Template",
-                "Type",
                 "Sent by",
-                "Job",
+                "Batch File",
                 "Carrier Response",
                 "Status",
                 "Time",
@@ -200,7 +195,6 @@ def test_generate_notifications_csv_without_job(
             ],
             [
                 "foo",
-                "sms",
                 "Fake Person",
                 "bar.csv",
                 "Did not like it",

From d7606b2986b9820a7e8e6423081d1f2f98dd5350 Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Thu, 15 Feb 2024 10:40:15 -0800
Subject: [PATCH 20/89] added PR requested changes

---
 app/main/views/dashboard.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/main/views/dashboard.py b/app/main/views/dashboard.py
index b6370a4b2..c2a11eccf 100644
--- a/app/main/views/dashboard.py
+++ b/app/main/views/dashboard.py
@@ -54,7 +54,7 @@ def service_dashboard(service_id):
 
     aggregate_notifications_by_job = defaultdict(list)
     for notification in notifications_response:
-        job_id = notification.get("job", {}).get("id")
+        job_id = notification.get("job", {}).get("id", None)
         if job_id:
             aggregate_notifications_by_job[job_id].append(notification)
 

From 4742cc77b5bd94fafd77566dcd35681e5b7761ca Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 21 Feb 2024 07:45:21 -0800
Subject: [PATCH 21/89] change batch file report to look like full csv report

---
 app/main/views/dashboard.py            |  4 +++-
 app/utils/csv.py                       | 16 ++++++++++------
 tests/app/main/views/test_dashboard.py |  2 +-
 tests/app/utils/test_csv.py            | 24 ++++++++++++------------
 4 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/app/main/views/dashboard.py b/app/main/views/dashboard.py
index c2a11eccf..24b3e0490 100644
--- a/app/main/views/dashboard.py
+++ b/app/main/views/dashboard.py
@@ -49,7 +49,9 @@ def service_dashboard(service_id):
         return redirect(url_for("main.choose_template", service_id=service_id))
 
     job_response = job_api_client.get_jobs(service_id)["data"]
-    notifications_response = notification_api_client.get_notifications_for_service(service_id)["notifications"]
+    notifications_response = notification_api_client.get_notifications_for_service(
+        service_id
+    )["notifications"]
     service_data_retention_days = 7
 
     aggregate_notifications_by_job = defaultdict(list)
diff --git a/app/utils/csv.py b/app/utils/csv.py
index ff3c43335..e923b2eb2 100644
--- a/app/utils/csv.py
+++ b/app/utils/csv.py
@@ -79,6 +79,7 @@ def generate_notifications_csv(**kwargs):
         )
         original_column_headers = original_upload.column_headers
         fieldnames = [
+            "Recipient",
             "Template",
             "Sent by",
             "Batch File",
@@ -87,7 +88,8 @@ def generate_notifications_csv(**kwargs):
             "Time",
         ]
         for header in original_column_headers:
-            fieldnames.append(header)
+            if header.lower() != "phone number":
+                fieldnames.append(header)
 
     else:
         # TODO This is deprecated because everything should be a job now, is it ever invoked?
@@ -113,9 +115,9 @@ def generate_notifications_csv(**kwargs):
                 notification["created_at"]
             )
 
-            current_app.logger.info(f"\n\n{notification}")
             if kwargs.get("job_id"):
                 values = [
+                    notification["recipient"],
                     notification["template_name"],
                     notification["created_by_name"],
                     notification["job_name"],
@@ -124,12 +126,14 @@ def generate_notifications_csv(**kwargs):
                     preferred_tz_created_at,
                 ]
                 for header in original_column_headers:
-                    values.append(
-                        original_upload[notification["row_number"] - 1].get(header).data
-                    )
+                    if header.lower() != "phone number":
+                        values.append(
+                            original_upload[notification["row_number"] - 1]
+                            .get(header)
+                            .data
+                        )
 
             else:
-                # TODO This is deprecated, should not be invoked.  See above
                 values = [
                     notification["recipient"],
                     notification["template_name"],
diff --git a/tests/app/main/views/test_dashboard.py b/tests/app/main/views/test_dashboard.py
index 53a8a7feb..37674e797 100644
--- a/tests/app/main/views/test_dashboard.py
+++ b/tests/app/main/views/test_dashboard.py
@@ -122,7 +122,7 @@ MOCK_JOBS_AND_NOTIFICATIONS = [
         "notification_count": MOCK_JOBS["data"][0]["notification_count"],
         "notifications": FAKE_ONE_OFF_NOTIFICATION["notifications"],
         "time_left": "Data available for 7 days",
-        "view_job_link": "/services/21b3ee3d-1cb0-4666-bfa0-9c5ac26d3fe3/jobs/463b5ecb-4e32-43e5-aa90-0234d19fceaa"
+        "view_job_link": "/services/21b3ee3d-1cb0-4666-bfa0-9c5ac26d3fe3/jobs/463b5ecb-4e32-43e5-aa90-0234d19fceaa",
     },
 ]
 
diff --git a/tests/app/utils/test_csv.py b/tests/app/utils/test_csv.py
index 6963aedfe..4a43b81c3 100644
--- a/tests/app/utils/test_csv.py
+++ b/tests/app/utils/test_csv.py
@@ -14,7 +14,7 @@ from tests.conftest import fake_uuid
 
 def _get_notifications_csv(
     row_number=1,
-    recipient="foo@bar.com",
+    recipient="2028675309",
     template_name="foo",
     template_type="sms",
     job_name="bar.csv",
@@ -89,14 +89,14 @@ def get_notifications_csv_mock(
             None,
             [
                 "Recipient,Template,Sent by,Batch File,Carrier Response,Status,Time\n",
-                "foo@bar.com,foo,,,Did not like it,Delivered,1943-04-19 08:00:00 AM US/Eastern\r\n",
+                "2028675309,foo,,,Did not like it,Delivered,1943-04-19 08:00:00 AM US/Eastern\r\n",
             ],
         ),
         (
             "Anne Example",
             [
                 "Recipient,Template,Sent by,Batch File,Carrier Response,Status,Time\n",
-                "foo@bar.com,foo,Anne Example,,Did not like it,Delivered,1943-04-19 08:00:00 AM US/Eastern\r\n",  # noqa
+                "2028675309,foo,Anne Example,,Did not like it,Delivered,1943-04-19 08:00:00 AM US/Eastern\r\n",  # noqa
             ],
         ),
     ],
@@ -124,53 +124,53 @@ def test_generate_notifications_csv_without_job(
     [
         (
             """
-            phone_number
+            phone number
             2028675309
         """,
             [
+                "Recipient",
                 "Template",
                 "Sent by",
                 "Batch File",
                 "Carrier Response",
                 "Status",
                 "Time",
-                "phone_number",
             ],
             [
+                "2028675309",
                 "foo",
                 "Fake Person",
                 "bar.csv",
                 "Did not like it",
                 "Delivered",
                 "1943-04-19 08:00:00 AM US/Eastern",
-                "2028675309",
             ],
         ),
         (
             """
-            phone_number, a, b, c
+            phone number, a, b, c
             2028675309,  🐜,🐝,🦀
         """,
             [
+                "Recipient",
                 "Template",
                 "Sent by",
                 "Batch File",
                 "Carrier Response",
                 "Status",
                 "Time",
-                "phone_number",
                 "a",
                 "b",
                 "c",
             ],
             [
+                "2028675309",
                 "foo",
                 "Fake Person",
                 "bar.csv",
                 "Did not like it",
                 "Delivered",
                 "1943-04-19 08:00:00 AM US/Eastern",
-                "2028675309",
                 "🐜",
                 "🐝",
                 "🦀",
@@ -178,29 +178,29 @@ def test_generate_notifications_csv_without_job(
         ),
         (
             """
-            "phone_number", "a", "b", "c"
+            "phone number", "a", "b", "c"
             "2028675309","🐜,🐜","🐝,🐝","🦀"
         """,
             [
+                "Recipient",
                 "Template",
                 "Sent by",
                 "Batch File",
                 "Carrier Response",
                 "Status",
                 "Time",
-                "phone_number",
                 "a",
                 "b",
                 "c",
             ],
             [
+                "2028675309",
                 "foo",
                 "Fake Person",
                 "bar.csv",
                 "Did not like it",
                 "Delivered",
                 "1943-04-19 08:00:00 AM US/Eastern",
-                "2028675309",
                 "🐜,🐜",
                 "🐝,🐝",
                 "🦀",

From 3363cc6979fc659e2148bea12d5118e34dfd58bc Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 21 Feb 2024 09:09:45 -0800
Subject: [PATCH 22/89] change test phone number

---
 tests/app/utils/test_csv.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/app/utils/test_csv.py b/tests/app/utils/test_csv.py
index 4a43b81c3..78a1da42b 100644
--- a/tests/app/utils/test_csv.py
+++ b/tests/app/utils/test_csv.py
@@ -14,7 +14,7 @@ from tests.conftest import fake_uuid
 
 def _get_notifications_csv(
     row_number=1,
-    recipient="2028675309",
+    recipient="8005555555",
     template_name="foo",
     template_type="sms",
     job_name="bar.csv",
@@ -89,14 +89,14 @@ def get_notifications_csv_mock(
             None,
             [
                 "Recipient,Template,Sent by,Batch File,Carrier Response,Status,Time\n",
-                "2028675309,foo,,,Did not like it,Delivered,1943-04-19 08:00:00 AM US/Eastern\r\n",
+                "8005555555,foo,,,Did not like it,Delivered,1943-04-19 08:00:00 AM US/Eastern\r\n",
             ],
         ),
         (
             "Anne Example",
             [
                 "Recipient,Template,Sent by,Batch File,Carrier Response,Status,Time\n",
-                "2028675309,foo,Anne Example,,Did not like it,Delivered,1943-04-19 08:00:00 AM US/Eastern\r\n",  # noqa
+                "8005555555,foo,Anne Example,,Did not like it,Delivered,1943-04-19 08:00:00 AM US/Eastern\r\n",  # noqa
             ],
         ),
     ],
@@ -125,7 +125,7 @@ def test_generate_notifications_csv_without_job(
         (
             """
             phone number
-            2028675309
+            8005555555
         """,
             [
                 "Recipient",
@@ -137,7 +137,7 @@ def test_generate_notifications_csv_without_job(
                 "Time",
             ],
             [
-                "2028675309",
+                "8005555555",
                 "foo",
                 "Fake Person",
                 "bar.csv",
@@ -149,7 +149,7 @@ def test_generate_notifications_csv_without_job(
         (
             """
             phone number, a, b, c
-            2028675309,  🐜,🐝,🦀
+            8005555555,  🐜,🐝,🦀
         """,
             [
                 "Recipient",
@@ -164,7 +164,7 @@ def test_generate_notifications_csv_without_job(
                 "c",
             ],
             [
-                "2028675309",
+                "8005555555",
                 "foo",
                 "Fake Person",
                 "bar.csv",
@@ -179,7 +179,7 @@ def test_generate_notifications_csv_without_job(
         (
             """
             "phone number", "a", "b", "c"
-            "2028675309","🐜,🐜","🐝,🐝","🦀"
+            "8005555555","🐜,🐜","🐝,🐝","🦀"
         """,
             [
                 "Recipient",
@@ -194,7 +194,7 @@ def test_generate_notifications_csv_without_job(
                 "c",
             ],
             [
-                "2028675309",
+                "8005555555",
                 "foo",
                 "Fake Person",
                 "bar.csv",

From 96d5e7251452e9af586d89ccde5ff9170d4bacdf Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 21 Feb 2024 10:30:24 -0800
Subject: [PATCH 23/89] change Recipient to Phone Number

---
 app/utils/csv.py            |  8 ++++----
 tests/app/utils/test_csv.py | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/utils/csv.py b/app/utils/csv.py
index e923b2eb2..04d5d19ed 100644
--- a/app/utils/csv.py
+++ b/app/utils/csv.py
@@ -71,6 +71,7 @@ def generate_notifications_csv(**kwargs):
     if "page" not in kwargs:
         kwargs["page"] = 1
 
+    # This generates the "batch" csv report
     if kwargs.get("job_id"):
         original_file_contents = s3download(kwargs["service_id"], kwargs["job_id"])
         original_upload = RecipientCSV(
@@ -79,7 +80,7 @@ def generate_notifications_csv(**kwargs):
         )
         original_column_headers = original_upload.column_headers
         fieldnames = [
-            "Recipient",
+            "Phone Number",
             "Template",
             "Sent by",
             "Batch File",
@@ -92,9 +93,9 @@ def generate_notifications_csv(**kwargs):
                 fieldnames.append(header)
 
     else:
-        # TODO This is deprecated because everything should be a job now, is it ever invoked?
+        # This generates the "full" csv report
         fieldnames = [
-            "Recipient",
+            "Phone Number",
             "Template",
             "Sent by",
             "Batch File",
@@ -102,7 +103,6 @@ def generate_notifications_csv(**kwargs):
             "Status",
             "Time",
         ]
-        current_app.logger.warning("Invoking deprecated report format")
 
     yield ",".join(fieldnames) + "\n"
 
diff --git a/tests/app/utils/test_csv.py b/tests/app/utils/test_csv.py
index 78a1da42b..a7e77055b 100644
--- a/tests/app/utils/test_csv.py
+++ b/tests/app/utils/test_csv.py
@@ -88,14 +88,14 @@ def get_notifications_csv_mock(
         (
             None,
             [
-                "Recipient,Template,Sent by,Batch File,Carrier Response,Status,Time\n",
+                "Phone Number,Template,Sent by,Batch File,Carrier Response,Status,Time\n",
                 "8005555555,foo,,,Did not like it,Delivered,1943-04-19 08:00:00 AM US/Eastern\r\n",
             ],
         ),
         (
             "Anne Example",
             [
-                "Recipient,Template,Sent by,Batch File,Carrier Response,Status,Time\n",
+                "Phone Number,Template,Sent by,Batch File,Carrier Response,Status,Time\n",
                 "8005555555,foo,Anne Example,,Did not like it,Delivered,1943-04-19 08:00:00 AM US/Eastern\r\n",  # noqa
             ],
         ),
@@ -128,7 +128,7 @@ def test_generate_notifications_csv_without_job(
             8005555555
         """,
             [
-                "Recipient",
+                "Phone Number",
                 "Template",
                 "Sent by",
                 "Batch File",
@@ -152,7 +152,7 @@ def test_generate_notifications_csv_without_job(
             8005555555,  🐜,🐝,🦀
         """,
             [
-                "Recipient",
+                "Phone Number",
                 "Template",
                 "Sent by",
                 "Batch File",
@@ -182,7 +182,7 @@ def test_generate_notifications_csv_without_job(
             "8005555555","🐜,🐜","🐝,🐝","🦀"
         """,
             [
-                "Recipient",
+                "Phone Number",
                 "Template",
                 "Sent by",
                 "Batch File",

From c20ec8075331981ac285a9520f25ef28de63a800 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 21 Feb 2024 11:46:26 -0800
Subject: [PATCH 24/89] update notifications-utils?

---
 poetry.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/poetry.lock b/poetry.lock
index 86b3d047b..d74786a75 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1729,7 +1729,7 @@ werkzeug = "^3.0.1"
 type = "git"
 url = "https://github.com/GSA/notifications-utils.git"
 reference = "HEAD"
-resolved_reference = "a48171e865eb83cf29c75751be7369f396cbe3e2"
+resolved_reference = "70ee61cd0f87113d2bd838b197dbe38cc09678f3"
 
 [[package]]
 name = "numpy"

From 393dddea61d12b9f21f8e701febc82fd756eeeb9 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 21 Feb 2024 12:49:26 -0800
Subject: [PATCH 25/89] update notifications-utils again

---
 poetry.lock | 72 ++++++++++++++++++++++++++---------------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index d74786a75..2123e9dd4 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -529,43 +529,43 @@ toml = ["tomli"]
 
 [[package]]
 name = "cryptography"
-version = "42.0.2"
+version = "42.0.4"
 description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers."
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "cryptography-42.0.2-cp37-abi3-macosx_10_12_universal2.whl", hash = "sha256:701171f825dcab90969596ce2af253143b93b08f1a716d4b2a9d2db5084ef7be"},
-    {file = "cryptography-42.0.2-cp37-abi3-macosx_10_12_x86_64.whl", hash = "sha256:61321672b3ac7aade25c40449ccedbc6db72c7f5f0fdf34def5e2f8b51ca530d"},
-    {file = "cryptography-42.0.2-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ea2c3ffb662fec8bbbfce5602e2c159ff097a4631d96235fcf0fb00e59e3ece4"},
-    {file = "cryptography-42.0.2-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3b15c678f27d66d247132cbf13df2f75255627bcc9b6a570f7d2fd08e8c081d2"},
-    {file = "cryptography-42.0.2-cp37-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:8e88bb9eafbf6a4014d55fb222e7360eef53e613215085e65a13290577394529"},
-    {file = "cryptography-42.0.2-cp37-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:a047682d324ba56e61b7ea7c7299d51e61fd3bca7dad2ccc39b72bd0118d60a1"},
-    {file = "cryptography-42.0.2-cp37-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:36d4b7c4be6411f58f60d9ce555a73df8406d484ba12a63549c88bd64f7967f1"},
-    {file = "cryptography-42.0.2-cp37-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:a00aee5d1b6c20620161984f8ab2ab69134466c51f58c052c11b076715e72929"},
-    {file = "cryptography-42.0.2-cp37-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:b97fe7d7991c25e6a31e5d5e795986b18fbbb3107b873d5f3ae6dc9a103278e9"},
-    {file = "cryptography-42.0.2-cp37-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:5fa82a26f92871eca593b53359c12ad7949772462f887c35edaf36f87953c0e2"},
-    {file = "cryptography-42.0.2-cp37-abi3-win32.whl", hash = "sha256:4b063d3413f853e056161eb0c7724822a9740ad3caa24b8424d776cebf98e7ee"},
-    {file = "cryptography-42.0.2-cp37-abi3-win_amd64.whl", hash = "sha256:841ec8af7a8491ac76ec5a9522226e287187a3107e12b7d686ad354bb78facee"},
-    {file = "cryptography-42.0.2-cp39-abi3-macosx_10_12_universal2.whl", hash = "sha256:55d1580e2d7e17f45d19d3b12098e352f3a37fe86d380bf45846ef257054b242"},
-    {file = "cryptography-42.0.2-cp39-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:28cb2c41f131a5758d6ba6a0504150d644054fd9f3203a1e8e8d7ac3aea7f73a"},
-    {file = "cryptography-42.0.2-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b9097a208875fc7bbeb1286d0125d90bdfed961f61f214d3f5be62cd4ed8a446"},
-    {file = "cryptography-42.0.2-cp39-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:44c95c0e96b3cb628e8452ec060413a49002a247b2b9938989e23a2c8291fc90"},
-    {file = "cryptography-42.0.2-cp39-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:2f9f14185962e6a04ab32d1abe34eae8a9001569ee4edb64d2304bf0d65c53f3"},
-    {file = "cryptography-42.0.2-cp39-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:09a77e5b2e8ca732a19a90c5bca2d124621a1edb5438c5daa2d2738bfeb02589"},
-    {file = "cryptography-42.0.2-cp39-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:ad28cff53f60d99a928dfcf1e861e0b2ceb2bc1f08a074fdd601b314e1cc9e0a"},
-    {file = "cryptography-42.0.2-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:130c0f77022b2b9c99d8cebcdd834d81705f61c68e91ddd614ce74c657f8b3ea"},
-    {file = "cryptography-42.0.2-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:fa3dec4ba8fb6e662770b74f62f1a0c7d4e37e25b58b2bf2c1be4c95372b4a33"},
-    {file = "cryptography-42.0.2-cp39-abi3-win32.whl", hash = "sha256:3dbd37e14ce795b4af61b89b037d4bc157f2cb23e676fa16932185a04dfbf635"},
-    {file = "cryptography-42.0.2-cp39-abi3-win_amd64.whl", hash = "sha256:8a06641fb07d4e8f6c7dda4fc3f8871d327803ab6542e33831c7ccfdcb4d0ad6"},
-    {file = "cryptography-42.0.2-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:087887e55e0b9c8724cf05361357875adb5c20dec27e5816b653492980d20380"},
-    {file = "cryptography-42.0.2-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:a7ef8dd0bf2e1d0a27042b231a3baac6883cdd5557036f5e8df7139255feaac6"},
-    {file = "cryptography-42.0.2-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:4383b47f45b14459cab66048d384614019965ba6c1a1a141f11b5a551cace1b2"},
-    {file = "cryptography-42.0.2-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:fbeb725c9dc799a574518109336acccaf1303c30d45c075c665c0793c2f79a7f"},
-    {file = "cryptography-42.0.2-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:320948ab49883557a256eab46149df79435a22d2fefd6a66fe6946f1b9d9d008"},
-    {file = "cryptography-42.0.2-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:5ef9bc3d046ce83c4bbf4c25e1e0547b9c441c01d30922d812e887dc5f125c12"},
-    {file = "cryptography-42.0.2-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:52ed9ebf8ac602385126c9a2fe951db36f2cb0c2538d22971487f89d0de4065a"},
-    {file = "cryptography-42.0.2-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:141e2aa5ba100d3788c0ad7919b288f89d1fe015878b9659b307c9ef867d3a65"},
-    {file = "cryptography-42.0.2.tar.gz", hash = "sha256:e0ec52ba3c7f1b7d813cd52649a5b3ef1fc0d433219dc8c93827c57eab6cf888"},
+    {file = "cryptography-42.0.4-cp37-abi3-macosx_10_12_universal2.whl", hash = "sha256:ffc73996c4fca3d2b6c1c8c12bfd3ad00def8621da24f547626bf06441400449"},
+    {file = "cryptography-42.0.4-cp37-abi3-macosx_10_12_x86_64.whl", hash = "sha256:db4b65b02f59035037fde0998974d84244a64c3265bdef32a827ab9b63d61b18"},
+    {file = "cryptography-42.0.4-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:dad9c385ba8ee025bb0d856714f71d7840020fe176ae0229de618f14dae7a6e2"},
+    {file = "cryptography-42.0.4-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:69b22ab6506a3fe483d67d1ed878e1602bdd5912a134e6202c1ec672233241c1"},
+    {file = "cryptography-42.0.4-cp37-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:e09469a2cec88fb7b078e16d4adec594414397e8879a4341c6ace96013463d5b"},
+    {file = "cryptography-42.0.4-cp37-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:3e970a2119507d0b104f0a8e281521ad28fc26f2820687b3436b8c9a5fcf20d1"},
+    {file = "cryptography-42.0.4-cp37-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:e53dc41cda40b248ebc40b83b31516487f7db95ab8ceac1f042626bc43a2f992"},
+    {file = "cryptography-42.0.4-cp37-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:c3a5cbc620e1e17009f30dd34cb0d85c987afd21c41a74352d1719be33380885"},
+    {file = "cryptography-42.0.4-cp37-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:6bfadd884e7280df24d26f2186e4e07556a05d37393b0f220a840b083dc6a824"},
+    {file = "cryptography-42.0.4-cp37-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:01911714117642a3f1792c7f376db572aadadbafcd8d75bb527166009c9f1d1b"},
+    {file = "cryptography-42.0.4-cp37-abi3-win32.whl", hash = "sha256:fb0cef872d8193e487fc6bdb08559c3aa41b659a7d9be48b2e10747f47863925"},
+    {file = "cryptography-42.0.4-cp37-abi3-win_amd64.whl", hash = "sha256:c1f25b252d2c87088abc8bbc4f1ecbf7c919e05508a7e8628e6875c40bc70923"},
+    {file = "cryptography-42.0.4-cp39-abi3-macosx_10_12_universal2.whl", hash = "sha256:15a1fb843c48b4a604663fa30af60818cd28f895572386e5f9b8a665874c26e7"},
+    {file = "cryptography-42.0.4-cp39-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a1327f280c824ff7885bdeef8578f74690e9079267c1c8bd7dc5cc5aa065ae52"},
+    {file = "cryptography-42.0.4-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6ffb03d419edcab93b4b19c22ee80c007fb2d708429cecebf1dd3258956a563a"},
+    {file = "cryptography-42.0.4-cp39-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:1df6fcbf60560d2113b5ed90f072dc0b108d64750d4cbd46a21ec882c7aefce9"},
+    {file = "cryptography-42.0.4-cp39-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:44a64043f743485925d3bcac548d05df0f9bb445c5fcca6681889c7c3ab12764"},
+    {file = "cryptography-42.0.4-cp39-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:3c6048f217533d89f2f8f4f0fe3044bf0b2090453b7b73d0b77db47b80af8dff"},
+    {file = "cryptography-42.0.4-cp39-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:6d0fbe73728c44ca3a241eff9aefe6496ab2656d6e7a4ea2459865f2e8613257"},
+    {file = "cryptography-42.0.4-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:887623fe0d70f48ab3f5e4dbf234986b1329a64c066d719432d0698522749929"},
+    {file = "cryptography-42.0.4-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:ce8613beaffc7c14f091497346ef117c1798c202b01153a8cc7b8e2ebaaf41c0"},
+    {file = "cryptography-42.0.4-cp39-abi3-win32.whl", hash = "sha256:810bcf151caefc03e51a3d61e53335cd5c7316c0a105cc695f0959f2c638b129"},
+    {file = "cryptography-42.0.4-cp39-abi3-win_amd64.whl", hash = "sha256:a0298bdc6e98ca21382afe914c642620370ce0470a01e1bef6dd9b5354c36854"},
+    {file = "cryptography-42.0.4-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:5f8907fcf57392cd917892ae83708761c6ff3c37a8e835d7246ff0ad251d9298"},
+    {file = "cryptography-42.0.4-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:12d341bd42cdb7d4937b0cabbdf2a94f949413ac4504904d0cdbdce4a22cbf88"},
+    {file = "cryptography-42.0.4-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:1cdcdbd117681c88d717437ada72bdd5be9de117f96e3f4d50dab3f59fd9ab20"},
+    {file = "cryptography-42.0.4-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:0e89f7b84f421c56e7ff69f11c441ebda73b8a8e6488d322ef71746224c20fce"},
+    {file = "cryptography-42.0.4-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:f1e85a178384bf19e36779d91ff35c7617c885da487d689b05c1366f9933ad74"},
+    {file = "cryptography-42.0.4-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:d2a27aca5597c8a71abbe10209184e1a8e91c1fd470b5070a2ea60cafec35bcd"},
+    {file = "cryptography-42.0.4-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:4e36685cb634af55e0677d435d425043967ac2f3790ec652b2b88ad03b85c27b"},
+    {file = "cryptography-42.0.4-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:f47be41843200f7faec0683ad751e5ef11b9a56a220d57f300376cd8aba81660"},
+    {file = "cryptography-42.0.4.tar.gz", hash = "sha256:831a4b37accef30cccd34fcb916a5d7b5be3cbbe27268a02832c3e450aea39cb"},
 ]
 
 [package.dependencies]
@@ -1677,7 +1677,7 @@ requests = ">=2.0.0"
 
 [[package]]
 name = "notifications-utils"
-version = "0.2.8"
+version = "0.2.9"
 description = ""
 optional = false
 python-versions = ">=3.9,<3.12"
@@ -1695,7 +1695,7 @@ certifi = "^2023.7.22"
 cffi = "^1.16.0"
 charset-normalizer = "^3.1.0"
 click = "^8.1.3"
-cryptography = "^42.0.0"
+cryptography = "^42.0.4"
 flask = "^2.3.2"
 flask-redis = "^0.4.0"
 geojson = "^3.0.1"
@@ -1729,7 +1729,7 @@ werkzeug = "^3.0.1"
 type = "git"
 url = "https://github.com/GSA/notifications-utils.git"
 reference = "HEAD"
-resolved_reference = "70ee61cd0f87113d2bd838b197dbe38cc09678f3"
+resolved_reference = "df8ece836cad303c5d161edf485cf9bbdc666688"
 
 [[package]]
 name = "numpy"

From 14b68c044fa82ee96f56571fb8bd0e03d7a8cb0b Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Wed, 21 Feb 2024 15:51:05 -0500
Subject: [PATCH 26/89] Update utils to 0.2.9 quote> quote> This changeset
 updates notifications-utils to 0.2.9 to account for a recent cryptography
 update.

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 poetry.lock | 72 ++++++++++++++++++++++++++---------------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 86b3d047b..2123e9dd4 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -529,43 +529,43 @@ toml = ["tomli"]
 
 [[package]]
 name = "cryptography"
-version = "42.0.2"
+version = "42.0.4"
 description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers."
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "cryptography-42.0.2-cp37-abi3-macosx_10_12_universal2.whl", hash = "sha256:701171f825dcab90969596ce2af253143b93b08f1a716d4b2a9d2db5084ef7be"},
-    {file = "cryptography-42.0.2-cp37-abi3-macosx_10_12_x86_64.whl", hash = "sha256:61321672b3ac7aade25c40449ccedbc6db72c7f5f0fdf34def5e2f8b51ca530d"},
-    {file = "cryptography-42.0.2-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ea2c3ffb662fec8bbbfce5602e2c159ff097a4631d96235fcf0fb00e59e3ece4"},
-    {file = "cryptography-42.0.2-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3b15c678f27d66d247132cbf13df2f75255627bcc9b6a570f7d2fd08e8c081d2"},
-    {file = "cryptography-42.0.2-cp37-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:8e88bb9eafbf6a4014d55fb222e7360eef53e613215085e65a13290577394529"},
-    {file = "cryptography-42.0.2-cp37-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:a047682d324ba56e61b7ea7c7299d51e61fd3bca7dad2ccc39b72bd0118d60a1"},
-    {file = "cryptography-42.0.2-cp37-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:36d4b7c4be6411f58f60d9ce555a73df8406d484ba12a63549c88bd64f7967f1"},
-    {file = "cryptography-42.0.2-cp37-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:a00aee5d1b6c20620161984f8ab2ab69134466c51f58c052c11b076715e72929"},
-    {file = "cryptography-42.0.2-cp37-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:b97fe7d7991c25e6a31e5d5e795986b18fbbb3107b873d5f3ae6dc9a103278e9"},
-    {file = "cryptography-42.0.2-cp37-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:5fa82a26f92871eca593b53359c12ad7949772462f887c35edaf36f87953c0e2"},
-    {file = "cryptography-42.0.2-cp37-abi3-win32.whl", hash = "sha256:4b063d3413f853e056161eb0c7724822a9740ad3caa24b8424d776cebf98e7ee"},
-    {file = "cryptography-42.0.2-cp37-abi3-win_amd64.whl", hash = "sha256:841ec8af7a8491ac76ec5a9522226e287187a3107e12b7d686ad354bb78facee"},
-    {file = "cryptography-42.0.2-cp39-abi3-macosx_10_12_universal2.whl", hash = "sha256:55d1580e2d7e17f45d19d3b12098e352f3a37fe86d380bf45846ef257054b242"},
-    {file = "cryptography-42.0.2-cp39-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:28cb2c41f131a5758d6ba6a0504150d644054fd9f3203a1e8e8d7ac3aea7f73a"},
-    {file = "cryptography-42.0.2-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b9097a208875fc7bbeb1286d0125d90bdfed961f61f214d3f5be62cd4ed8a446"},
-    {file = "cryptography-42.0.2-cp39-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:44c95c0e96b3cb628e8452ec060413a49002a247b2b9938989e23a2c8291fc90"},
-    {file = "cryptography-42.0.2-cp39-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:2f9f14185962e6a04ab32d1abe34eae8a9001569ee4edb64d2304bf0d65c53f3"},
-    {file = "cryptography-42.0.2-cp39-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:09a77e5b2e8ca732a19a90c5bca2d124621a1edb5438c5daa2d2738bfeb02589"},
-    {file = "cryptography-42.0.2-cp39-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:ad28cff53f60d99a928dfcf1e861e0b2ceb2bc1f08a074fdd601b314e1cc9e0a"},
-    {file = "cryptography-42.0.2-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:130c0f77022b2b9c99d8cebcdd834d81705f61c68e91ddd614ce74c657f8b3ea"},
-    {file = "cryptography-42.0.2-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:fa3dec4ba8fb6e662770b74f62f1a0c7d4e37e25b58b2bf2c1be4c95372b4a33"},
-    {file = "cryptography-42.0.2-cp39-abi3-win32.whl", hash = "sha256:3dbd37e14ce795b4af61b89b037d4bc157f2cb23e676fa16932185a04dfbf635"},
-    {file = "cryptography-42.0.2-cp39-abi3-win_amd64.whl", hash = "sha256:8a06641fb07d4e8f6c7dda4fc3f8871d327803ab6542e33831c7ccfdcb4d0ad6"},
-    {file = "cryptography-42.0.2-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:087887e55e0b9c8724cf05361357875adb5c20dec27e5816b653492980d20380"},
-    {file = "cryptography-42.0.2-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:a7ef8dd0bf2e1d0a27042b231a3baac6883cdd5557036f5e8df7139255feaac6"},
-    {file = "cryptography-42.0.2-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:4383b47f45b14459cab66048d384614019965ba6c1a1a141f11b5a551cace1b2"},
-    {file = "cryptography-42.0.2-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:fbeb725c9dc799a574518109336acccaf1303c30d45c075c665c0793c2f79a7f"},
-    {file = "cryptography-42.0.2-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:320948ab49883557a256eab46149df79435a22d2fefd6a66fe6946f1b9d9d008"},
-    {file = "cryptography-42.0.2-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:5ef9bc3d046ce83c4bbf4c25e1e0547b9c441c01d30922d812e887dc5f125c12"},
-    {file = "cryptography-42.0.2-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:52ed9ebf8ac602385126c9a2fe951db36f2cb0c2538d22971487f89d0de4065a"},
-    {file = "cryptography-42.0.2-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:141e2aa5ba100d3788c0ad7919b288f89d1fe015878b9659b307c9ef867d3a65"},
-    {file = "cryptography-42.0.2.tar.gz", hash = "sha256:e0ec52ba3c7f1b7d813cd52649a5b3ef1fc0d433219dc8c93827c57eab6cf888"},
+    {file = "cryptography-42.0.4-cp37-abi3-macosx_10_12_universal2.whl", hash = "sha256:ffc73996c4fca3d2b6c1c8c12bfd3ad00def8621da24f547626bf06441400449"},
+    {file = "cryptography-42.0.4-cp37-abi3-macosx_10_12_x86_64.whl", hash = "sha256:db4b65b02f59035037fde0998974d84244a64c3265bdef32a827ab9b63d61b18"},
+    {file = "cryptography-42.0.4-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:dad9c385ba8ee025bb0d856714f71d7840020fe176ae0229de618f14dae7a6e2"},
+    {file = "cryptography-42.0.4-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:69b22ab6506a3fe483d67d1ed878e1602bdd5912a134e6202c1ec672233241c1"},
+    {file = "cryptography-42.0.4-cp37-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:e09469a2cec88fb7b078e16d4adec594414397e8879a4341c6ace96013463d5b"},
+    {file = "cryptography-42.0.4-cp37-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:3e970a2119507d0b104f0a8e281521ad28fc26f2820687b3436b8c9a5fcf20d1"},
+    {file = "cryptography-42.0.4-cp37-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:e53dc41cda40b248ebc40b83b31516487f7db95ab8ceac1f042626bc43a2f992"},
+    {file = "cryptography-42.0.4-cp37-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:c3a5cbc620e1e17009f30dd34cb0d85c987afd21c41a74352d1719be33380885"},
+    {file = "cryptography-42.0.4-cp37-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:6bfadd884e7280df24d26f2186e4e07556a05d37393b0f220a840b083dc6a824"},
+    {file = "cryptography-42.0.4-cp37-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:01911714117642a3f1792c7f376db572aadadbafcd8d75bb527166009c9f1d1b"},
+    {file = "cryptography-42.0.4-cp37-abi3-win32.whl", hash = "sha256:fb0cef872d8193e487fc6bdb08559c3aa41b659a7d9be48b2e10747f47863925"},
+    {file = "cryptography-42.0.4-cp37-abi3-win_amd64.whl", hash = "sha256:c1f25b252d2c87088abc8bbc4f1ecbf7c919e05508a7e8628e6875c40bc70923"},
+    {file = "cryptography-42.0.4-cp39-abi3-macosx_10_12_universal2.whl", hash = "sha256:15a1fb843c48b4a604663fa30af60818cd28f895572386e5f9b8a665874c26e7"},
+    {file = "cryptography-42.0.4-cp39-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a1327f280c824ff7885bdeef8578f74690e9079267c1c8bd7dc5cc5aa065ae52"},
+    {file = "cryptography-42.0.4-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6ffb03d419edcab93b4b19c22ee80c007fb2d708429cecebf1dd3258956a563a"},
+    {file = "cryptography-42.0.4-cp39-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:1df6fcbf60560d2113b5ed90f072dc0b108d64750d4cbd46a21ec882c7aefce9"},
+    {file = "cryptography-42.0.4-cp39-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:44a64043f743485925d3bcac548d05df0f9bb445c5fcca6681889c7c3ab12764"},
+    {file = "cryptography-42.0.4-cp39-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:3c6048f217533d89f2f8f4f0fe3044bf0b2090453b7b73d0b77db47b80af8dff"},
+    {file = "cryptography-42.0.4-cp39-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:6d0fbe73728c44ca3a241eff9aefe6496ab2656d6e7a4ea2459865f2e8613257"},
+    {file = "cryptography-42.0.4-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:887623fe0d70f48ab3f5e4dbf234986b1329a64c066d719432d0698522749929"},
+    {file = "cryptography-42.0.4-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:ce8613beaffc7c14f091497346ef117c1798c202b01153a8cc7b8e2ebaaf41c0"},
+    {file = "cryptography-42.0.4-cp39-abi3-win32.whl", hash = "sha256:810bcf151caefc03e51a3d61e53335cd5c7316c0a105cc695f0959f2c638b129"},
+    {file = "cryptography-42.0.4-cp39-abi3-win_amd64.whl", hash = "sha256:a0298bdc6e98ca21382afe914c642620370ce0470a01e1bef6dd9b5354c36854"},
+    {file = "cryptography-42.0.4-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:5f8907fcf57392cd917892ae83708761c6ff3c37a8e835d7246ff0ad251d9298"},
+    {file = "cryptography-42.0.4-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:12d341bd42cdb7d4937b0cabbdf2a94f949413ac4504904d0cdbdce4a22cbf88"},
+    {file = "cryptography-42.0.4-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:1cdcdbd117681c88d717437ada72bdd5be9de117f96e3f4d50dab3f59fd9ab20"},
+    {file = "cryptography-42.0.4-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:0e89f7b84f421c56e7ff69f11c441ebda73b8a8e6488d322ef71746224c20fce"},
+    {file = "cryptography-42.0.4-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:f1e85a178384bf19e36779d91ff35c7617c885da487d689b05c1366f9933ad74"},
+    {file = "cryptography-42.0.4-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:d2a27aca5597c8a71abbe10209184e1a8e91c1fd470b5070a2ea60cafec35bcd"},
+    {file = "cryptography-42.0.4-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:4e36685cb634af55e0677d435d425043967ac2f3790ec652b2b88ad03b85c27b"},
+    {file = "cryptography-42.0.4-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:f47be41843200f7faec0683ad751e5ef11b9a56a220d57f300376cd8aba81660"},
+    {file = "cryptography-42.0.4.tar.gz", hash = "sha256:831a4b37accef30cccd34fcb916a5d7b5be3cbbe27268a02832c3e450aea39cb"},
 ]
 
 [package.dependencies]
@@ -1677,7 +1677,7 @@ requests = ">=2.0.0"
 
 [[package]]
 name = "notifications-utils"
-version = "0.2.8"
+version = "0.2.9"
 description = ""
 optional = false
 python-versions = ">=3.9,<3.12"
@@ -1695,7 +1695,7 @@ certifi = "^2023.7.22"
 cffi = "^1.16.0"
 charset-normalizer = "^3.1.0"
 click = "^8.1.3"
-cryptography = "^42.0.0"
+cryptography = "^42.0.4"
 flask = "^2.3.2"
 flask-redis = "^0.4.0"
 geojson = "^3.0.1"
@@ -1729,7 +1729,7 @@ werkzeug = "^3.0.1"
 type = "git"
 url = "https://github.com/GSA/notifications-utils.git"
 reference = "HEAD"
-resolved_reference = "a48171e865eb83cf29c75751be7369f396cbe3e2"
+resolved_reference = "df8ece836cad303c5d161edf485cf9bbdc666688"
 
 [[package]]
 name = "numpy"

From 4b39d5ffe927e157de7a09fcd04f8bb17f1efef7 Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Fri, 15 Sep 2023 10:12:01 -0400
Subject: [PATCH 27/89]  Re-enable E2E GitHub action jobs

This changeset re-enables the GitHub action jobs we had to disable to make it possible to deploy recent changes.

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 .github/workflows/checks.yml | 42 ++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 99ef30c3b..880427912 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -44,29 +44,29 @@ jobs:
         run: npm test
       - name: Run py tests with coverage
         run: poetry run coverage run --omit=*/notifications_utils/* -m pytest --maxfail=10 --ignore=tests/end_to_end tests/
-      # - name: Run E2E tests
-      #   run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end
-      #   env:
-      #     NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }}
-      #     NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
-      #     NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
-      #     NOTIFY_E2E_TEST_URI: ${{ secrets.NOTIFY_E2E_TEST_URI }}
+      - name: Run E2E tests
+        run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end
+        env:
+          NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }}
+          NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
+          NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
+          NOTIFY_E2E_TEST_URI: ${{ secrets.NOTIFY_E2E_TEST_URI }}
       - name: Check coverage threshold
         run: poetry run coverage report --fail-under=90
-      # - name: Health check
-      #   run: |
-      #     response=$(curl -url ${{secrets.NOTIFY_E2E_TEST_URI}}_status)
-      #     if grep -q "ok" <<< "$response"; then
-      #       echo "Health check passed"
-      #     else
-      #       echo "Health check failed"
-      #       exit 1
-      #     fi
-      #   env:
-      #     NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }}
-      #     NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
-      #     NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
-      #     NOTIFY_E2E_TEST_URI: ${{ secrets.NOTIFY_E2E_TEST_URI }}
+      - name: Health check
+        run: |
+          response=$(curl -url ${{secrets.NOTIFY_E2E_TEST_URI}}_status)
+          if grep -q "ok" <<< "$response"; then
+            echo "Health check passed"
+          else
+            echo "Health check failed"
+            exit 1
+          fi
+        env:
+          NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }}
+          NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
+          NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
+          NOTIFY_E2E_TEST_URI: ${{ secrets.NOTIFY_E2E_TEST_URI }}
 
   validate-new-relic-config:
     runs-on: ubuntu-latest

From d25f0869e017733e75bd0f3e805e79ca492fcf90 Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Fri, 22 Dec 2023 14:14:06 -0500
Subject: [PATCH 28/89] First attempt at getting the API to run for E2E tests

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 .github/workflows/checks.yml | 71 +++++++++++++++++++++++++++++-------
 1 file changed, 57 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 880427912..a29937511 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -44,6 +44,62 @@ jobs:
         run: npm test
       - name: Run py tests with coverage
         run: poetry run coverage run --omit=*/notifications_utils/* -m pytest --maxfail=10 --ignore=tests/end_to_end tests/
+      - name: Check coverage threshold
+        run: poetry run coverage report --fail-under=90
+
+  end-to-end-tests:
+    permissions:
+      checks: write
+      pull-requests: write
+      contents: write
+    runs-on: ubuntu-latest
+    services:
+      postgres:
+        image: postgres
+        env:
+          POSTGRES_USER: user
+          POSTGRES_PASSWORD: password
+          POSTGRES_DB: test_notification_api
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          # Maps tcp port 5432 on service container to the host
+          - 5432:5432
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/setup-project
+      - uses: jwalton/gh-find-current-pr@v1
+        id: findPr
+      - uses: ArtiomTr/jest-coverage-report-action@v2
+        with:
+          test-script: npm test
+          output: report-markdown
+          annotations: failed-tests
+          prnumber: ${{ steps.findPr.outputs.number }}
+      - name: Clone API
+        uses: actions/checkout@v3
+        with:
+          repository: GSA/notifications-api
+          path: './notifications-api'
+      - name: Install API dependencies
+        with:
+          path: './notifications-api'
+        run: make bootstrap
+        env:
+          SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api
+          NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
+          NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
+      - name: Run API server
+        with:
+          path: './notifications-api'
+        run: make run-procfile &
+        env:
+          SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api
+          NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
+          NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
       - name: Run E2E tests
         run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end
         env:
@@ -51,22 +107,9 @@ jobs:
           NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
           NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
           NOTIFY_E2E_TEST_URI: ${{ secrets.NOTIFY_E2E_TEST_URI }}
+          API_HOST_NAME: http://localhost:6011
       - name: Check coverage threshold
         run: poetry run coverage report --fail-under=90
-      - name: Health check
-        run: |
-          response=$(curl -url ${{secrets.NOTIFY_E2E_TEST_URI}}_status)
-          if grep -q "ok" <<< "$response"; then
-            echo "Health check passed"
-          else
-            echo "Health check failed"
-            exit 1
-          fi
-        env:
-          NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }}
-          NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
-          NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
-          NOTIFY_E2E_TEST_URI: ${{ secrets.NOTIFY_E2E_TEST_URI }}
 
   validate-new-relic-config:
     runs-on: ubuntu-latest

From 89b6e13afb25cf826e068060accd64b272caedcf Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Fri, 22 Dec 2023 14:34:12 -0500
Subject: [PATCH 29/89] Just trying to get the workflow to run

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 .github/workflows/checks.yml | 126 +++++++++++++++++------------------
 1 file changed, 63 insertions(+), 63 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index a29937511..736323589 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -47,69 +47,69 @@ jobs:
       - name: Check coverage threshold
         run: poetry run coverage report --fail-under=90
 
-  end-to-end-tests:
-    permissions:
-      checks: write
-      pull-requests: write
-      contents: write
-    runs-on: ubuntu-latest
-    services:
-      postgres:
-        image: postgres
-        env:
-          POSTGRES_USER: user
-          POSTGRES_PASSWORD: password
-          POSTGRES_DB: test_notification_api
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        ports:
-          # Maps tcp port 5432 on service container to the host
-          - 5432:5432
-    steps:
-      - uses: actions/checkout@v3
-      - uses: ./.github/actions/setup-project
-      - uses: jwalton/gh-find-current-pr@v1
-        id: findPr
-      - uses: ArtiomTr/jest-coverage-report-action@v2
-        with:
-          test-script: npm test
-          output: report-markdown
-          annotations: failed-tests
-          prnumber: ${{ steps.findPr.outputs.number }}
-      - name: Clone API
-        uses: actions/checkout@v3
-        with:
-          repository: GSA/notifications-api
-          path: './notifications-api'
-      - name: Install API dependencies
-        with:
-          path: './notifications-api'
-        run: make bootstrap
-        env:
-          SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api
-          NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
-          NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
-      - name: Run API server
-        with:
-          path: './notifications-api'
-        run: make run-procfile &
-        env:
-          SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api
-          NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
-          NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
-      - name: Run E2E tests
-        run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end
-        env:
-          NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }}
-          NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
-          NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
-          NOTIFY_E2E_TEST_URI: ${{ secrets.NOTIFY_E2E_TEST_URI }}
-          API_HOST_NAME: http://localhost:6011
-      - name: Check coverage threshold
-        run: poetry run coverage report --fail-under=90
+  # end-to-end-tests:
+  #   permissions:
+  #     checks: write
+  #     pull-requests: write
+  #     contents: write
+  #   runs-on: ubuntu-latest
+  #   services:
+  #     postgres:
+  #       image: postgres
+  #       env:
+  #         POSTGRES_USER: user
+  #         POSTGRES_PASSWORD: password
+  #         POSTGRES_DB: test_notification_api
+  #       options: >-
+  #         --health-cmd pg_isready
+  #         --health-interval 10s
+  #         --health-timeout 5s
+  #         --health-retries 5
+  #       ports:
+  #         # Maps tcp port 5432 on service container to the host
+  #         - 5432:5432
+  #   steps:
+  #     - uses: actions/checkout@v3
+  #     - uses: ./.github/actions/setup-project
+  #     - uses: jwalton/gh-find-current-pr@v1
+  #       id: findPr
+  #     - uses: ArtiomTr/jest-coverage-report-action@v2
+  #       with:
+  #         test-script: npm test
+  #         output: report-markdown
+  #         annotations: failed-tests
+  #         prnumber: ${{ steps.findPr.outputs.number }}
+  #     - name: Clone API
+  #       uses: actions/checkout@v3
+  #       with:
+  #         repository: GSA/notifications-api
+  #         path: './notifications-api'
+  #     - name: Install API dependencies
+  #       with:
+  #         path: './notifications-api'
+  #       run: make bootstrap
+  #       env:
+  #         SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api
+  #         NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
+  #         NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
+  #     - name: Run API server
+  #       with:
+  #         path: './notifications-api'
+  #       run: make run-procfile &
+  #       env:
+  #         SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api
+  #         NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
+  #         NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
+  #     - name: Run E2E tests
+  #       run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end
+  #       env:
+  #         NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }}
+  #         NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
+  #         NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
+  #         NOTIFY_E2E_TEST_URI: ${{ secrets.NOTIFY_E2E_TEST_URI }}
+  #         API_HOST_NAME: http://localhost:6011
+  #     - name: Check coverage threshold
+  #       run: poetry run coverage report --fail-under=90
 
   validate-new-relic-config:
     runs-on: ubuntu-latest

From 891cec530035f135920aea0a1c8d23e7a2b5feb1 Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Fri, 22 Dec 2023 14:42:55 -0500
Subject: [PATCH 30/89] Uncommenting E2E test job

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 .github/workflows/checks.yml | 126 +++++++++++++++++------------------
 1 file changed, 63 insertions(+), 63 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 736323589..a29937511 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -47,69 +47,69 @@ jobs:
       - name: Check coverage threshold
         run: poetry run coverage report --fail-under=90
 
-  # end-to-end-tests:
-  #   permissions:
-  #     checks: write
-  #     pull-requests: write
-  #     contents: write
-  #   runs-on: ubuntu-latest
-  #   services:
-  #     postgres:
-  #       image: postgres
-  #       env:
-  #         POSTGRES_USER: user
-  #         POSTGRES_PASSWORD: password
-  #         POSTGRES_DB: test_notification_api
-  #       options: >-
-  #         --health-cmd pg_isready
-  #         --health-interval 10s
-  #         --health-timeout 5s
-  #         --health-retries 5
-  #       ports:
-  #         # Maps tcp port 5432 on service container to the host
-  #         - 5432:5432
-  #   steps:
-  #     - uses: actions/checkout@v3
-  #     - uses: ./.github/actions/setup-project
-  #     - uses: jwalton/gh-find-current-pr@v1
-  #       id: findPr
-  #     - uses: ArtiomTr/jest-coverage-report-action@v2
-  #       with:
-  #         test-script: npm test
-  #         output: report-markdown
-  #         annotations: failed-tests
-  #         prnumber: ${{ steps.findPr.outputs.number }}
-  #     - name: Clone API
-  #       uses: actions/checkout@v3
-  #       with:
-  #         repository: GSA/notifications-api
-  #         path: './notifications-api'
-  #     - name: Install API dependencies
-  #       with:
-  #         path: './notifications-api'
-  #       run: make bootstrap
-  #       env:
-  #         SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api
-  #         NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
-  #         NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
-  #     - name: Run API server
-  #       with:
-  #         path: './notifications-api'
-  #       run: make run-procfile &
-  #       env:
-  #         SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api
-  #         NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
-  #         NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
-  #     - name: Run E2E tests
-  #       run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end
-  #       env:
-  #         NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }}
-  #         NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
-  #         NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
-  #         NOTIFY_E2E_TEST_URI: ${{ secrets.NOTIFY_E2E_TEST_URI }}
-  #         API_HOST_NAME: http://localhost:6011
-  #     - name: Check coverage threshold
-  #       run: poetry run coverage report --fail-under=90
+  end-to-end-tests:
+    permissions:
+      checks: write
+      pull-requests: write
+      contents: write
+    runs-on: ubuntu-latest
+    services:
+      postgres:
+        image: postgres
+        env:
+          POSTGRES_USER: user
+          POSTGRES_PASSWORD: password
+          POSTGRES_DB: test_notification_api
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          # Maps tcp port 5432 on service container to the host
+          - 5432:5432
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/setup-project
+      - uses: jwalton/gh-find-current-pr@v1
+        id: findPr
+      - uses: ArtiomTr/jest-coverage-report-action@v2
+        with:
+          test-script: npm test
+          output: report-markdown
+          annotations: failed-tests
+          prnumber: ${{ steps.findPr.outputs.number }}
+      - name: Clone API
+        uses: actions/checkout@v3
+        with:
+          repository: GSA/notifications-api
+          path: './notifications-api'
+      - name: Install API dependencies
+        with:
+          path: './notifications-api'
+        run: make bootstrap
+        env:
+          SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api
+          NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
+          NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
+      - name: Run API server
+        with:
+          path: './notifications-api'
+        run: make run-procfile &
+        env:
+          SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api
+          NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
+          NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
+      - name: Run E2E tests
+        run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end
+        env:
+          NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }}
+          NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
+          NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
+          NOTIFY_E2E_TEST_URI: ${{ secrets.NOTIFY_E2E_TEST_URI }}
+          API_HOST_NAME: http://localhost:6011
+      - name: Check coverage threshold
+        run: poetry run coverage report --fail-under=90
 
   validate-new-relic-config:
     runs-on: ubuntu-latest

From 5a39165644795358bcd16a8798122d9fd79e342a Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Fri, 22 Dec 2023 14:45:19 -0500
Subject: [PATCH 31/89] Just trying to get the new job to run

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 .github/workflows/checks.yml | 50 ++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index a29937511..a57d3615c 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -73,33 +73,27 @@ jobs:
       - uses: ./.github/actions/setup-project
       - uses: jwalton/gh-find-current-pr@v1
         id: findPr
-      - uses: ArtiomTr/jest-coverage-report-action@v2
-        with:
-          test-script: npm test
-          output: report-markdown
-          annotations: failed-tests
-          prnumber: ${{ steps.findPr.outputs.number }}
-      - name: Clone API
-        uses: actions/checkout@v3
-        with:
-          repository: GSA/notifications-api
-          path: './notifications-api'
-      - name: Install API dependencies
-        with:
-          path: './notifications-api'
-        run: make bootstrap
-        env:
-          SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api
-          NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
-          NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
-      - name: Run API server
-        with:
-          path: './notifications-api'
-        run: make run-procfile &
-        env:
-          SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api
-          NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
-          NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
+      # - name: Clone API
+      #   uses: actions/checkout@v3
+      #   with:
+      #     repository: GSA/notifications-api
+      #     path: './notifications-api'
+      # - name: Install API dependencies
+      #   with:
+      #     path: './notifications-api'
+      #   run: make bootstrap
+      #   env:
+      #     SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api
+      #     NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
+      #     NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
+      # - name: Run API server
+      #   with:
+      #     path: './notifications-api'
+      #   run: make run-procfile &
+      #   env:
+      #     SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api
+      #     NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
+      #     NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
       - name: Run E2E tests
         run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end
         env:
@@ -107,7 +101,7 @@ jobs:
           NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
           NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
           NOTIFY_E2E_TEST_URI: ${{ secrets.NOTIFY_E2E_TEST_URI }}
-          API_HOST_NAME: http://localhost:6011
+          # API_HOST_NAME: http://localhost:6011
       - name: Check coverage threshold
         run: poetry run coverage report --fail-under=90
 

From 3003f822235f9e7496d54dded9a6e4c3360c3314 Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Fri, 22 Dec 2023 14:56:38 -0500
Subject: [PATCH 32/89] Attempting to get the API cloned at least

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 .github/workflows/checks.yml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index a57d3615c..f638f5e65 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -73,11 +73,11 @@ jobs:
       - uses: ./.github/actions/setup-project
       - uses: jwalton/gh-find-current-pr@v1
         id: findPr
-      # - name: Clone API
-      #   uses: actions/checkout@v3
-      #   with:
-      #     repository: GSA/notifications-api
-      #     path: './notifications-api'
+      - name: Clone API
+        uses: actions/checkout@v3
+        with:
+         repository: GSA/notifications-api
+         path: './notifications-api'
       # - name: Install API dependencies
       #   with:
       #     path: './notifications-api'
@@ -102,8 +102,6 @@ jobs:
           NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
           NOTIFY_E2E_TEST_URI: ${{ secrets.NOTIFY_E2E_TEST_URI }}
           # API_HOST_NAME: http://localhost:6011
-      - name: Check coverage threshold
-        run: poetry run coverage report --fail-under=90
 
   validate-new-relic-config:
     runs-on: ubuntu-latest

From f8c48f77119be8083524dd81cd8d4cebf77d85ed Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Fri, 22 Dec 2023 15:11:02 -0500
Subject: [PATCH 33/89] Now trying to install API dependencies...

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 .github/workflows/checks.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index f638f5e65..dde423fd9 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -78,14 +78,14 @@ jobs:
         with:
          repository: GSA/notifications-api
          path: './notifications-api'
-      # - name: Install API dependencies
-      #   with:
-      #     path: './notifications-api'
-      #   run: make bootstrap
-      #   env:
-      #     SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api
-      #     NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
-      #     NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
+      - name: Install API dependencies
+        with:
+          path: './notifications-api'
+        run: make bootstrap
+        env:
+          SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api
+          NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
+          NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
       # - name: Run API server
       #   with:
       #     path: './notifications-api'

From bb242dc7d71cb124fb1022ce896f6f7f70b7b374 Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Fri, 22 Dec 2023 15:29:03 -0500
Subject: [PATCH 34/89] Adjusted API clone and working directory

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 .github/workflows/checks.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index dde423fd9..5cfc170d5 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -77,10 +77,9 @@ jobs:
         uses: actions/checkout@v3
         with:
          repository: GSA/notifications-api
-         path: './notifications-api'
+         path: 'notifications-api'
       - name: Install API dependencies
-        with:
-          path: './notifications-api'
+        working-directory: 'notifications-api'
         run: make bootstrap
         env:
           SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api

From b8b330f55be27eac1adb03cd3d82af5c429cb84c Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Fri, 22 Dec 2023 15:52:55 -0500
Subject: [PATCH 35/89] Attempting to get API up and running

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 .github/workflows/checks.yml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 5cfc170d5..61b2c0696 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -13,6 +13,9 @@ env:
   WERKZEUG_DEBUG_PIN: off
   REDIS_ENABLED: 0
   NODE_VERSION: 16.15.1
+  AWS_US_TOLL_FREE_NUMBER: "+18556438890"
+  ADMIN_BASE_URL: http://localhost:6012
+  API_HOST_NAME: http://localhost:6011
 
 jobs:
   build:
@@ -85,14 +88,13 @@ jobs:
           SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api
           NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
           NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
-      # - name: Run API server
-      #   with:
-      #     path: './notifications-api'
-      #   run: make run-procfile &
-      #   env:
-      #     SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api
-      #     NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
-      #     NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
+      - name: Run API server
+        working-directory: 'notifications-api'
+        run: make run-flask &
+        env:
+          SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api
+          NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
+          NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
       - name: Run E2E tests
         run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end
         env:
@@ -100,7 +102,6 @@ jobs:
           NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
           NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
           NOTIFY_E2E_TEST_URI: ${{ secrets.NOTIFY_E2E_TEST_URI }}
-          # API_HOST_NAME: http://localhost:6011
 
   validate-new-relic-config:
     runs-on: ubuntu-latest

From d544d7c8f854409dbd03b3840321affb0216818a Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Fri, 22 Dec 2023 16:00:37 -0500
Subject: [PATCH 36/89] Now trying to run the Admin server with PR code...

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 .github/workflows/checks.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 61b2c0696..f547d367b 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -95,13 +95,16 @@ jobs:
           SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api
           NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
           NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
+      - name: Run Admin server
+        run: make run-flask &
       - name: Run E2E tests
         run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end
         env:
           NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }}
           NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
           NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
-          NOTIFY_E2E_TEST_URI: ${{ secrets.NOTIFY_E2E_TEST_URI }}
+          # Run the E2E tests against the code found in this PR.
+          NOTIFY_E2E_TEST_URI: http://localhost:6012
 
   validate-new-relic-config:
     runs-on: ubuntu-latest

From 5e7319cbac434e53b54a3df155bee2310ad7be0a Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Fri, 22 Dec 2023 16:17:01 -0500
Subject: [PATCH 37/89] Testing to see if we can connect to the local server.

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 .github/workflows/checks.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index f547d367b..dd0b6baaa 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -98,7 +98,10 @@ jobs:
       - name: Run Admin server
         run: make run-flask &
       - name: Run E2E tests
-        run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end
+        # run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end
+        run: |
+          curl --request GET --url "http://localhost:6012"
+          curl --request GET --url "http://127.0.0.1:6012"
         env:
           NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }}
           NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}

From 92b33834e86b715775583585c5bade2dc8840a8c Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Fri, 22 Dec 2023 16:38:26 -0500
Subject: [PATCH 38/89] Trying to discern if there is a difference in local
 URLs

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 .github/workflows/checks.yml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index dd0b6baaa..0e8876e17 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -97,10 +97,19 @@ jobs:
           NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
       - name: Run Admin server
         run: make run-flask &
-      - name: Run E2E tests
+      - name: Run E2E tests 1
         # run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end
-        run: |
+        run:
           curl --request GET --url "http://localhost:6012"
+        env:
+          NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }}
+          NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
+          NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
+          # Run the E2E tests against the code found in this PR.
+          NOTIFY_E2E_TEST_URI: http://localhost:6012
+      - name: Run E2E tests 2
+        # run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end
+        run:
           curl --request GET --url "http://127.0.0.1:6012"
         env:
           NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }}

From b60dc00f0e435ced7db44d10389e6ee34cb1b51a Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Fri, 22 Dec 2023 16:42:53 -0500
Subject: [PATCH 39/89] A bit of cleanup and debugging comment to resume after
 holidays!

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 .github/workflows/checks.yml | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 0e8876e17..c7e7cb9e5 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -97,20 +97,10 @@ jobs:
           NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
       - name: Run Admin server
         run: make run-flask &
-      - name: Run E2E tests 1
+      - name: Run E2E tests
         # run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end
-        run:
-          curl --request GET --url "http://localhost:6012"
-        env:
-          NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }}
-          NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
-          NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
-          # Run the E2E tests against the code found in this PR.
-          NOTIFY_E2E_TEST_URI: http://localhost:6012
-      - name: Run E2E tests 2
-        # run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end
-        run:
-          curl --request GET --url "http://127.0.0.1:6012"
+        # Debugging for now to troubleshoot a connectivity issue to the local servers
+        run: curl --request GET --url "http://localhost:6012"
         env:
           NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }}
           NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}

From 9c32fa2d4e7d085ff330409cd32094e23d9ddefa Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Thu, 4 Jan 2024 11:47:20 -0500
Subject: [PATCH 40/89] Adding in missing DATABASE_URL environment variable

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 .github/workflows/checks.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index c7e7cb9e5..ab1ee085e 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -85,6 +85,7 @@ jobs:
         working-directory: 'notifications-api'
         run: make bootstrap
         env:
+          DATABASE_URL: postgresql://user:password@localhost:5432/test_notification_api
           SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api
           NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
           NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
@@ -92,6 +93,7 @@ jobs:
         working-directory: 'notifications-api'
         run: make run-flask &
         env:
+          DATABASE_URL: postgresql://user:password@localhost:5432/test_notification_api
           SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api
           NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
           NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}

From 91527f32f29ced3de2a7e4fc6c5fedb25df76285 Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Thu, 4 Jan 2024 11:54:46 -0500
Subject: [PATCH 41/89] Changing DB name to match Makefile bootstrap command

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 .github/workflows/checks.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index ab1ee085e..943e11efc 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -62,7 +62,7 @@ jobs:
         env:
           POSTGRES_USER: user
           POSTGRES_PASSWORD: password
-          POSTGRES_DB: test_notification_api
+          POSTGRES_DB: notification_api
         options: >-
           --health-cmd pg_isready
           --health-interval 10s
@@ -85,16 +85,16 @@ jobs:
         working-directory: 'notifications-api'
         run: make bootstrap
         env:
-          DATABASE_URL: postgresql://user:password@localhost:5432/test_notification_api
-          SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api
+          DATABASE_URL: postgresql://user:password@localhost:5432/notification_api
+          SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/notification_api
           NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
           NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
       - name: Run API server
         working-directory: 'notifications-api'
         run: make run-flask &
         env:
-          DATABASE_URL: postgresql://user:password@localhost:5432/test_notification_api
-          SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api
+          DATABASE_URL: postgresql://user:password@localhost:5432/notification_api
+          SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/notification_api
           NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
           NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
       - name: Run Admin server

From 6b98cf7c35f115df636f697aced454d240211869 Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Thu, 4 Jan 2024 12:01:20 -0500
Subject: [PATCH 42/89] Reverting previous change of the DB name

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 .github/workflows/checks.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 943e11efc..ab1ee085e 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -62,7 +62,7 @@ jobs:
         env:
           POSTGRES_USER: user
           POSTGRES_PASSWORD: password
-          POSTGRES_DB: notification_api
+          POSTGRES_DB: test_notification_api
         options: >-
           --health-cmd pg_isready
           --health-interval 10s
@@ -85,16 +85,16 @@ jobs:
         working-directory: 'notifications-api'
         run: make bootstrap
         env:
-          DATABASE_URL: postgresql://user:password@localhost:5432/notification_api
-          SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/notification_api
+          DATABASE_URL: postgresql://user:password@localhost:5432/test_notification_api
+          SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api
           NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
           NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
       - name: Run API server
         working-directory: 'notifications-api'
         run: make run-flask &
         env:
-          DATABASE_URL: postgresql://user:password@localhost:5432/notification_api
-          SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/notification_api
+          DATABASE_URL: postgresql://user:password@localhost:5432/test_notification_api
+          SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api
           NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
           NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
       - name: Run Admin server

From 57cd123f4e5ef3793422350ecb08651745e4a08b Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Thu, 4 Jan 2024 12:37:34 -0500
Subject: [PATCH 43/89] Adding Redis for running the API

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 .github/workflows/checks.yml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index ab1ee085e..8d981cb27 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -71,6 +71,16 @@ jobs:
         ports:
           # Maps tcp port 5432 on service container to the host
           - 5432:5432
+      redis:
+        image: redis
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          # Maps tcp port 6379 on service container to the host
+          - 6379:6379
     steps:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/setup-project
@@ -87,14 +97,16 @@ jobs:
         env:
           DATABASE_URL: postgresql://user:password@localhost:5432/test_notification_api
           SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api
+          REDIS_URL: redis://localhost:6379
           NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
           NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
       - name: Run API server
         working-directory: 'notifications-api'
-        run: make run-flask &
+        run: make run-procfile &
         env:
           DATABASE_URL: postgresql://user:password@localhost:5432/test_notification_api
           SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api
+          REDIS_URL: redis://localhost:6379
           NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
           NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
       - name: Run Admin server

From 3ba9a858457e4ed4f4ea9ac4036b4457da00407e Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Thu, 4 Jan 2024 13:17:49 -0500
Subject: [PATCH 44/89] Adjusting API environment to development

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 .github/workflows/checks.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 8d981cb27..e6c123a2f 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -100,6 +100,7 @@ jobs:
           REDIS_URL: redis://localhost:6379
           NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
           NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
+          NOTIFY_ENVIRONMENT: development
       - name: Run API server
         working-directory: 'notifications-api'
         run: make run-procfile &
@@ -109,6 +110,7 @@ jobs:
           REDIS_URL: redis://localhost:6379
           NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
           NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
+          NOTIFY_ENVIRONMENT: development
       - name: Run Admin server
         run: make run-flask &
       - name: Run E2E tests

From 558296684c84dc79f980fcfa09eacaeb96f971c5 Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Thu, 4 Jan 2024 15:43:26 -0500
Subject: [PATCH 45/89] Attempting to run actual E2E tests again to see real
 errors

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 .github/workflows/checks.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index e6c123a2f..1ec912f6a 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -114,9 +114,9 @@ jobs:
       - name: Run Admin server
         run: make run-flask &
       - name: Run E2E tests
-        # run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end
+        run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end
         # Debugging for now to troubleshoot a connectivity issue to the local servers
-        run: curl --request GET --url "http://localhost:6012"
+        # run: curl --request GET --url "http://localhost:6012"
         env:
           NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }}
           NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}

From b9a7e48e780a2b43ed83423a5c6a0f12a8aecf0d Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Thu, 4 Jan 2024 16:29:10 -0500
Subject: [PATCH 46/89] Attempting to work against staging API

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 .github/workflows/checks.yml | 107 ++++++++++++++++++-----------------
 1 file changed, 54 insertions(+), 53 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 1ec912f6a..30b492a7a 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -15,7 +15,8 @@ env:
   NODE_VERSION: 16.15.1
   AWS_US_TOLL_FREE_NUMBER: "+18556438890"
   ADMIN_BASE_URL: http://localhost:6012
-  API_HOST_NAME: http://localhost:6011
+  #API_HOST_NAME: http://localhost:6011
+  API_HOST_NAME: https://notify-api-staging.app.cloud.gov
 
 jobs:
   build:
@@ -56,67 +57,67 @@ jobs:
       pull-requests: write
       contents: write
     runs-on: ubuntu-latest
-    services:
-      postgres:
-        image: postgres
-        env:
-          POSTGRES_USER: user
-          POSTGRES_PASSWORD: password
-          POSTGRES_DB: test_notification_api
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        ports:
-          # Maps tcp port 5432 on service container to the host
-          - 5432:5432
-      redis:
-        image: redis
-        options: >-
-          --health-cmd "redis-cli ping"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        ports:
-          # Maps tcp port 6379 on service container to the host
-          - 6379:6379
+    # services:
+    #   postgres:
+    #     image: postgres
+    #     env:
+    #       POSTGRES_USER: user
+    #       POSTGRES_PASSWORD: password
+    #       POSTGRES_DB: test_notification_api
+    #     options: >-
+    #       --health-cmd pg_isready
+    #       --health-interval 10s
+    #       --health-timeout 5s
+    #       --health-retries 5
+    #     ports:
+    #       # Maps tcp port 5432 on service container to the host
+    #       - 5432:5432
+    #   redis:
+    #     image: redis
+    #     options: >-
+    #       --health-cmd "redis-cli ping"
+    #       --health-interval 10s
+    #       --health-timeout 5s
+    #       --health-retries 5
+    #     ports:
+    #       # Maps tcp port 6379 on service container to the host
+    #       - 6379:6379
     steps:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/setup-project
       - uses: jwalton/gh-find-current-pr@v1
         id: findPr
-      - name: Clone API
-        uses: actions/checkout@v3
-        with:
-         repository: GSA/notifications-api
-         path: 'notifications-api'
-      - name: Install API dependencies
-        working-directory: 'notifications-api'
-        run: make bootstrap
-        env:
-          DATABASE_URL: postgresql://user:password@localhost:5432/test_notification_api
-          SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api
-          REDIS_URL: redis://localhost:6379
-          NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
-          NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
-          NOTIFY_ENVIRONMENT: development
-      - name: Run API server
-        working-directory: 'notifications-api'
-        run: make run-procfile &
-        env:
-          DATABASE_URL: postgresql://user:password@localhost:5432/test_notification_api
-          SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api
-          REDIS_URL: redis://localhost:6379
-          NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
-          NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
-          NOTIFY_ENVIRONMENT: development
+      # - name: Clone API
+      #   uses: actions/checkout@v3
+      #   with:
+      #    repository: GSA/notifications-api
+      #    path: 'notifications-api'
+      # - name: Install API dependencies
+      #   working-directory: 'notifications-api'
+      #   run: make bootstrap
+      #   env:
+      #     DATABASE_URL: postgresql://user:password@localhost:5432/test_notification_api
+      #     SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api
+      #     REDIS_URL: redis://localhost:6379
+      #     NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
+      #     NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
+      #     NOTIFY_ENVIRONMENT: development
+      # - name: Run API server
+      #   working-directory: 'notifications-api'
+      #   run: make run-procfile &
+      #   env:
+      #     DATABASE_URL: postgresql://user:password@localhost:5432/test_notification_api
+      #     SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api
+      #     REDIS_URL: redis://localhost:6379
+      #     NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
+      #     NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
+      #     NOTIFY_ENVIRONMENT: development
       - name: Run Admin server
         run: make run-flask &
       - name: Run E2E tests
-        run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end
+        # run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end
         # Debugging for now to troubleshoot a connectivity issue to the local servers
-        # run: curl --request GET --url "http://localhost:6012"
+        run: curl --request GET --url "http://localhost:6012"
         env:
           NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }}
           NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}

From 84559e05741ff0ac88ebddfe413f535a85c41ad5 Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Thu, 4 Jan 2024 16:34:46 -0500
Subject: [PATCH 47/89] Switch Admin site environment to development

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 .github/workflows/checks.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 30b492a7a..4a5be3670 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -114,6 +114,8 @@ jobs:
       #     NOTIFY_ENVIRONMENT: development
       - name: Run Admin server
         run: make run-flask &
+        env:
+          NOTIFY_ENVIRONMENT: development
       - name: Run E2E tests
         # run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end
         # Debugging for now to troubleshoot a connectivity issue to the local servers

From 2201c16a2b89b3c3cf7739972b3d82dda2682756 Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Thu, 4 Jan 2024 16:39:12 -0500
Subject: [PATCH 48/89] Now try to run the E2E tests!

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 .github/workflows/checks.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 4a5be3670..9dfd779d4 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -117,9 +117,9 @@ jobs:
         env:
           NOTIFY_ENVIRONMENT: development
       - name: Run E2E tests
-        # run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end
+        run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end
         # Debugging for now to troubleshoot a connectivity issue to the local servers
-        run: curl --request GET --url "http://localhost:6012"
+        # run: curl --request GET --url "http://localhost:6012"
         env:
           NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }}
           NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}

From 46be3cd7b3b6e8bbc18281adc5ffcff0a59898e8 Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Thu, 4 Jan 2024 16:44:49 -0500
Subject: [PATCH 49/89] Add a missing slash in the test URI

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 .github/workflows/checks.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 9dfd779d4..fd9372e17 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -125,7 +125,7 @@ jobs:
           NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
           NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
           # Run the E2E tests against the code found in this PR.
-          NOTIFY_E2E_TEST_URI: http://localhost:6012
+          NOTIFY_E2E_TEST_URI: http://localhost:6012/
 
   validate-new-relic-config:
     runs-on: ubuntu-latest

From c652c176177cf1eccb0e38fd6303c61b6bb722b4 Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Thu, 4 Jan 2024 17:30:47 -0500
Subject: [PATCH 50/89] Clean up and fix the E2E tests so that they run

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 .github/workflows/checks.yml                  |  2 +-
 tests/conftest.py                             | 14 ++++++-----
 tests/end_to_end/test_accounts_page.py        | 23 +++++--------------
 .../test_landing_and_sign_in_pages.py         |  9 +++++---
 4 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index fd9372e17..9dfd779d4 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -125,7 +125,7 @@ jobs:
           NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
           NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
           # Run the E2E tests against the code found in this PR.
-          NOTIFY_E2E_TEST_URI: http://localhost:6012/
+          NOTIFY_E2E_TEST_URI: http://localhost:6012
 
   validate-new-relic-config:
     runs-on: ubuntu-latest
diff --git a/tests/conftest.py b/tests/conftest.py
index 122b76826..48ea3c5fa 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -36,6 +36,8 @@ from . import (
 
 load_dotenv()
 
+E2E_TEST_URI = os.getenv("NOTIFY_E2E_TEST_URI")
+
 
 class ElementNotFound(Exception):
     pass
@@ -529,7 +531,7 @@ def mock_update_service(mocker):
                     "sms_sender",
                     "permissions",
                 ]
-            }
+            },
         )
         return {"data": service}
 
@@ -2353,7 +2355,7 @@ def client_request(logged_in_client, mocker, service_one):  # noqa (C901 too com
             _test_page_title=True,
             _test_for_elements_without_class=True,
             _optional_args="",
-            **endpoint_kwargs
+            **endpoint_kwargs,
         ):
             return ClientRequest.get_url(
                 url_for(endpoint, **(endpoint_kwargs or {})) + _optional_args,
@@ -2372,7 +2374,7 @@ def client_request(logged_in_client, mocker, service_one):  # noqa (C901 too com
             _expected_redirect=None,
             _test_page_title=True,
             _test_for_elements_without_class=True,
-            **endpoint_kwargs
+            **endpoint_kwargs,
         ):
             resp = logged_in_client.get(
                 url,
@@ -2414,7 +2416,7 @@ def client_request(logged_in_client, mocker, service_one):  # noqa (C901 too com
             _follow_redirects=False,
             _expected_redirect=None,
             _content_type=None,
-            **endpoint_kwargs
+            **endpoint_kwargs,
         ):
             return ClientRequest.post_url(
                 url_for(endpoint, **(endpoint_kwargs or {})),
@@ -2473,7 +2475,7 @@ def client_request(logged_in_client, mocker, service_one):  # noqa (C901 too com
             _expected_status=302,
             _optional_args="",
             _content_type=None,
-            **endpoint_kwargs
+            **endpoint_kwargs,
         ):
             return ClientRequest.post_response_from_url(
                 url_for(endpoint, **(endpoint_kwargs or {})) + _optional_args,
@@ -3523,7 +3525,7 @@ def login_for_end_to_end_testing(browser):
     # Open a new page and go to the staging site.
     context = browser.new_context()
     page = context.new_page()
-    page.goto(os.getenv("NOTIFY_E2E_TEST_URI"))
+    page.goto(f"{E2E_TEST_URI}/")
 
     sign_in_button = page.get_by_role("link", name="Sign in")
 
diff --git a/tests/end_to_end/test_accounts_page.py b/tests/end_to_end/test_accounts_page.py
index c8c8d5a6a..070e5d08d 100644
--- a/tests/end_to_end/test_accounts_page.py
+++ b/tests/end_to_end/test_accounts_page.py
@@ -4,12 +4,14 @@ import re
 
 from playwright.sync_api import expect
 
+E2E_TEST_URI = os.getenv("NOTIFY_E2E_TEST_URI")
+
 
 def _bypass_sign_in(end_to_end_context):
     # Open a new page and go to the staging site.
     page = end_to_end_context.new_page()
 
-    page.goto(os.getenv("NOTIFY_E2E_TEST_URI"))
+    page.goto(f"{E2E_TEST_URI}/")
 
     sign_in_button = page.get_by_role("link", name="Sign in")
 
@@ -24,7 +26,7 @@ def _bypass_sign_in(end_to_end_context):
 def test_add_new_service_workflow(end_to_end_context):
     # page = end_to_end_context.new_page()
     page = _bypass_sign_in(end_to_end_context)
-    page.goto(os.getenv("NOTIFY_E2E_TEST_URI"))
+    page.goto(f"{E2E_TEST_URI}/")
 
     # sign_in_button = page.get_by_role("link", name="Sign in")
     #
@@ -41,9 +43,7 @@ def test_add_new_service_workflow(end_to_end_context):
         browser_type=end_to_end_context.browser.browser_type.name,
     )
 
-    accounts_uri = "{}accounts".format(os.getenv("NOTIFY_E2E_TEST_URI"))
-
-    page.goto(accounts_uri)
+    page.goto(f"{E2E_TEST_URI}/accounts")
 
     # Check to make sure that we've arrived at the next page.
     page.wait_for_load_state("domcontentloaded")
@@ -82,24 +82,13 @@ def test_add_new_service_workflow(end_to_end_context):
 
     # Retrieve some prominent elements on the page for testing.
     service_name_input = page.locator('xpath=//input[@name="name"]')
-    federal_radio_button = page.locator('xpath=//input[@value="federal"]')
-    state_radio_button = page.locator('xpath=//input[@value="state"]')
-    other_radio_button = page.locator('xpath=//input[@value="other"]')
     add_service_button = page.get_by_role("button", name=re.compile("Add service"))
 
     expect(service_name_input).to_be_visible()
-    expect(federal_radio_button).to_be_visible()
-    expect(state_radio_button).to_be_visible()
-    expect(other_radio_button).to_be_visible()
     expect(add_service_button).to_be_visible()
 
     # Fill in the form.
     service_name_input.fill(new_service_name)
-    expect(federal_radio_button).to_be_enabled()
-    # Trying to click directly on the radio button resulted in a "not in viewport error" and this is the
-    # suggested workaround.  Googling, the reason seems to be that there might be some (invisible?) css positioned
-    # above the radio button itself.
-    page.click("text='Federal government'")
 
     # Click on add service.
     add_service_button.click()
@@ -108,7 +97,7 @@ def test_add_new_service_workflow(end_to_end_context):
     page.wait_for_load_state("domcontentloaded")
 
     # Check for the service name title and heading.
-    service_heading = page.get_by_text(new_service_name)
+    service_heading = page.get_by_text(new_service_name, exact=True)
     expect(service_heading).to_be_visible()
     expect(page).to_have_title(re.compile(new_service_name))
 
diff --git a/tests/end_to_end/test_landing_and_sign_in_pages.py b/tests/end_to_end/test_landing_and_sign_in_pages.py
index 895b3851f..dd6a70beb 100644
--- a/tests/end_to_end/test_landing_and_sign_in_pages.py
+++ b/tests/end_to_end/test_landing_and_sign_in_pages.py
@@ -3,11 +3,13 @@ import re
 
 from playwright.sync_api import expect
 
+E2E_TEST_URI = os.getenv("NOTIFY_E2E_TEST_URI")
+
 
 def test_landing_page(end_to_end_context):
     # Open a new page and go to the staging site.
     page = end_to_end_context.browser.new_page()
-    page.goto(os.getenv("NOTIFY_E2E_TEST_URI"))
+    page.goto(f"{E2E_TEST_URI}/")
 
     # Check to make sure that we've arrived at the next page.
     page.wait_for_load_state("domcontentloaded")
@@ -17,7 +19,8 @@ def test_landing_page(end_to_end_context):
 
     # Retrieve some prominent elements on the page for testing.
     main_header = page.get_by_role(
-        "heading", name="Send text messages to your participants"
+        "heading",
+        name="Reach people where they are with government-powered text messages",
     )
     sign_in_button = page.get_by_role("link", name="Sign in")
     benefits_studio_email = page.get_by_role("link", name="tts-benefits-studio@gsa.gov")
@@ -51,7 +54,7 @@ def test_landing_page(end_to_end_context):
 # def test_sign_in_and_mfa_pages(end_to_end_context):
 #     # Open a new page and go to the staging site.
 #     page = end_to_end_context.new_page()
-#     page.goto(os.getenv("NOTIFY_E2E_TEST_URI"))
+#     page.goto(f"{E2E_TEST_URI}/")
 #     print(f"test_sign_in_and_mfa_pages initial {page}")
 #
 #     sign_in_button = page.get_by_role("link", name="Sign in")

From 997aa8e72f0d93f7a0c81c4241f9d8e3a04928df Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Thu, 4 Jan 2024 17:42:54 -0500
Subject: [PATCH 51/89] Added missing environment variables for the server
 process

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 .github/workflows/checks.yml           |  3 +++
 tests/conftest.py                      | 11 +++++------
 tests/end_to_end/test_accounts_page.py |  5 -----
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 9dfd779d4..498a9f273 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -116,6 +116,9 @@ jobs:
         run: make run-flask &
         env:
           NOTIFY_ENVIRONMENT: development
+          NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }}
+          NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
+          NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
       - name: Run E2E tests
         run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end
         # Debugging for now to troubleshoot a connectivity issue to the local servers
diff --git a/tests/conftest.py b/tests/conftest.py
index 48ea3c5fa..269bf5282 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -3576,12 +3576,11 @@ def login_for_end_to_end_testing(browser):
 
     # page.wait_for_load_state('domcontentloaded')
 
-    # # Save storage state into the file.
-    # auth_state_path = os.path.join(
-    #     os.getenv('NOTIFY_E2E_AUTH_STATE_PATH'),
-    #     'state.json'
-    # )
-    # context.storage_state(path=auth_state_path)
+    # Save storage state into the file.
+    auth_state_path = os.path.join(
+        os.getenv("NOTIFY_E2E_AUTH_STATE_PATH"), "state.json"
+    )
+    context.storage_state(path=auth_state_path)
 
 
 @pytest.fixture(scope="session")
diff --git a/tests/end_to_end/test_accounts_page.py b/tests/end_to_end/test_accounts_page.py
index 070e5d08d..498242743 100644
--- a/tests/end_to_end/test_accounts_page.py
+++ b/tests/end_to_end/test_accounts_page.py
@@ -28,11 +28,6 @@ def test_add_new_service_workflow(end_to_end_context):
     page = _bypass_sign_in(end_to_end_context)
     page.goto(f"{E2E_TEST_URI}/")
 
-    # sign_in_button = page.get_by_role("link", name="Sign in")
-    #
-    # Test trying to sign in. Because we are loading the email and password
-    # sign_in_button.click()
-    #
     # Wait for the next page to fully load.
     page.wait_for_load_state("domcontentloaded")
 

From e8e23e3ac0de177f74f9f22b9886f5f0d9a89957 Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Thu, 4 Jan 2024 17:55:19 -0500
Subject: [PATCH 52/89] A little more cleanup

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 tests/end_to_end/test_accounts_page.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/end_to_end/test_accounts_page.py b/tests/end_to_end/test_accounts_page.py
index 498242743..6df6ec5be 100644
--- a/tests/end_to_end/test_accounts_page.py
+++ b/tests/end_to_end/test_accounts_page.py
@@ -24,7 +24,6 @@ def _bypass_sign_in(end_to_end_context):
 
 
 def test_add_new_service_workflow(end_to_end_context):
-    # page = end_to_end_context.new_page()
     page = _bypass_sign_in(end_to_end_context)
     page.goto(f"{E2E_TEST_URI}/")
 

From 9987946f9296672e86c99c68385ddd3be5a18d5b Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Thu, 4 Jan 2024 17:58:56 -0500
Subject: [PATCH 53/89] Trying one more environment variable for auth

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 .github/workflows/checks.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 498a9f273..389e373b3 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -119,6 +119,7 @@ jobs:
           NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }}
           NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
           NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
+          NOTIFY_E2E_TEST_URI: http://localhost:6012
       - name: Run E2E tests
         run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end
         # Debugging for now to troubleshoot a connectivity issue to the local servers

From 87ca03f6d8e84055b769b12d593173ce933c321f Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Fri, 5 Jan 2024 09:36:06 -0500
Subject: [PATCH 54/89] Switch back to using the API locally in the CI/CD job

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 .github/workflows/checks.yml | 103 +++++++++++++++++------------------
 1 file changed, 51 insertions(+), 52 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 389e373b3..d9ad358fe 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -15,8 +15,7 @@ env:
   NODE_VERSION: 16.15.1
   AWS_US_TOLL_FREE_NUMBER: "+18556438890"
   ADMIN_BASE_URL: http://localhost:6012
-  #API_HOST_NAME: http://localhost:6011
-  API_HOST_NAME: https://notify-api-staging.app.cloud.gov
+  API_HOST_NAME: http://localhost:6011
 
 jobs:
   build:
@@ -57,61 +56,61 @@ jobs:
       pull-requests: write
       contents: write
     runs-on: ubuntu-latest
-    # services:
-    #   postgres:
-    #     image: postgres
-    #     env:
-    #       POSTGRES_USER: user
-    #       POSTGRES_PASSWORD: password
-    #       POSTGRES_DB: test_notification_api
-    #     options: >-
-    #       --health-cmd pg_isready
-    #       --health-interval 10s
-    #       --health-timeout 5s
-    #       --health-retries 5
-    #     ports:
-    #       # Maps tcp port 5432 on service container to the host
-    #       - 5432:5432
-    #   redis:
-    #     image: redis
-    #     options: >-
-    #       --health-cmd "redis-cli ping"
-    #       --health-interval 10s
-    #       --health-timeout 5s
-    #       --health-retries 5
-    #     ports:
-    #       # Maps tcp port 6379 on service container to the host
-    #       - 6379:6379
+    services:
+      postgres:
+        image: postgres
+        env:
+          POSTGRES_USER: user
+          POSTGRES_PASSWORD: password
+          POSTGRES_DB: test_notification_api
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          # Maps tcp port 5432 on service container to the host
+          - 5432:5432
+      redis:
+        image: redis
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          # Maps tcp port 6379 on service container to the host
+          - 6379:6379
     steps:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/setup-project
       - uses: jwalton/gh-find-current-pr@v1
         id: findPr
-      # - name: Clone API
-      #   uses: actions/checkout@v3
-      #   with:
-      #    repository: GSA/notifications-api
-      #    path: 'notifications-api'
-      # - name: Install API dependencies
-      #   working-directory: 'notifications-api'
-      #   run: make bootstrap
-      #   env:
-      #     DATABASE_URL: postgresql://user:password@localhost:5432/test_notification_api
-      #     SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api
-      #     REDIS_URL: redis://localhost:6379
-      #     NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
-      #     NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
-      #     NOTIFY_ENVIRONMENT: development
-      # - name: Run API server
-      #   working-directory: 'notifications-api'
-      #   run: make run-procfile &
-      #   env:
-      #     DATABASE_URL: postgresql://user:password@localhost:5432/test_notification_api
-      #     SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api
-      #     REDIS_URL: redis://localhost:6379
-      #     NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
-      #     NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
-      #     NOTIFY_ENVIRONMENT: development
+      - name: Clone API
+        uses: actions/checkout@v3
+        with:
+         repository: GSA/notifications-api
+         path: 'notifications-api'
+      - name: Install API dependencies
+        working-directory: 'notifications-api'
+        run: make bootstrap
+        env:
+          DATABASE_URL: postgresql://user:password@localhost:5432/test_notification_api
+          SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api
+          REDIS_URL: redis://localhost:6379
+          NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
+          NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
+          NOTIFY_ENVIRONMENT: development
+      - name: Run API server
+        working-directory: 'notifications-api'
+        run: make run-procfile &
+        env:
+          DATABASE_URL: postgresql://user:password@localhost:5432/test_notification_api
+          SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api
+          REDIS_URL: redis://localhost:6379
+          NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
+          NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
+          NOTIFY_ENVIRONMENT: development
       - name: Run Admin server
         run: make run-flask &
         env:

From 95bdd335ebb0552dcdfe35d7329291ab1ebd4837 Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Fri, 5 Jan 2024 10:29:02 -0500
Subject: [PATCH 55/89] Changing back to staging API; trying to get E2E auth
 working

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 .github/workflows/checks.yml | 104 +++++++++++++++++------------------
 1 file changed, 52 insertions(+), 52 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index d9ad358fe..d99e54b9c 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -15,7 +15,7 @@ env:
   NODE_VERSION: 16.15.1
   AWS_US_TOLL_FREE_NUMBER: "+18556438890"
   ADMIN_BASE_URL: http://localhost:6012
-  API_HOST_NAME: http://localhost:6011
+  API_HOST_NAME: https://notify-api-staging.app.cloud.gov
 
 jobs:
   build:
@@ -56,61 +56,61 @@ jobs:
       pull-requests: write
       contents: write
     runs-on: ubuntu-latest
-    services:
-      postgres:
-        image: postgres
-        env:
-          POSTGRES_USER: user
-          POSTGRES_PASSWORD: password
-          POSTGRES_DB: test_notification_api
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        ports:
-          # Maps tcp port 5432 on service container to the host
-          - 5432:5432
-      redis:
-        image: redis
-        options: >-
-          --health-cmd "redis-cli ping"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        ports:
-          # Maps tcp port 6379 on service container to the host
-          - 6379:6379
+    # services:
+    #   postgres:
+    #     image: postgres
+    #     env:
+    #       POSTGRES_USER: user
+    #       POSTGRES_PASSWORD: password
+    #       POSTGRES_DB: test_notification_api
+    #     options: >-
+    #       --health-cmd pg_isready
+    #       --health-interval 10s
+    #       --health-timeout 5s
+    #       --health-retries 5
+    #     ports:
+    #       # Maps tcp port 5432 on service container to the host
+    #       - 5432:5432
+    #   redis:
+    #     image: redis
+    #     options: >-
+    #       --health-cmd "redis-cli ping"
+    #       --health-interval 10s
+    #       --health-timeout 5s
+    #       --health-retries 5
+    #     ports:
+    #       # Maps tcp port 6379 on service container to the host
+    #       - 6379:6379
     steps:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/setup-project
       - uses: jwalton/gh-find-current-pr@v1
         id: findPr
-      - name: Clone API
-        uses: actions/checkout@v3
-        with:
-         repository: GSA/notifications-api
-         path: 'notifications-api'
-      - name: Install API dependencies
-        working-directory: 'notifications-api'
-        run: make bootstrap
-        env:
-          DATABASE_URL: postgresql://user:password@localhost:5432/test_notification_api
-          SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api
-          REDIS_URL: redis://localhost:6379
-          NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
-          NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
-          NOTIFY_ENVIRONMENT: development
-      - name: Run API server
-        working-directory: 'notifications-api'
-        run: make run-procfile &
-        env:
-          DATABASE_URL: postgresql://user:password@localhost:5432/test_notification_api
-          SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api
-          REDIS_URL: redis://localhost:6379
-          NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
-          NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
-          NOTIFY_ENVIRONMENT: development
+      # - name: Clone API
+      #   uses: actions/checkout@v3
+      #   with:
+      #    repository: GSA/notifications-api
+      #    path: 'notifications-api'
+      # - name: Install API dependencies
+      #   working-directory: 'notifications-api'
+      #   run: make bootstrap
+      #   env:
+      #     DATABASE_URL: postgresql://user:password@localhost:5432/test_notification_api
+      #     SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api
+      #     REDIS_URL: redis://localhost:6379
+      #     NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
+      #     NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
+      #     NOTIFY_ENVIRONMENT: development
+      # - name: Run API server
+      #   working-directory: 'notifications-api'
+      #   run: make run-procfile &
+      #   env:
+      #     DATABASE_URL: postgresql://user:password@localhost:5432/test_notification_api
+      #     SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api
+      #     REDIS_URL: redis://localhost:6379
+      #     NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
+      #     NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
+      #     NOTIFY_ENVIRONMENT: development
       - name: Run Admin server
         run: make run-flask &
         env:
@@ -120,6 +120,7 @@ jobs:
           NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
           NOTIFY_E2E_TEST_URI: http://localhost:6012
       - name: Run E2E tests
+        # Run the E2E tests against the code found in this PR.
         run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end
         # Debugging for now to troubleshoot a connectivity issue to the local servers
         # run: curl --request GET --url "http://localhost:6012"
@@ -127,7 +128,6 @@ jobs:
           NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }}
           NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
           NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
-          # Run the E2E tests against the code found in this PR.
           NOTIFY_E2E_TEST_URI: http://localhost:6012
 
   validate-new-relic-config:

From aec20b5e731a18ab659858694010760a65aa7f4b Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Fri, 5 Jan 2024 17:17:40 -0500
Subject: [PATCH 56/89] Add API access to Admin server

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 .github/workflows/checks.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index d99e54b9c..15c820b8d 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -114,6 +114,8 @@ jobs:
       - name: Run Admin server
         run: make run-flask &
         env:
+          ADMIN_CLIENT_SECRET: ${{ secrets.ADMIN_CLIENT_SECRET }}
+          ADMIN_CLIENT_USERNAME: ${{ secrets.ADMIN_CLIENT_USERNAME }}
           NOTIFY_ENVIRONMENT: development
           NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }}
           NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}

From 136403a263ef504a4a73f48aa5a59578e976abf1 Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Fri, 5 Jan 2024 17:22:21 -0500
Subject: [PATCH 57/89] Adding a couple more missing env vars for the admin
 server

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 .github/workflows/checks.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 15c820b8d..3c1845c63 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -116,6 +116,8 @@ jobs:
         env:
           ADMIN_CLIENT_SECRET: ${{ secrets.ADMIN_CLIENT_SECRET }}
           ADMIN_CLIENT_USERNAME: ${{ secrets.ADMIN_CLIENT_USERNAME }}
+          DANGEROUS_SALT: ${{ secrets.DANGEROUS_SALT }}
+          SECRET_KEY: ${{ secrets.SECRET_KEY }}
           NOTIFY_ENVIRONMENT: development
           NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }}
           NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}

From c2e7b4897de34a31b408ce3534fc8e0c10fa9a05 Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Fri, 5 Jan 2024 17:28:00 -0500
Subject: [PATCH 58/89] Adjusting a couple of other environment variables

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 .github/workflows/checks.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 3c1845c63..3a1e41728 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -115,10 +115,10 @@ jobs:
         run: make run-flask &
         env:
           ADMIN_CLIENT_SECRET: ${{ secrets.ADMIN_CLIENT_SECRET }}
-          ADMIN_CLIENT_USERNAME: ${{ secrets.ADMIN_CLIENT_USERNAME }}
+          ADMIN_CLIENT_USERNAME: notify-admin
           DANGEROUS_SALT: ${{ secrets.DANGEROUS_SALT }}
           SECRET_KEY: ${{ secrets.SECRET_KEY }}
-          NOTIFY_ENVIRONMENT: development
+          NOTIFY_ENVIRONMENT: staging
           NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }}
           NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
           NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}

From 5aacdcbc356c785c0262bde7272d603c2f044096 Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Tue, 9 Jan 2024 10:55:37 -0500
Subject: [PATCH 59/89] Slight adjustments to make sure no typos are present

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 .github/workflows/checks.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 3a1e41728..befe91c71 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -15,7 +15,6 @@ env:
   NODE_VERSION: 16.15.1
   AWS_US_TOLL_FREE_NUMBER: "+18556438890"
   ADMIN_BASE_URL: http://localhost:6012
-  API_HOST_NAME: https://notify-api-staging.app.cloud.gov
 
 jobs:
   build:
@@ -114,10 +113,11 @@ jobs:
       - name: Run Admin server
         run: make run-flask &
         env:
-          ADMIN_CLIENT_SECRET: ${{ secrets.ADMIN_CLIENT_SECRET }}
-          ADMIN_CLIENT_USERNAME: notify-admin
+          API_HOST_NAME: https://notify-api-staging.app.cloud.gov
           DANGEROUS_SALT: ${{ secrets.DANGEROUS_SALT }}
           SECRET_KEY: ${{ secrets.SECRET_KEY }}
+          ADMIN_CLIENT_SECRET: ${{ secrets.ADMIN_CLIENT_SECRET }}
+          ADMIN_CLIENT_USERNAME: notify-admin
           NOTIFY_ENVIRONMENT: staging
           NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }}
           NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}

From 29c20a0ee9d03aec676b2770e3932c966984c29c Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Tue, 9 Jan 2024 11:57:58 -0500
Subject: [PATCH 60/89] Trying to see if New Relic needs to be in place

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 .github/workflows/checks.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index befe91c71..b57a516e4 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -119,6 +119,8 @@ jobs:
           ADMIN_CLIENT_SECRET: ${{ secrets.ADMIN_CLIENT_SECRET }}
           ADMIN_CLIENT_USERNAME: notify-admin
           NOTIFY_ENVIRONMENT: staging
+          NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }}
+          NR_BROWSER_KEY: ${{ secrets.NR_BROWSER_KEY }}
           NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }}
           NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
           NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}

From 1b6446e213c95be211bcd3f9c34cf6fe98d67ee4 Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Thu, 25 Jan 2024 13:00:39 -0500
Subject: [PATCH 61/89] Added a new E2ETest config and adjusted a couple of
 things

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 app/config.py                          | 23 +++++++++++++++++++++--
 tests/conftest.py                      |  2 +-
 tests/end_to_end/test_accounts_page.py |  2 +-
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/app/config.py b/app/config.py
index f424076fa..c46ddf725 100644
--- a/app/config.py
+++ b/app/config.py
@@ -81,8 +81,7 @@ class Config(object):
         "IBAN": "GB33BUKB20201555555555",
         "swift": "ABCDEF12",
         "notify_billing_email_addresses": [
-            "generic@digital.cabinet-office.gov.uk",
-            "first.last@digital.cabinet-office.gov.uk",
+            "tts-benefits-studio@gsa.gov",
         ],
     }
 
@@ -152,6 +151,25 @@ class Staging(Production):
     HEADER_COLOUR = "#00ff00"  # $green
 
 
+class E2ETest(Staging):
+    """
+    An environment config that is intended to operate as if it were in the
+    staging environment but with the configuration of the development and test
+    environments so the E2E tests work.
+    """
+
+    # Borrowed from development environment
+    SESSION_COOKIE_SECURE = False
+    SESSION_PROTECTION = None
+    HTTP_PROTOCOL = "http"
+    ASSET_DOMAIN = ""
+    ASSET_PATH = "/static/"
+
+    # Borrowed from test environment
+    TESTING = True
+    WTF_CSRF_ENABLED = False
+
+
 class Demo(Staging):
     HEADER_COLOUR = "#6F72AF"  # $mauve
 
@@ -173,6 +191,7 @@ class Scanning(Production):
 configs = {
     "development": Development,
     "test": Test,
+    "e2etest": E2ETest,
     "scanning": Scanning,
     "staging": Staging,
     "demo": Demo,
diff --git a/tests/conftest.py b/tests/conftest.py
index 269bf5282..4a397b7ec 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -3593,7 +3593,7 @@ def end_to_end_context(browser):
 def end_to_end_authenticated_context(browser):
     # Create and load a previously authenticated context for Playwright E2E
     # tests.
-    login_for_end_to_end_testing(browser)
+    # login_for_end_to_end_testing(browser)
 
     auth_state_path = os.path.join(
         os.getenv("NOTIFY_E2E_AUTH_STATE_PATH"), "state.json"
diff --git a/tests/end_to_end/test_accounts_page.py b/tests/end_to_end/test_accounts_page.py
index 6df6ec5be..8484e58b0 100644
--- a/tests/end_to_end/test_accounts_page.py
+++ b/tests/end_to_end/test_accounts_page.py
@@ -15,7 +15,7 @@ def _bypass_sign_in(end_to_end_context):
 
     sign_in_button = page.get_by_role("link", name="Sign in")
 
-    # Test trying to sign in. Because we are loading the email and password
+    # Sign in to the site - E2E test accounts are set to flow through.
     sign_in_button.click()
 
     # Wait for the next page to fully load.

From 719ecfe8f6de1b3128bc861d3eec0616db293106 Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Thu, 25 Jan 2024 13:06:21 -0500
Subject: [PATCH 62/89] Modified E2E test job environment

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 .github/workflows/checks.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index b57a516e4..12d39def8 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -118,7 +118,7 @@ jobs:
           SECRET_KEY: ${{ secrets.SECRET_KEY }}
           ADMIN_CLIENT_SECRET: ${{ secrets.ADMIN_CLIENT_SECRET }}
           ADMIN_CLIENT_USERNAME: notify-admin
-          NOTIFY_ENVIRONMENT: staging
+          NOTIFY_ENVIRONMENT: e2etest
           NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }}
           NR_BROWSER_KEY: ${{ secrets.NR_BROWSER_KEY }}
           NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }}

From c790d8b84439c8a578738d16f727b92127b00939 Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Thu, 25 Jan 2024 13:23:19 -0500
Subject: [PATCH 63/89] Added some additional environment variables to E2E
 command

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 .github/workflows/checks.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 12d39def8..fb67bfd5a 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -131,6 +131,11 @@ jobs:
         # Debugging for now to troubleshoot a connectivity issue to the local servers
         # run: curl --request GET --url "http://localhost:6012"
         env:
+          DANGEROUS_SALT: ${{ secrets.DANGEROUS_SALT }}
+          SECRET_KEY: ${{ secrets.SECRET_KEY }}
+          ADMIN_CLIENT_SECRET: ${{ secrets.ADMIN_CLIENT_SECRET }}
+          ADMIN_CLIENT_USERNAME: notify-admin
+          NOTIFY_ENVIRONMENT: e2etest
           NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }}
           NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
           NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}

From 534daa2d82e4ed29f51efe46f9d54eed181462f8 Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Thu, 25 Jan 2024 17:22:19 -0500
Subject: [PATCH 64/89] Attempting to match local E2E config with CI/CD

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 .github/workflows/checks.yml | 9 +--------
 app/config.py                | 8 ++++++++
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index fb67bfd5a..22b3b8ae7 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -7,8 +7,6 @@ permissions:
 
 env:
   NOTIFY_ENVIRONMENT: test
-  NEW_RELIC_CONFIG_FILE: newrelic.ini
-  NEW_RELIC_ENVIRONMENT: test
   FLASK_APP: application.py
   WERKZEUG_DEBUG_PIN: off
   REDIS_ENABLED: 0
@@ -119,8 +117,6 @@ jobs:
           ADMIN_CLIENT_SECRET: ${{ secrets.ADMIN_CLIENT_SECRET }}
           ADMIN_CLIENT_USERNAME: notify-admin
           NOTIFY_ENVIRONMENT: e2etest
-          NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }}
-          NR_BROWSER_KEY: ${{ secrets.NR_BROWSER_KEY }}
           NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }}
           NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
           NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
@@ -131,10 +127,6 @@ jobs:
         # Debugging for now to troubleshoot a connectivity issue to the local servers
         # run: curl --request GET --url "http://localhost:6012"
         env:
-          DANGEROUS_SALT: ${{ secrets.DANGEROUS_SALT }}
-          SECRET_KEY: ${{ secrets.SECRET_KEY }}
-          ADMIN_CLIENT_SECRET: ${{ secrets.ADMIN_CLIENT_SECRET }}
-          ADMIN_CLIENT_USERNAME: notify-admin
           NOTIFY_ENVIRONMENT: e2etest
           NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }}
           NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
@@ -149,6 +141,7 @@ jobs:
       - uses: ./.github/actions/setup-project
       - name: Validate NewRelic config
         env:
+          NEW_RELIC_CONFIG_FILE: newrelic.ini
           NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }}
           # Need to set a NEW_RELIC_ENVIRONMENT with monitor_mode: true
           NEW_RELIC_ENVIRONMENT: staging
diff --git a/app/config.py b/app/config.py
index c46ddf725..091dd35fd 100644
--- a/app/config.py
+++ b/app/config.py
@@ -169,6 +169,14 @@ class E2ETest(Staging):
     TESTING = True
     WTF_CSRF_ENABLED = False
 
+    # buckets - mirror staging
+    CSV_UPLOAD_BUCKET = cloud_config.s3_credentials(
+        "notify-api-csv-upload-bucket-staging"
+    )
+    LOGO_UPLOAD_BUCKET = cloud_config.s3_credentials(
+        "notify-admin-logo-upload-bucket-staging"
+    )
+
 
 class Demo(Staging):
     HEADER_COLOUR = "#6F72AF"  # $mauve

From bd41dfc1c2bcb48e90397f18b471ac5369abf411 Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Thu, 25 Jan 2024 17:31:59 -0500
Subject: [PATCH 65/89] Attempting to get E2E work with local API

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 .github/workflows/checks.yml | 103 ++++++++++++++++++-----------------
 1 file changed, 52 insertions(+), 51 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 22b3b8ae7..d68df41ad 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -53,65 +53,66 @@ jobs:
       pull-requests: write
       contents: write
     runs-on: ubuntu-latest
-    # services:
-    #   postgres:
-    #     image: postgres
-    #     env:
-    #       POSTGRES_USER: user
-    #       POSTGRES_PASSWORD: password
-    #       POSTGRES_DB: test_notification_api
-    #     options: >-
-    #       --health-cmd pg_isready
-    #       --health-interval 10s
-    #       --health-timeout 5s
-    #       --health-retries 5
-    #     ports:
-    #       # Maps tcp port 5432 on service container to the host
-    #       - 5432:5432
-    #   redis:
-    #     image: redis
-    #     options: >-
-    #       --health-cmd "redis-cli ping"
-    #       --health-interval 10s
-    #       --health-timeout 5s
-    #       --health-retries 5
-    #     ports:
-    #       # Maps tcp port 6379 on service container to the host
-    #       - 6379:6379
+    services:
+      postgres:
+        image: postgres
+        env:
+          POSTGRES_USER: user
+          POSTGRES_PASSWORD: password
+          POSTGRES_DB: test_notification_api
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          # Maps tcp port 5432 on service container to the host
+          - 5432:5432
+      redis:
+        image: redis
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          # Maps tcp port 6379 on service container to the host
+          - 6379:6379
     steps:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/setup-project
       - uses: jwalton/gh-find-current-pr@v1
         id: findPr
-      # - name: Clone API
-      #   uses: actions/checkout@v3
-      #   with:
-      #    repository: GSA/notifications-api
-      #    path: 'notifications-api'
-      # - name: Install API dependencies
-      #   working-directory: 'notifications-api'
-      #   run: make bootstrap
-      #   env:
-      #     DATABASE_URL: postgresql://user:password@localhost:5432/test_notification_api
-      #     SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api
-      #     REDIS_URL: redis://localhost:6379
-      #     NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
-      #     NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
-      #     NOTIFY_ENVIRONMENT: development
-      # - name: Run API server
-      #   working-directory: 'notifications-api'
-      #   run: make run-procfile &
-      #   env:
-      #     DATABASE_URL: postgresql://user:password@localhost:5432/test_notification_api
-      #     SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api
-      #     REDIS_URL: redis://localhost:6379
-      #     NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
-      #     NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
-      #     NOTIFY_ENVIRONMENT: development
+      - name: Clone API
+        uses: actions/checkout@v3
+        with:
+         repository: GSA/notifications-api
+         path: 'notifications-api'
+      - name: Install API dependencies
+        working-directory: 'notifications-api'
+        run: make bootstrap
+        env:
+          DATABASE_URL: postgresql://user:password@localhost:5432/test_notification_api
+          SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api
+          REDIS_URL: redis://localhost:6379
+          NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
+          NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
+          NOTIFY_ENVIRONMENT: staging
+      - name: Run API server
+        working-directory: 'notifications-api'
+        run: make run-procfile &
+        env:
+          DATABASE_URL: postgresql://user:password@localhost:5432/test_notification_api
+          SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api
+          REDIS_URL: redis://localhost:6379
+          NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
+          NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
+          NOTIFY_ENVIRONMENT: staging
       - name: Run Admin server
         run: make run-flask &
         env:
-          API_HOST_NAME: https://notify-api-staging.app.cloud.gov
+          # API_HOST_NAME: https://notify-api-staging.app.cloud.gov
+          API_HOST_NAME: http://localhost:6011
           DANGEROUS_SALT: ${{ secrets.DANGEROUS_SALT }}
           SECRET_KEY: ${{ secrets.SECRET_KEY }}
           ADMIN_CLIENT_SECRET: ${{ secrets.ADMIN_CLIENT_SECRET }}

From 3a6eeb229277a10c096d8664c3330e4a6f2e330e Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Thu, 25 Jan 2024 17:37:22 -0500
Subject: [PATCH 66/89] Swapping API back to development environment

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 .github/workflows/checks.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index d68df41ad..f5d614280 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -97,7 +97,7 @@ jobs:
           REDIS_URL: redis://localhost:6379
           NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
           NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
-          NOTIFY_ENVIRONMENT: staging
+          NOTIFY_ENVIRONMENT: development
       - name: Run API server
         working-directory: 'notifications-api'
         run: make run-procfile &
@@ -107,7 +107,7 @@ jobs:
           REDIS_URL: redis://localhost:6379
           NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
           NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
-          NOTIFY_ENVIRONMENT: staging
+          NOTIFY_ENVIRONMENT: development
       - name: Run Admin server
         run: make run-flask &
         env:

From fd5cd36959e59d324c240c7b7521ec5fcef9199a Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Thu, 25 Jan 2024 17:52:32 -0500
Subject: [PATCH 67/89] Remove webkit testing for now

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 Makefile      | 4 ++--
 app/config.py | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 8f950dbf6..aa9b404af 100644
--- a/Makefile
+++ b/Makefile
@@ -80,8 +80,8 @@ dead-code:
 
 .PHONY: e2e-test
 e2e-test: export NEW_RELIC_ENVIRONMENT=test
-e2e-test: ## Run end-to-end integration tests
-	poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end
+e2e-test: ## Run end-to-end integration tests; note that --browser webkit isn't currently working
+	poetry run pytest -v --browser chromium --browser firefox tests/end_to_end
 
 .PHONY: js-lint
 js-lint: ## Run javascript linting scanners
diff --git a/app/config.py b/app/config.py
index 091dd35fd..58623f426 100644
--- a/app/config.py
+++ b/app/config.py
@@ -159,6 +159,7 @@ class E2ETest(Staging):
     """
 
     # Borrowed from development environment
+    DEBUG = True
     SESSION_COOKIE_SECURE = False
     SESSION_PROTECTION = None
     HTTP_PROTOCOL = "http"

From 7259d617eebedfafcbc8c8523709b3382867ac66 Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Thu, 25 Jan 2024 18:04:07 -0500
Subject: [PATCH 68/89] Actually disable webkit in CI/CD E2E tests

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 .github/workflows/checks.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index f5d614280..179615e89 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -124,7 +124,9 @@ jobs:
           NOTIFY_E2E_TEST_URI: http://localhost:6012
       - name: Run E2E tests
         # Run the E2E tests against the code found in this PR.
-        run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end
+        # run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end
+        # --browser webkit doesn't work at this time.
+        run: poetry run pytest -v --browser chromium --browser firefox tests/end_to_end
         # Debugging for now to troubleshoot a connectivity issue to the local servers
         # run: curl --request GET --url "http://localhost:6012"
         env:

From 9c392bca78cfda193694a0dab0bd4d7c4cb3225b Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Fri, 26 Jan 2024 09:26:23 -0500
Subject: [PATCH 69/89] Switch E2E test command to use Makefile

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 .github/workflows/checks.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 179615e89..53af0de2d 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -126,7 +126,7 @@ jobs:
         # Run the E2E tests against the code found in this PR.
         # run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end
         # --browser webkit doesn't work at this time.
-        run: poetry run pytest -v --browser chromium --browser firefox tests/end_to_end
+        run: make e2e-test
         # Debugging for now to troubleshoot a connectivity issue to the local servers
         # run: curl --request GET --url "http://localhost:6012"
         env:

From b50fe24c5221e4bafb6e0214b90d2855ebdd7610 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 Feb 2024 16:14:06 +0000
Subject: [PATCH 70/89] Bump coverage from 7.4.0 to 7.4.2

Bumps [coverage](https://github.com/nedbat/coveragepy) from 7.4.0 to 7.4.2.
- [Release notes](https://github.com/nedbat/coveragepy/releases)
- [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst)
- [Commits](https://github.com/nedbat/coveragepy/compare/7.4.0...7.4.2)

---
updated-dependencies:
- dependency-name: coverage
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock | 117 ++++++++++++++++++++++++++++------------------------
 1 file changed, 64 insertions(+), 53 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 2123e9dd4..6940ef336 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -465,63 +465,63 @@ files = [
 
 [[package]]
 name = "coverage"
-version = "7.4.0"
+version = "7.4.2"
 description = "Code coverage measurement for Python"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "coverage-7.4.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:36b0ea8ab20d6a7564e89cb6135920bc9188fb5f1f7152e94e8300b7b189441a"},
-    {file = "coverage-7.4.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:0676cd0ba581e514b7f726495ea75aba3eb20899d824636c6f59b0ed2f88c471"},
-    {file = "coverage-7.4.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d0ca5c71a5a1765a0f8f88022c52b6b8be740e512980362f7fdbb03725a0d6b9"},
-    {file = "coverage-7.4.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a7c97726520f784239f6c62506bc70e48d01ae71e9da128259d61ca5e9788516"},
-    {file = "coverage-7.4.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:815ac2d0f3398a14286dc2cea223a6f338109f9ecf39a71160cd1628786bc6f5"},
-    {file = "coverage-7.4.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:80b5ee39b7f0131ebec7968baa9b2309eddb35b8403d1869e08f024efd883566"},
-    {file = "coverage-7.4.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:5b2ccb7548a0b65974860a78c9ffe1173cfb5877460e5a229238d985565574ae"},
-    {file = "coverage-7.4.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:995ea5c48c4ebfd898eacb098164b3cc826ba273b3049e4a889658548e321b43"},
-    {file = "coverage-7.4.0-cp310-cp310-win32.whl", hash = "sha256:79287fd95585ed36e83182794a57a46aeae0b64ca53929d1176db56aacc83451"},
-    {file = "coverage-7.4.0-cp310-cp310-win_amd64.whl", hash = "sha256:5b14b4f8760006bfdb6e08667af7bc2d8d9bfdb648351915315ea17645347137"},
-    {file = "coverage-7.4.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:04387a4a6ecb330c1878907ce0dc04078ea72a869263e53c72a1ba5bbdf380ca"},
-    {file = "coverage-7.4.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:ea81d8f9691bb53f4fb4db603203029643caffc82bf998ab5b59ca05560f4c06"},
-    {file = "coverage-7.4.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:74775198b702868ec2d058cb92720a3c5a9177296f75bd97317c787daf711505"},
-    {file = "coverage-7.4.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:76f03940f9973bfaee8cfba70ac991825611b9aac047e5c80d499a44079ec0bc"},
-    {file = "coverage-7.4.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:485e9f897cf4856a65a57c7f6ea3dc0d4e6c076c87311d4bc003f82cfe199d25"},
-    {file = "coverage-7.4.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:6ae8c9d301207e6856865867d762a4b6fd379c714fcc0607a84b92ee63feff70"},
-    {file = "coverage-7.4.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:bf477c355274a72435ceb140dc42de0dc1e1e0bf6e97195be30487d8eaaf1a09"},
-    {file = "coverage-7.4.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:83c2dda2666fe32332f8e87481eed056c8b4d163fe18ecc690b02802d36a4d26"},
-    {file = "coverage-7.4.0-cp311-cp311-win32.whl", hash = "sha256:697d1317e5290a313ef0d369650cfee1a114abb6021fa239ca12b4849ebbd614"},
-    {file = "coverage-7.4.0-cp311-cp311-win_amd64.whl", hash = "sha256:26776ff6c711d9d835557ee453082025d871e30b3fd6c27fcef14733f67f0590"},
-    {file = "coverage-7.4.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:13eaf476ec3e883fe3e5fe3707caeb88268a06284484a3daf8250259ef1ba143"},
-    {file = "coverage-7.4.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:846f52f46e212affb5bcf131c952fb4075b55aae6b61adc9856222df89cbe3e2"},
-    {file = "coverage-7.4.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:26f66da8695719ccf90e794ed567a1549bb2644a706b41e9f6eae6816b398c4a"},
-    {file = "coverage-7.4.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:164fdcc3246c69a6526a59b744b62e303039a81e42cfbbdc171c91a8cc2f9446"},
-    {file = "coverage-7.4.0-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:316543f71025a6565677d84bc4df2114e9b6a615aa39fb165d697dba06a54af9"},
-    {file = "coverage-7.4.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:bb1de682da0b824411e00a0d4da5a784ec6496b6850fdf8c865c1d68c0e318dd"},
-    {file = "coverage-7.4.0-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:0e8d06778e8fbffccfe96331a3946237f87b1e1d359d7fbe8b06b96c95a5407a"},
-    {file = "coverage-7.4.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:a56de34db7b7ff77056a37aedded01b2b98b508227d2d0979d373a9b5d353daa"},
-    {file = "coverage-7.4.0-cp312-cp312-win32.whl", hash = "sha256:51456e6fa099a8d9d91497202d9563a320513fcf59f33991b0661a4a6f2ad450"},
-    {file = "coverage-7.4.0-cp312-cp312-win_amd64.whl", hash = "sha256:cd3c1e4cb2ff0083758f09be0f77402e1bdf704adb7f89108007300a6da587d0"},
-    {file = "coverage-7.4.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:e9d1bf53c4c8de58d22e0e956a79a5b37f754ed1ffdbf1a260d9dcfa2d8a325e"},
-    {file = "coverage-7.4.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:109f5985182b6b81fe33323ab4707011875198c41964f014579cf82cebf2bb85"},
-    {file = "coverage-7.4.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3cc9d4bc55de8003663ec94c2f215d12d42ceea128da8f0f4036235a119c88ac"},
-    {file = "coverage-7.4.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cc6d65b21c219ec2072c1293c505cf36e4e913a3f936d80028993dd73c7906b1"},
-    {file = "coverage-7.4.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5a10a4920def78bbfff4eff8a05c51be03e42f1c3735be42d851f199144897ba"},
-    {file = "coverage-7.4.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:b8e99f06160602bc64da35158bb76c73522a4010f0649be44a4e167ff8555952"},
-    {file = "coverage-7.4.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:7d360587e64d006402b7116623cebf9d48893329ef035278969fa3bbf75b697e"},
-    {file = "coverage-7.4.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:29f3abe810930311c0b5d1a7140f6395369c3db1be68345638c33eec07535105"},
-    {file = "coverage-7.4.0-cp38-cp38-win32.whl", hash = "sha256:5040148f4ec43644702e7b16ca864c5314ccb8ee0751ef617d49aa0e2d6bf4f2"},
-    {file = "coverage-7.4.0-cp38-cp38-win_amd64.whl", hash = "sha256:9864463c1c2f9cb3b5db2cf1ff475eed2f0b4285c2aaf4d357b69959941aa555"},
-    {file = "coverage-7.4.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:936d38794044b26c99d3dd004d8af0035ac535b92090f7f2bb5aa9c8e2f5cd42"},
-    {file = "coverage-7.4.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:799c8f873794a08cdf216aa5d0531c6a3747793b70c53f70e98259720a6fe2d7"},
-    {file = "coverage-7.4.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e7defbb9737274023e2d7af02cac77043c86ce88a907c58f42b580a97d5bcca9"},
-    {file = "coverage-7.4.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a1526d265743fb49363974b7aa8d5899ff64ee07df47dd8d3e37dcc0818f09ed"},
-    {file = "coverage-7.4.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bf635a52fc1ea401baf88843ae8708591aa4adff875e5c23220de43b1ccf575c"},
-    {file = "coverage-7.4.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:756ded44f47f330666843b5781be126ab57bb57c22adbb07d83f6b519783b870"},
-    {file = "coverage-7.4.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:0eb3c2f32dabe3a4aaf6441dde94f35687224dfd7eb2a7f47f3fd9428e421058"},
-    {file = "coverage-7.4.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:bfd5db349d15c08311702611f3dccbef4b4e2ec148fcc636cf8739519b4a5c0f"},
-    {file = "coverage-7.4.0-cp39-cp39-win32.whl", hash = "sha256:53d7d9158ee03956e0eadac38dfa1ec8068431ef8058fe6447043db1fb40d932"},
-    {file = "coverage-7.4.0-cp39-cp39-win_amd64.whl", hash = "sha256:cfd2a8b6b0d8e66e944d47cdec2f47c48fef2ba2f2dff5a9a75757f64172857e"},
-    {file = "coverage-7.4.0-pp38.pp39.pp310-none-any.whl", hash = "sha256:c530833afc4707fe48524a44844493f36d8727f04dcce91fb978c414a8556cc6"},
-    {file = "coverage-7.4.0.tar.gz", hash = "sha256:707c0f58cb1712b8809ece32b68996ee1e609f71bd14615bd8f87a1293cb610e"},
+    {file = "coverage-7.4.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:bf54c3e089179d9d23900e3efc86d46e4431188d9a657f345410eecdd0151f50"},
+    {file = "coverage-7.4.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:fe6e43c8b510719b48af7db9631b5fbac910ade4bd90e6378c85ac5ac706382c"},
+    {file = "coverage-7.4.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8b98c89db1b150d851a7840142d60d01d07677a18f0f46836e691c38134ed18b"},
+    {file = "coverage-7.4.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c5f9683be6a5b19cd776ee4e2f2ffb411424819c69afab6b2db3a0a364ec6642"},
+    {file = "coverage-7.4.2-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:78cdcbf7b9cb83fe047ee09298e25b1cd1636824067166dc97ad0543b079d22f"},
+    {file = "coverage-7.4.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:2599972b21911111114100d362aea9e70a88b258400672626efa2b9e2179609c"},
+    {file = "coverage-7.4.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:ef00d31b7569ed3cb2036f26565f1984b9fc08541731ce01012b02a4c238bf03"},
+    {file = "coverage-7.4.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:20a875bfd8c282985c4720c32aa05056f77a68e6d8bbc5fe8632c5860ee0b49b"},
+    {file = "coverage-7.4.2-cp310-cp310-win32.whl", hash = "sha256:b3f2b1eb229f23c82898eedfc3296137cf1f16bb145ceab3edfd17cbde273fb7"},
+    {file = "coverage-7.4.2-cp310-cp310-win_amd64.whl", hash = "sha256:7df95fdd1432a5d2675ce630fef5f239939e2b3610fe2f2b5bf21fa505256fa3"},
+    {file = "coverage-7.4.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:a8ddbd158e069dded57738ea69b9744525181e99974c899b39f75b2b29a624e2"},
+    {file = "coverage-7.4.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:81a5fb41b0d24447a47543b749adc34d45a2cf77b48ca74e5bf3de60a7bd9edc"},
+    {file = "coverage-7.4.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2412e98e70f16243be41d20836abd5f3f32edef07cbf8f407f1b6e1ceae783ac"},
+    {file = "coverage-7.4.2-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ddb79414c15c6f03f56cc68fa06994f047cf20207c31b5dad3f6bab54a0f66ef"},
+    {file = "coverage-7.4.2-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cf89ab85027427d351f1de918aff4b43f4eb5f33aff6835ed30322a86ac29c9e"},
+    {file = "coverage-7.4.2-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:a178b7b1ac0f1530bb28d2e51f88c0bab3e5949835851a60dda80bff6052510c"},
+    {file = "coverage-7.4.2-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:06fe398145a2e91edaf1ab4eee66149c6776c6b25b136f4a86fcbbb09512fd10"},
+    {file = "coverage-7.4.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:18cac867950943fe93d6cd56a67eb7dcd2d4a781a40f4c1e25d6f1ed98721a55"},
+    {file = "coverage-7.4.2-cp311-cp311-win32.whl", hash = "sha256:f72cdd2586f9a769570d4b5714a3837b3a59a53b096bb954f1811f6a0afad305"},
+    {file = "coverage-7.4.2-cp311-cp311-win_amd64.whl", hash = "sha256:d779a48fac416387dd5673fc5b2d6bd903ed903faaa3247dc1865c65eaa5a93e"},
+    {file = "coverage-7.4.2-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:adbdfcda2469d188d79771d5696dc54fab98a16d2ef7e0875013b5f56a251047"},
+    {file = "coverage-7.4.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:ac4bab32f396b03ebecfcf2971668da9275b3bb5f81b3b6ba96622f4ef3f6e17"},
+    {file = "coverage-7.4.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:006d220ba2e1a45f1de083d5022d4955abb0aedd78904cd5a779b955b019ec73"},
+    {file = "coverage-7.4.2-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3733545eb294e5ad274abe131d1e7e7de4ba17a144505c12feca48803fea5f64"},
+    {file = "coverage-7.4.2-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:42a9e754aa250fe61f0f99986399cec086d7e7a01dd82fd863a20af34cbce962"},
+    {file = "coverage-7.4.2-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:2ed37e16cf35c8d6e0b430254574b8edd242a367a1b1531bd1adc99c6a5e00fe"},
+    {file = "coverage-7.4.2-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:b953275d4edfab6cc0ed7139fa773dfb89e81fee1569a932f6020ce7c6da0e8f"},
+    {file = "coverage-7.4.2-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:32b4ab7e6c924f945cbae5392832e93e4ceb81483fd6dc4aa8fb1a97b9d3e0e1"},
+    {file = "coverage-7.4.2-cp312-cp312-win32.whl", hash = "sha256:f5df76c58977bc35a49515b2fbba84a1d952ff0ec784a4070334dfbec28a2def"},
+    {file = "coverage-7.4.2-cp312-cp312-win_amd64.whl", hash = "sha256:34423abbaad70fea9d0164add189eabaea679068ebdf693baa5c02d03e7db244"},
+    {file = "coverage-7.4.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:5b11f9c6587668e495cc7365f85c93bed34c3a81f9f08b0920b87a89acc13469"},
+    {file = "coverage-7.4.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:51593a1f05c39332f623d64d910445fdec3d2ac2d96b37ce7f331882d5678ddf"},
+    {file = "coverage-7.4.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:69f1665165ba2fe7614e2f0c1aed71e14d83510bf67e2ee13df467d1c08bf1e8"},
+    {file = "coverage-7.4.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b3c8bbb95a699c80a167478478efe5e09ad31680931ec280bf2087905e3b95ec"},
+    {file = "coverage-7.4.2-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:175f56572f25e1e1201d2b3e07b71ca4d201bf0b9cb8fad3f1dfae6a4188de86"},
+    {file = "coverage-7.4.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:8562ca91e8c40864942615b1d0b12289d3e745e6b2da901d133f52f2d510a1e3"},
+    {file = "coverage-7.4.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:d9a1ef0f173e1a19738f154fb3644f90d0ada56fe6c9b422f992b04266c55d5a"},
+    {file = "coverage-7.4.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:f40ac873045db4fd98a6f40387d242bde2708a3f8167bd967ccd43ad46394ba2"},
+    {file = "coverage-7.4.2-cp38-cp38-win32.whl", hash = "sha256:d1b750a8409bec61caa7824bfd64a8074b6d2d420433f64c161a8335796c7c6b"},
+    {file = "coverage-7.4.2-cp38-cp38-win_amd64.whl", hash = "sha256:b4ae777bebaed89e3a7e80c4a03fac434a98a8abb5251b2a957d38fe3fd30088"},
+    {file = "coverage-7.4.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:3ff7f92ae5a456101ca8f48387fd3c56eb96353588e686286f50633a611afc95"},
+    {file = "coverage-7.4.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:861d75402269ffda0b33af94694b8e0703563116b04c681b1832903fac8fd647"},
+    {file = "coverage-7.4.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3507427d83fa961cbd73f11140f4a5ce84208d31756f7238d6257b2d3d868405"},
+    {file = "coverage-7.4.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:bf711d517e21fb5bc429f5c4308fbc430a8585ff2a43e88540264ae87871e36a"},
+    {file = "coverage-7.4.2-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c00e54f0bd258ab25e7f731ca1d5144b0bf7bec0051abccd2bdcff65fa3262c9"},
+    {file = "coverage-7.4.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:f8e845d894e39fb53834da826078f6dc1a933b32b1478cf437007367efaf6f6a"},
+    {file = "coverage-7.4.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:840456cb1067dc350af9080298c7c2cfdddcedc1cb1e0b30dceecdaf7be1a2d3"},
+    {file = "coverage-7.4.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:c11ca2df2206a4e3e4c4567f52594637392ed05d7c7fb73b4ea1c658ba560265"},
+    {file = "coverage-7.4.2-cp39-cp39-win32.whl", hash = "sha256:3ff5bdb08d8938d336ce4088ca1a1e4b6c8cd3bef8bb3a4c0eb2f37406e49643"},
+    {file = "coverage-7.4.2-cp39-cp39-win_amd64.whl", hash = "sha256:ac9e95cefcf044c98d4e2c829cd0669918585755dd9a92e28a1a7012322d0a95"},
+    {file = "coverage-7.4.2-pp38.pp39.pp310-none-any.whl", hash = "sha256:f593a4a90118d99014517c2679e04a4ef5aee2d81aa05c26c734d271065efcb6"},
+    {file = "coverage-7.4.2.tar.gz", hash = "sha256:1a5ee18e3a8d766075ce9314ed1cb695414bae67df6a4b0805f5137d93d6f1cb"},
 ]
 
 [package.extras]
@@ -1415,6 +1415,16 @@ files = [
     {file = "MarkupSafe-2.1.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:5bbe06f8eeafd38e5d0a4894ffec89378b6c6a625ff57e3028921f8ff59318ac"},
     {file = "MarkupSafe-2.1.3-cp311-cp311-win32.whl", hash = "sha256:dd15ff04ffd7e05ffcb7fe79f1b98041b8ea30ae9234aed2a9168b5797c3effb"},
     {file = "MarkupSafe-2.1.3-cp311-cp311-win_amd64.whl", hash = "sha256:134da1eca9ec0ae528110ccc9e48041e0828d79f24121a1a146161103c76e686"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:f698de3fd0c4e6972b92290a45bd9b1536bffe8c6759c62471efaa8acb4c37bc"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:aa57bd9cf8ae831a362185ee444e15a93ecb2e344c8e52e4d721ea3ab6ef1823"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffcc3f7c66b5f5b7931a5aa68fc9cecc51e685ef90282f4a82f0f5e9b704ad11"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:47d4f1c5f80fc62fdd7777d0d40a2e9dda0a05883ab11374334f6c4de38adffd"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1f67c7038d560d92149c060157d623c542173016c4babc0c1913cca0564b9939"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:9aad3c1755095ce347e26488214ef77e0485a3c34a50c5a5e2471dff60b9dd9c"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:14ff806850827afd6b07a5f32bd917fb7f45b046ba40c57abdb636674a8b559c"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8f9293864fe09b8149f0cc42ce56e3f0e54de883a9de90cd427f191c346eb2e1"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-win32.whl", hash = "sha256:715d3562f79d540f251b99ebd6d8baa547118974341db04f5ad06d5ea3eb8007"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-win_amd64.whl", hash = "sha256:1b8dd8c3fd14349433c79fa8abeb573a55fc0fdd769133baac1f5e07abf54aeb"},
     {file = "MarkupSafe-2.1.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:8e254ae696c88d98da6555f5ace2279cf7cd5b3f52be2b5cf97feafe883b58d2"},
     {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cb0932dc158471523c9637e807d9bfb93e06a95cbf010f1a38b98623b929ef2b"},
     {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9402b03f1a1b4dc4c19845e5c749e3ab82d5078d16a2a4c2cd2df62d57bb0707"},
@@ -2453,6 +2463,7 @@ files = [
     {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"},
     {file = "PyYAML-6.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28"},
     {file = "PyYAML-6.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9"},
+    {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a08c6f0fe150303c1c6b71ebcd7213c2858041a7e01975da3a99aed1e7a378ef"},
     {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0"},
     {file = "PyYAML-6.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4"},
     {file = "PyYAML-6.0.1-cp312-cp312-win32.whl", hash = "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54"},

From 4180dca164540c7ec5653e2bed7c56c3b1fbc5ac Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Fri, 23 Feb 2024 11:24:03 -0500
Subject: [PATCH 71/89] Last bits of cleanup with pytest configuration for E2E
 tests

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 tests/conftest.py                      |  85 --------------------
 tests/end_to_end/__init__.py           |   0
 tests/end_to_end/conftest.py           | 105 +++++++++++++++++++++++++
 tests/end_to_end/test_accounts_page.py |  20 +----
 4 files changed, 107 insertions(+), 103 deletions(-)
 create mode 100644 tests/end_to_end/__init__.py
 create mode 100644 tests/end_to_end/conftest.py

diff --git a/tests/conftest.py b/tests/conftest.py
index 4a397b7ec..6c4f94b4f 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,7 +1,6 @@
 import copy
 import json
 import os
-import re
 from contextlib import contextmanager
 from datetime import date, datetime, timedelta
 from unittest.mock import Mock, PropertyMock
@@ -36,8 +35,6 @@ from . import (
 
 load_dotenv()
 
-E2E_TEST_URI = os.getenv("NOTIFY_E2E_TEST_URI")
-
 
 class ElementNotFound(Exception):
     pass
@@ -3521,88 +3518,6 @@ def mock_get_invited_org_user_by_id(mocker, sample_org_invite):
     )
 
 
-def login_for_end_to_end_testing(browser):
-    # Open a new page and go to the staging site.
-    context = browser.new_context()
-    page = context.new_page()
-    page.goto(f"{E2E_TEST_URI}/")
-
-    sign_in_button = page.get_by_role("link", name="Sign in")
-
-    # Test trying to sign in.
-    sign_in_button.click()
-
-    # Wait for the next page to fully load.
-    page.wait_for_load_state("domcontentloaded")
-
-    # Check for the sign in form elements.
-    # NOTE:  Playwright cannot find input elements by role and recommends using
-    #        get_by_label() instead; however, hidden form elements do not have
-    #        labels associated with them, hence the XPath!
-    # See https://playwright.dev/python/docs/api/class-page#page-get-by-label
-    # and https://playwright.dev/python/docs/locators#locate-by-css-or-xpath
-    # for more information.
-    email_address_input = page.get_by_label("Email address")
-    password_input = page.get_by_label("Password")
-    continue_button = page.get_by_role("button", name=re.compile("Continue"))
-
-    # Sign in to the site.
-    email_address_input.fill(os.getenv("NOTIFY_E2E_TEST_EMAIL"))
-    password_input.fill(os.getenv("NOTIFY_E2E_TEST_PASSWORD"))
-    continue_button.click()
-
-    # Wait for the next page to fully load.
-    page.wait_for_load_state("domcontentloaded")
-
-    # Check for the sign in form elements.
-    # NOTE:  Playwright cannot find input elements by role and recommends using
-    #        get_by_label() instead; however, hidden form elements do not have
-    #        labels associated with them, hence the XPath!
-    # See https://playwright.dev/python/docs/api/class-page#page-get-by-label
-    # and https://playwright.dev/python/docs/locators#locate-by-css-or-xpath
-    # for more information.
-    # mfa_input = page.get_by_label('Text message code')
-    # continue_button = page.get_by_role('button', name=re.compile('Continue'))
-
-    # # Enter MFA code and continue.
-    # TODO: Revisit this at a later point in time.
-    # totp = pyotp.TOTP(
-    #     os.getenv('MFA_TOTP_SECRET'),
-    #     digits=int(os.getenv('MFA_TOTP_LENGTH'))
-    # )
-
-    # mfa_input.fill(totp.now())
-    # continue_button.click()
-
-    # page.wait_for_load_state('domcontentloaded')
-
-    # Save storage state into the file.
-    auth_state_path = os.path.join(
-        os.getenv("NOTIFY_E2E_AUTH_STATE_PATH"), "state.json"
-    )
-    context.storage_state(path=auth_state_path)
-
-
-@pytest.fixture(scope="session")
-def end_to_end_context(browser):
-    context = browser.new_context()
-    return context
-
-
-@pytest.fixture(scope="session")
-def end_to_end_authenticated_context(browser):
-    # Create and load a previously authenticated context for Playwright E2E
-    # tests.
-    # login_for_end_to_end_testing(browser)
-
-    auth_state_path = os.path.join(
-        os.getenv("NOTIFY_E2E_AUTH_STATE_PATH"), "state.json"
-    )
-    context = browser.new_context(storage_state=auth_state_path)
-
-    return context
-
-
 @pytest.fixture()
 def fake_markdown_file():
     input = "#Test"
diff --git a/tests/end_to_end/__init__.py b/tests/end_to_end/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/end_to_end/conftest.py b/tests/end_to_end/conftest.py
new file mode 100644
index 000000000..6abd2e231
--- /dev/null
+++ b/tests/end_to_end/conftest.py
@@ -0,0 +1,105 @@
+import os
+import re
+
+import pytest
+
+E2E_TEST_URI = os.getenv("NOTIFY_E2E_TEST_URI")
+
+
+def login_for_end_to_end_testing(browser):
+    # Open a new page and go to the staging site.
+    context = browser.new_context()
+    page = context.new_page()
+    page.goto(f"{E2E_TEST_URI}/")
+
+    sign_in_button = page.get_by_role("link", name="Sign in")
+
+    # Test trying to sign in.
+    sign_in_button.click()
+
+    # Wait for the next page to fully load.
+    page.wait_for_load_state("domcontentloaded")
+
+    # Check for the sign in form elements.
+    # NOTE:  Playwright cannot find input elements by role and recommends using
+    #        get_by_label() instead; however, hidden form elements do not have
+    #        labels associated with them, hence the XPath!
+    # See https://playwright.dev/python/docs/api/class-page#page-get-by-label
+    # and https://playwright.dev/python/docs/locators#locate-by-css-or-xpath
+    # for more information.
+    email_address_input = page.get_by_label("Email address")
+    password_input = page.get_by_label("Password")
+    continue_button = page.get_by_role("button", name=re.compile("Continue"))
+
+    # Sign in to the site.
+    email_address_input.fill(os.getenv("NOTIFY_E2E_TEST_EMAIL"))
+    password_input.fill(os.getenv("NOTIFY_E2E_TEST_PASSWORD"))
+    continue_button.click()
+
+    # Wait for the next page to fully load.
+    page.wait_for_load_state("domcontentloaded")
+
+    # Check for the sign in form elements.
+    # NOTE:  Playwright cannot find input elements by role and recommends using
+    #        get_by_label() instead; however, hidden form elements do not have
+    #        labels associated with them, hence the XPath!
+    # See https://playwright.dev/python/docs/api/class-page#page-get-by-label
+    # and https://playwright.dev/python/docs/locators#locate-by-css-or-xpath
+    # for more information.
+    # mfa_input = page.get_by_label('Text message code')
+    # continue_button = page.get_by_role('button', name=re.compile('Continue'))
+
+    # # Enter MFA code and continue.
+    # TODO: Revisit this at a later point in time.
+    # totp = pyotp.TOTP(
+    #     os.getenv('MFA_TOTP_SECRET'),
+    #     digits=int(os.getenv('MFA_TOTP_LENGTH'))
+    # )
+
+    # mfa_input.fill(totp.now())
+    # continue_button.click()
+
+    # page.wait_for_load_state('domcontentloaded')
+
+    # Save storage state into the file.
+    auth_state_path = os.path.join(
+        os.getenv("NOTIFY_E2E_AUTH_STATE_PATH"), "state.json"
+    )
+    context.storage_state(path=auth_state_path)
+
+
+@pytest.fixture(scope="session")
+def end_to_end_context(browser):
+    context = browser.new_context()
+    return context
+
+
+@pytest.fixture(scope="session")
+def end_to_end_authenticated_context(browser):
+    # Create and load a previously authenticated context for Playwright E2E
+    # tests.
+    # login_for_end_to_end_testing(browser)
+
+    auth_state_path = os.path.join(
+        os.getenv("NOTIFY_E2E_AUTH_STATE_PATH"), "state.json"
+    )
+    context = browser.new_context(storage_state=auth_state_path)
+
+    return context
+
+
+@pytest.fixture(scope="session")
+def bypass_sign_in(end_to_end_context):
+    # Open a new page and go to the staging site.
+    page = end_to_end_context.new_page()
+
+    page.goto(f"{E2E_TEST_URI}/")
+
+    sign_in_button = page.get_by_role("link", name="Sign in")
+
+    # Sign in to the site - E2E test accounts are set to flow through.
+    sign_in_button.click()
+
+    # Wait for the next page to fully load.
+    page.wait_for_load_state("domcontentloaded")
+    return page
diff --git a/tests/end_to_end/test_accounts_page.py b/tests/end_to_end/test_accounts_page.py
index 8484e58b0..89357c7ed 100644
--- a/tests/end_to_end/test_accounts_page.py
+++ b/tests/end_to_end/test_accounts_page.py
@@ -7,24 +7,8 @@ from playwright.sync_api import expect
 E2E_TEST_URI = os.getenv("NOTIFY_E2E_TEST_URI")
 
 
-def _bypass_sign_in(end_to_end_context):
-    # Open a new page and go to the staging site.
-    page = end_to_end_context.new_page()
-
-    page.goto(f"{E2E_TEST_URI}/")
-
-    sign_in_button = page.get_by_role("link", name="Sign in")
-
-    # Sign in to the site - E2E test accounts are set to flow through.
-    sign_in_button.click()
-
-    # Wait for the next page to fully load.
-    page.wait_for_load_state("domcontentloaded")
-    return page
-
-
-def test_add_new_service_workflow(end_to_end_context):
-    page = _bypass_sign_in(end_to_end_context)
+def test_add_new_service_workflow(bypass_sign_in, end_to_end_context):
+    page = bypass_sign_in(end_to_end_context)
     page.goto(f"{E2E_TEST_URI}/")
 
     # Wait for the next page to fully load.

From d0c4b505b9d45565a032a566934cee1df8690393 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 Feb 2024 16:35:56 +0000
Subject: [PATCH 72/89] Bump black from 23.12.1 to 24.2.0

Bumps [black](https://github.com/psf/black) from 23.12.1 to 24.2.0.
- [Release notes](https://github.com/psf/black/releases)
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md)
- [Commits](https://github.com/psf/black/compare/23.12.1...24.2.0)

---
updated-dependencies:
- dependency-name: black
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 48 ++++++++++++++++++++++++------------------------
 pyproject.toml |  2 +-
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 6940ef336..d59ea1c83 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -85,33 +85,33 @@ lxml = ["lxml"]
 
 [[package]]
 name = "black"
-version = "23.12.1"
+version = "24.2.0"
 description = "The uncompromising code formatter."
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "black-23.12.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:e0aaf6041986767a5e0ce663c7a2f0e9eaf21e6ff87a5f95cbf3675bfd4c41d2"},
-    {file = "black-23.12.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:c88b3711d12905b74206227109272673edce0cb29f27e1385f33b0163c414bba"},
-    {file = "black-23.12.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a920b569dc6b3472513ba6ddea21f440d4b4c699494d2e972a1753cdc25df7b0"},
-    {file = "black-23.12.1-cp310-cp310-win_amd64.whl", hash = "sha256:3fa4be75ef2a6b96ea8d92b1587dd8cb3a35c7e3d51f0738ced0781c3aa3a5a3"},
-    {file = "black-23.12.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:8d4df77958a622f9b5a4c96edb4b8c0034f8434032ab11077ec6c56ae9f384ba"},
-    {file = "black-23.12.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:602cfb1196dc692424c70b6507593a2b29aac0547c1be9a1d1365f0d964c353b"},
-    {file = "black-23.12.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9c4352800f14be5b4864016882cdba10755bd50805c95f728011bcb47a4afd59"},
-    {file = "black-23.12.1-cp311-cp311-win_amd64.whl", hash = "sha256:0808494f2b2df923ffc5723ed3c7b096bd76341f6213989759287611e9837d50"},
-    {file = "black-23.12.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:25e57fd232a6d6ff3f4478a6fd0580838e47c93c83eaf1ccc92d4faf27112c4e"},
-    {file = "black-23.12.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:2d9e13db441c509a3763a7a3d9a49ccc1b4e974a47be4e08ade2a228876500ec"},
-    {file = "black-23.12.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6d1bd9c210f8b109b1762ec9fd36592fdd528485aadb3f5849b2740ef17e674e"},
-    {file = "black-23.12.1-cp312-cp312-win_amd64.whl", hash = "sha256:ae76c22bde5cbb6bfd211ec343ded2163bba7883c7bc77f6b756a1049436fbb9"},
-    {file = "black-23.12.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:1fa88a0f74e50e4487477bc0bb900c6781dbddfdfa32691e780bf854c3b4a47f"},
-    {file = "black-23.12.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:a4d6a9668e45ad99d2f8ec70d5c8c04ef4f32f648ef39048d010b0689832ec6d"},
-    {file = "black-23.12.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b18fb2ae6c4bb63eebe5be6bd869ba2f14fd0259bda7d18a46b764d8fb86298a"},
-    {file = "black-23.12.1-cp38-cp38-win_amd64.whl", hash = "sha256:c04b6d9d20e9c13f43eee8ea87d44156b8505ca8a3c878773f68b4e4812a421e"},
-    {file = "black-23.12.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:3e1b38b3135fd4c025c28c55ddfc236b05af657828a8a6abe5deec419a0b7055"},
-    {file = "black-23.12.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:4f0031eaa7b921db76decd73636ef3a12c942ed367d8c3841a0739412b260a54"},
-    {file = "black-23.12.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:97e56155c6b737854e60a9ab1c598ff2533d57e7506d97af5481141671abf3ea"},
-    {file = "black-23.12.1-cp39-cp39-win_amd64.whl", hash = "sha256:dd15245c8b68fe2b6bd0f32c1556509d11bb33aec9b5d0866dd8e2ed3dba09c2"},
-    {file = "black-23.12.1-py3-none-any.whl", hash = "sha256:78baad24af0f033958cad29731e27363183e140962595def56423e626f4bee3e"},
-    {file = "black-23.12.1.tar.gz", hash = "sha256:4ce3ef14ebe8d9509188014d96af1c456a910d5b5cbf434a09fef7e024b3d0d5"},
+    {file = "black-24.2.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:6981eae48b3b33399c8757036c7f5d48a535b962a7c2310d19361edeef64ce29"},
+    {file = "black-24.2.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:d533d5e3259720fdbc1b37444491b024003e012c5173f7d06825a77508085430"},
+    {file = "black-24.2.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:61a0391772490ddfb8a693c067df1ef5227257e72b0e4108482b8d41b5aee13f"},
+    {file = "black-24.2.0-cp310-cp310-win_amd64.whl", hash = "sha256:992e451b04667116680cb88f63449267c13e1ad134f30087dec8527242e9862a"},
+    {file = "black-24.2.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:163baf4ef40e6897a2a9b83890e59141cc8c2a98f2dda5080dc15c00ee1e62cd"},
+    {file = "black-24.2.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:e37c99f89929af50ffaf912454b3e3b47fd64109659026b678c091a4cd450fb2"},
+    {file = "black-24.2.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4f9de21bafcba9683853f6c96c2d515e364aee631b178eaa5145fc1c61a3cc92"},
+    {file = "black-24.2.0-cp311-cp311-win_amd64.whl", hash = "sha256:9db528bccb9e8e20c08e716b3b09c6bdd64da0dd129b11e160bf082d4642ac23"},
+    {file = "black-24.2.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:d84f29eb3ee44859052073b7636533ec995bd0f64e2fb43aeceefc70090e752b"},
+    {file = "black-24.2.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:1e08fb9a15c914b81dd734ddd7fb10513016e5ce7e6704bdd5e1251ceee51ac9"},
+    {file = "black-24.2.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:810d445ae6069ce64030c78ff6127cd9cd178a9ac3361435708b907d8a04c693"},
+    {file = "black-24.2.0-cp312-cp312-win_amd64.whl", hash = "sha256:ba15742a13de85e9b8f3239c8f807723991fbfae24bad92d34a2b12e81904982"},
+    {file = "black-24.2.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:7e53a8c630f71db01b28cd9602a1ada68c937cbf2c333e6ed041390d6968faf4"},
+    {file = "black-24.2.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:93601c2deb321b4bad8f95df408e3fb3943d85012dddb6121336b8e24a0d1218"},
+    {file = "black-24.2.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a0057f800de6acc4407fe75bb147b0c2b5cbb7c3ed110d3e5999cd01184d53b0"},
+    {file = "black-24.2.0-cp38-cp38-win_amd64.whl", hash = "sha256:faf2ee02e6612577ba0181f4347bcbcf591eb122f7841ae5ba233d12c39dcb4d"},
+    {file = "black-24.2.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:057c3dc602eaa6fdc451069bd027a1b2635028b575a6c3acfd63193ced20d9c8"},
+    {file = "black-24.2.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:08654d0797e65f2423f850fc8e16a0ce50925f9337fb4a4a176a7aa4026e63f8"},
+    {file = "black-24.2.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ca610d29415ee1a30a3f30fab7a8f4144e9d34c89a235d81292a1edb2b55f540"},
+    {file = "black-24.2.0-cp39-cp39-win_amd64.whl", hash = "sha256:4dd76e9468d5536abd40ffbc7a247f83b2324f0c050556d9c371c2b9a9a95e31"},
+    {file = "black-24.2.0-py3-none-any.whl", hash = "sha256:e8a6ae970537e67830776488bca52000eaa37fa63b9988e8c487458d9cd5ace6"},
+    {file = "black-24.2.0.tar.gz", hash = "sha256:bce4f25c27c3435e4dace4815bcb2008b87e167e3bf4ee47ccdc5ce906eb4894"},
 ]
 
 [package.dependencies]
@@ -3075,4 +3075,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p
 [metadata]
 lock-version = "2.0"
 python-versions = ">=3.9,<3.12"
-content-hash = "be46f8e90d6213db5c54d62c3a364c0a2a7e50f5c8e5007ad662067a6191c51f"
+content-hash = "8e278df4a6ff892ffe61cd197988c1282eb0c7b228685e7c4df6c35b9bd4e4fc"
diff --git a/pyproject.toml b/pyproject.toml
index 49ea4dbe3..f073a7b41 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -41,7 +41,7 @@ markdown = "^3.5.2"
 
 [tool.poetry.group.dev.dependencies]
 bandit = "*"
-black = "^23.12.1"
+black = "^24.2.0"
 coverage = "*"
 freezegun = "^1.4.0"
 flake8 = "^6.1.0"

From 4741b381c2545bff5857ff1cd835c8bf1fd23e2e Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Fri, 23 Feb 2024 11:39:14 -0500
Subject: [PATCH 73/89] Adjusting authenticated page fixture

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 tests/end_to_end/conftest.py           | 2 +-
 tests/end_to_end/test_accounts_page.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/end_to_end/conftest.py b/tests/end_to_end/conftest.py
index 6abd2e231..48d1bcd35 100644
--- a/tests/end_to_end/conftest.py
+++ b/tests/end_to_end/conftest.py
@@ -89,7 +89,7 @@ def end_to_end_authenticated_context(browser):
 
 
 @pytest.fixture(scope="session")
-def bypass_sign_in(end_to_end_context):
+def authenticated_page(end_to_end_context):
     # Open a new page and go to the staging site.
     page = end_to_end_context.new_page()
 
diff --git a/tests/end_to_end/test_accounts_page.py b/tests/end_to_end/test_accounts_page.py
index 89357c7ed..411728e33 100644
--- a/tests/end_to_end/test_accounts_page.py
+++ b/tests/end_to_end/test_accounts_page.py
@@ -7,8 +7,8 @@ from playwright.sync_api import expect
 E2E_TEST_URI = os.getenv("NOTIFY_E2E_TEST_URI")
 
 
-def test_add_new_service_workflow(bypass_sign_in, end_to_end_context):
-    page = bypass_sign_in(end_to_end_context)
+def test_add_new_service_workflow(authenticated_page, end_to_end_context):
+    page = authenticated_page
     page.goto(f"{E2E_TEST_URI}/")
 
     # Wait for the next page to fully load.

From 673df7da3dc42bfe5cb5745a0c3f0e211a857a5c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 Feb 2024 16:50:02 +0000
Subject: [PATCH 74/89] Bump vulture from 2.10 to 2.11

Bumps [vulture](https://github.com/jendrikseipp/vulture) from 2.10 to 2.11.
- [Release notes](https://github.com/jendrikseipp/vulture/releases)
- [Changelog](https://github.com/jendrikseipp/vulture/blob/main/CHANGELOG.md)
- [Commits](https://github.com/jendrikseipp/vulture/compare/v2.10...v2.11)

---
updated-dependencies:
- dependency-name: vulture
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 10 +++++-----
 pyproject.toml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index d59ea1c83..7683c5f41 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -2962,17 +2962,17 @@ test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "coverage-enable-subprocess
 
 [[package]]
 name = "vulture"
-version = "2.10"
+version = "2.11"
 description = "Find dead code"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "vulture-2.10-py2.py3-none-any.whl", hash = "sha256:568a4176db7468d0157817ae3bb1847a19f1ddc629849af487f9d3b279bff77d"},
-    {file = "vulture-2.10.tar.gz", hash = "sha256:2a5c3160bffba77595b6e6dfcc412016bd2a09cd4b66cdf7fbba913684899f6f"},
+    {file = "vulture-2.11-py2.py3-none-any.whl", hash = "sha256:12d745f7710ffbf6aeb8279ba9068a24d4e52e8ed333b8b044035c9d6b823aba"},
+    {file = "vulture-2.11.tar.gz", hash = "sha256:f0fbb60bce6511aad87ee0736c502456737490a82d919a44e6d92262cb35f1c2"},
 ]
 
 [package.dependencies]
-toml = "*"
+tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""}
 
 [[package]]
 name = "webencodings"
@@ -3075,4 +3075,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p
 [metadata]
 lock-version = "2.0"
 python-versions = ">=3.9,<3.12"
-content-hash = "8e278df4a6ff892ffe61cd197988c1282eb0c7b228685e7c4df6c35b9bd4e4fc"
+content-hash = "4be613fced755d73cade0c71aded7e23729844421c40cf28a78e40d6b81f828d"
diff --git a/pyproject.toml b/pyproject.toml
index f073a7b41..58183668c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -60,7 +60,7 @@ pytest-playwright = "^0.4.3"
 pytest-xdist = "^3.5.0"
 radon = "^6.0.1"
 requests-mock = "^1.11.0"
-vulture = "^2.10"
+vulture = "^2.11"
 
 
 [build-system]

From c71a7edcfeac058657266c6db81cd981056c4836 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 Feb 2024 17:01:47 +0000
Subject: [PATCH 75/89] Bump flake8 from 6.1.0 to 7.0.0

Bumps [flake8](https://github.com/pycqa/flake8) from 6.1.0 to 7.0.0.
- [Commits](https://github.com/pycqa/flake8/compare/6.1.0...7.0.0)

---
updated-dependencies:
- dependency-name: flake8
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 16 ++++++++--------
 pyproject.toml |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 7683c5f41..a7e09cf85 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -727,19 +727,19 @@ typing = ["typing-extensions (>=4.8)"]
 
 [[package]]
 name = "flake8"
-version = "6.1.0"
+version = "7.0.0"
 description = "the modular source code checker: pep8 pyflakes and co"
 optional = false
 python-versions = ">=3.8.1"
 files = [
-    {file = "flake8-6.1.0-py2.py3-none-any.whl", hash = "sha256:ffdfce58ea94c6580c77888a86506937f9a1a227dfcd15f245d694ae20a6b6e5"},
-    {file = "flake8-6.1.0.tar.gz", hash = "sha256:d5b3857f07c030bdb5bf41c7f53799571d75c4491748a3adcd47de929e34cd23"},
+    {file = "flake8-7.0.0-py2.py3-none-any.whl", hash = "sha256:a6dfbb75e03252917f2473ea9653f7cd799c3064e54d4c8140044c5c065f53c3"},
+    {file = "flake8-7.0.0.tar.gz", hash = "sha256:33f96621059e65eec474169085dc92bf26e7b2d47366b70be2f67ab80dc25132"},
 ]
 
 [package.dependencies]
 mccabe = ">=0.7.0,<0.8.0"
 pycodestyle = ">=2.11.0,<2.12.0"
-pyflakes = ">=3.1.0,<3.2.0"
+pyflakes = ">=3.2.0,<3.3.0"
 
 [[package]]
 name = "flake8-bugbear"
@@ -2168,13 +2168,13 @@ pyexcel-io = ">=0.6.2"
 
 [[package]]
 name = "pyflakes"
-version = "3.1.0"
+version = "3.2.0"
 description = "passive checker of Python programs"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "pyflakes-3.1.0-py2.py3-none-any.whl", hash = "sha256:4132f6d49cb4dae6819e5379898f2b8cce3c5f23994194c24b77d5da2e36f774"},
-    {file = "pyflakes-3.1.0.tar.gz", hash = "sha256:a0aae034c444db0071aa077972ba4768d40c830d9539fd45bf4cd3f8f6992efc"},
+    {file = "pyflakes-3.2.0-py2.py3-none-any.whl", hash = "sha256:84b5be138a2dfbb40689ca07e2152deb896a65c3a3e24c251c5c62489568074a"},
+    {file = "pyflakes-3.2.0.tar.gz", hash = "sha256:1c61603ff154621fb2a9172037d84dca3500def8c8b630657d1701f026f8af3f"},
 ]
 
 [[package]]
@@ -3075,4 +3075,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p
 [metadata]
 lock-version = "2.0"
 python-versions = ">=3.9,<3.12"
-content-hash = "4be613fced755d73cade0c71aded7e23729844421c40cf28a78e40d6b81f828d"
+content-hash = "1021999aefa9b1f83453706c25c87226b61da5d07b58bf2593dbd97eb5db844c"
diff --git a/pyproject.toml b/pyproject.toml
index 58183668c..e1f2ae143 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -44,7 +44,7 @@ bandit = "*"
 black = "^24.2.0"
 coverage = "*"
 freezegun = "^1.4.0"
-flake8 = "^6.1.0"
+flake8 = "^7.0.0"
 flake8-bugbear = "^24.1.17"
 flake8-print = "^5.0.0"
 flake8-pytest-style = "^1.7.2"

From 25646c2e2f26e8b92f78320e7ec4d4ab4f42f78b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 Feb 2024 17:18:04 +0000
Subject: [PATCH 76/89] Bump notifications-python-client from 8.2.0 to 9.0.0

Bumps [notifications-python-client](https://github.com/alphagov/notifications-python-client) from 8.2.0 to 9.0.0.
- [Changelog](https://github.com/alphagov/notifications-python-client/blob/main/CHANGELOG.md)
- [Commits](https://github.com/alphagov/notifications-python-client/compare/8.2.0...9.0.0)

---
updated-dependencies:
- dependency-name: notifications-python-client
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 6 +++---
 pyproject.toml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index a7e09cf85..74a0b0ac6 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1672,12 +1672,12 @@ setuptools = "*"
 
 [[package]]
 name = "notifications-python-client"
-version = "8.2.0"
+version = "9.0.0"
 description = "Python API client for GOV.UK Notify."
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "notifications_python_client-8.2.0-py3-none-any.whl", hash = "sha256:8cd8bd01ae603a972a5413c430ca42b16f6481f37d98406c3e9b68c1c192f59e"},
+    {file = "notifications_python_client-9.0.0-py3-none-any.whl", hash = "sha256:664a5b5da2aa1a00efa8106bfa4855db04da95d79586e5edfb0411637d20d2d9"},
 ]
 
 [package.dependencies]
@@ -3075,4 +3075,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p
 [metadata]
 lock-version = "2.0"
 python-versions = ">=3.9,<3.12"
-content-hash = "1021999aefa9b1f83453706c25c87226b61da5d07b58bf2593dbd97eb5db844c"
+content-hash = "30e3f9f8e1a094e67cc780b496641dfbe33e639cefccf35ee3b1553c9a683b71"
diff --git a/pyproject.toml b/pyproject.toml
index e1f2ae143..5aed7711a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -22,7 +22,7 @@ humanize = "~=4.9"
 itsdangerous = "~=2.1"
 jinja2 = "~=3.1"
 newrelic = "*"
-notifications-python-client = "==8.2.0"
+notifications-python-client = "==9.0.0"
 notifications-utils = {git = "https://github.com/GSA/notifications-utils.git"}
 pyexcel = "==0.7.0"
 pyexcel-io = "==0.6.6"

From e71351d94938779145a1478c6683e3eafcc5a327 Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Fri, 23 Feb 2024 16:02:16 -0500
Subject: [PATCH 77/89] Add E2E documentation and clean E2E tests

This changeset adds additional documentation for how to write new E2E tests and cleans up the two existing tests slightly to make better use of the fixtures that are defined.

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 docs/end_to_end_tests.md                      | 99 +++++++++++++++++++
 tests/end_to_end/conftest.py                  | 21 +++-
 tests/end_to_end/test_accounts_page.py        |  4 -
 .../test_landing_and_sign_in_pages.py         |  9 +-
 4 files changed, 118 insertions(+), 15 deletions(-)

diff --git a/docs/end_to_end_tests.md b/docs/end_to_end_tests.md
index 02eec2e8b..557bdf327 100644
--- a/docs/end_to_end_tests.md
+++ b/docs/end_to_end_tests.md
@@ -106,6 +106,105 @@ All of the E2E tests are found in the `tests/end_to_end` folder and are
 written as `pytest` scripts using
 [Playwright's Python Framework](https://playwright.dev/python/docs/writing-tests).
 
+Inside the `tests/end_to_end` folder you'll see a `conftest.py` file,
+which is similar to the one found in the root `tests` folder but is
+specific to the E2E tests.
+
+There a few fixtures defined in here, but the three most important at
+this time are these:
+
+- `end_to_end_context`:  A Playwright context object needed to interact
+  with a browser instance.
+- `authenticated_page`:  A Playwright page object that has gone through
+  the sign in process the E2E user is authenticated.
+- `unauthenticated_page`:  A Playwright page object that has only loaded
+  the home page; no authentication done.
+
+In short, if you're starting a test from scratch and testing pages that
+do not require authentication, you'll start with the
+`unauthenticated_page` fixture and work from there.
+
+Any test that requires you to be authenticated, you'll start with the
+`authenticated_page` object as that'll have taken care of getting
+everything set for you and logged into the site with the E2E test user.
+
+The `end_to_end_context` fixture is there more for the two page than for
+direct use, but there may be instances where it's easier to get data
+or manipulate tests in ways that are better done with the context object
+instead of working back from the page object.
+
+
+### Creating a new test file
+
+If you want to create a new test file to help organize tests (a great
+idea!), it will be handy to import the Playwright `expect` and set the
+base URL/URI for yourself, like this:
+
+```python
+from playwright.sync_api import expect
+
+E2E_TEST_URI = os.getenv("NOTIFY_E2E_TEST_URI")
+```
+
+By importing Playwright's `expect` object for tests and setting
+something like `E2E_TEST_URI` for yourself, it will make writing tests
+much easier.
+
+
+### Using the fixtures
+
+To use the `authenticated_page` or `unauthenticated_page` fixtures, you
+start by defining a test function and then passing in the fixture you
+need as a positional argument.  This works the same as the other
+functions defined to create a test for pytest.
+
+For example, the test for the landing page starts with this:
+
+```python
+def test_landing_page(unauthenticated_page):
+    page = unauthenticated_page
+    ...
+```
+
+Note the passing in of the `unauthenticated_page` fixture - there is no
+need to import this or anything, just pass it into the function.  pytest
+takes care of everything else for you.
+
+The second line that defines a `page` variable is a convenience, since
+you'll be referencing the page object a lot.  This is recommended to
+help keep tests readable while keeping fixture names descriptive.
+
+If you need to test an authenticate page, such as the accounts page,
+use the `authenticated_page` fixture instead, like so:
+
+```python
+def test_add_new_service_workflow(authenticated_page):
+    page = authenticated_page
+    ...
+```
+
+Again, it's helpful to assign the fixture to a `page` variable for easy
+reference throughout the test.
+
+Lastly, if you need want access to the Playwright context object that is
+used behind the page fixtures, you can reference it directly as well:
+
+```python
+def test_add_new_service_workflow(authenticated_page, end_to_end_context):
+    page = authenticated_page
+
+    # Prepare for adding a new service later in the test.
+    current_date_time = datetime.datetime.now()
+    new_service_name = "E2E Federal Test Service {now} - {browser_type}".format(
+        now=current_date_time.strftime("%m/%d/%Y %H:%M:%S"),
+        browser_type=end_to_end_context.browser.browser_type.name,
+    )
+    ...
+```
+
+In this example, I've used the context to get to the browser object
+itself to get the name of the browser for test data.
+
 
 ## Maintaining E2E Tests with GitHub
 
diff --git a/tests/end_to_end/conftest.py b/tests/end_to_end/conftest.py
index 48d1bcd35..4819ec007 100644
--- a/tests/end_to_end/conftest.py
+++ b/tests/end_to_end/conftest.py
@@ -89,17 +89,30 @@ def end_to_end_authenticated_context(browser):
 
 
 @pytest.fixture(scope="session")
-def authenticated_page(end_to_end_context):
-    # Open a new page and go to the staging site.
+def unauthenticated_page(end_to_end_context):
     page = end_to_end_context.new_page()
-
     page.goto(f"{E2E_TEST_URI}/")
 
-    sign_in_button = page.get_by_role("link", name="Sign in")
+    # Wait for the next page to fully load.
+    page.wait_for_load_state("domcontentloaded")
+
+    return page
+
+
+@pytest.fixture(scope="session")
+def authenticated_page(end_to_end_context):
+    # Open a new page and go to the site.
+    page = end_to_end_context.new_page()
+    page.goto(f"{E2E_TEST_URI}/")
+
+    # Wait for the next page to fully load.
+    page.wait_for_load_state("domcontentloaded")
 
     # Sign in to the site - E2E test accounts are set to flow through.
+    sign_in_button = page.get_by_role("link", name="Sign in")
     sign_in_button.click()
 
     # Wait for the next page to fully load.
     page.wait_for_load_state("domcontentloaded")
+
     return page
diff --git a/tests/end_to_end/test_accounts_page.py b/tests/end_to_end/test_accounts_page.py
index 411728e33..b6fe8c5ac 100644
--- a/tests/end_to_end/test_accounts_page.py
+++ b/tests/end_to_end/test_accounts_page.py
@@ -9,10 +9,6 @@ E2E_TEST_URI = os.getenv("NOTIFY_E2E_TEST_URI")
 
 def test_add_new_service_workflow(authenticated_page, end_to_end_context):
     page = authenticated_page
-    page.goto(f"{E2E_TEST_URI}/")
-
-    # Wait for the next page to fully load.
-    page.wait_for_load_state("domcontentloaded")
 
     # Prepare for adding a new service later in the test.
     current_date_time = datetime.datetime.now()
diff --git a/tests/end_to_end/test_landing_and_sign_in_pages.py b/tests/end_to_end/test_landing_and_sign_in_pages.py
index dd6a70beb..8b0f04f86 100644
--- a/tests/end_to_end/test_landing_and_sign_in_pages.py
+++ b/tests/end_to_end/test_landing_and_sign_in_pages.py
@@ -6,13 +6,8 @@ from playwright.sync_api import expect
 E2E_TEST_URI = os.getenv("NOTIFY_E2E_TEST_URI")
 
 
-def test_landing_page(end_to_end_context):
-    # Open a new page and go to the staging site.
-    page = end_to_end_context.browser.new_page()
-    page.goto(f"{E2E_TEST_URI}/")
-
-    # Check to make sure that we've arrived at the next page.
-    page.wait_for_load_state("domcontentloaded")
+def test_landing_page(unauthenticated_page):
+    page = unauthenticated_page
 
     # Check the page title exists and matches what we expect.
     expect(page).to_have_title(re.compile("Notify.gov"))

From 34d20c4d65cb6a23d10b7bf5df02adb3122e8ff0 Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Fri, 23 Feb 2024 16:53:39 -0500
Subject: [PATCH 78/89] Trying to get landing page test working again

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 tests/end_to_end/test_landing_and_sign_in_pages.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/end_to_end/test_landing_and_sign_in_pages.py b/tests/end_to_end/test_landing_and_sign_in_pages.py
index 8b0f04f86..ab1f885b1 100644
--- a/tests/end_to_end/test_landing_and_sign_in_pages.py
+++ b/tests/end_to_end/test_landing_and_sign_in_pages.py
@@ -7,7 +7,12 @@ E2E_TEST_URI = os.getenv("NOTIFY_E2E_TEST_URI")
 
 
 def test_landing_page(unauthenticated_page):
+    # Open a new page and go to the staging site.
     page = unauthenticated_page
+    page.goto(f"{E2E_TEST_URI}/")
+
+    # Check to make sure that we've arrived at the next page.
+    page.wait_for_load_state("domcontentloaded")
 
     # Check the page title exists and matches what we expect.
     expect(page).to_have_title(re.compile("Notify.gov"))

From c891bc1b3f800c60dc5bef7b9392dbdf394e256d Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Fri, 23 Feb 2024 17:02:18 -0500
Subject: [PATCH 79/89] Another attempt at fixing the landing page test

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 tests/end_to_end/conftest.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/tests/end_to_end/conftest.py b/tests/end_to_end/conftest.py
index 4819ec007..91e52ac40 100644
--- a/tests/end_to_end/conftest.py
+++ b/tests/end_to_end/conftest.py
@@ -91,11 +91,6 @@ def end_to_end_authenticated_context(browser):
 @pytest.fixture(scope="session")
 def unauthenticated_page(end_to_end_context):
     page = end_to_end_context.new_page()
-    page.goto(f"{E2E_TEST_URI}/")
-
-    # Wait for the next page to fully load.
-    page.wait_for_load_state("domcontentloaded")
-
     return page
 
 

From 5c6a23c87342f5ea50b4c438a92db9bdb2d2ae34 Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Fri, 23 Feb 2024 17:10:41 -0500
Subject: [PATCH 80/89] Undo changes to the landing page test

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 tests/end_to_end/conftest.py                       | 11 +++--------
 tests/end_to_end/test_landing_and_sign_in_pages.py |  6 +++---
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/tests/end_to_end/conftest.py b/tests/end_to_end/conftest.py
index 91e52ac40..f21fbe0fc 100644
--- a/tests/end_to_end/conftest.py
+++ b/tests/end_to_end/conftest.py
@@ -68,11 +68,6 @@ def login_for_end_to_end_testing(browser):
     context.storage_state(path=auth_state_path)
 
 
-@pytest.fixture(scope="session")
-def end_to_end_context(browser):
-    context = browser.new_context()
-    return context
-
 
 @pytest.fixture(scope="session")
 def end_to_end_authenticated_context(browser):
@@ -89,9 +84,9 @@ def end_to_end_authenticated_context(browser):
 
 
 @pytest.fixture(scope="session")
-def unauthenticated_page(end_to_end_context):
-    page = end_to_end_context.new_page()
-    return page
+def end_to_end_context(browser):
+    context = browser.new_context()
+    return context
 
 
 @pytest.fixture(scope="session")
diff --git a/tests/end_to_end/test_landing_and_sign_in_pages.py b/tests/end_to_end/test_landing_and_sign_in_pages.py
index ab1f885b1..a9148cb31 100644
--- a/tests/end_to_end/test_landing_and_sign_in_pages.py
+++ b/tests/end_to_end/test_landing_and_sign_in_pages.py
@@ -6,9 +6,9 @@ from playwright.sync_api import expect
 E2E_TEST_URI = os.getenv("NOTIFY_E2E_TEST_URI")
 
 
-def test_landing_page(unauthenticated_page):
-    # Open a new page and go to the staging site.
-    page = unauthenticated_page
+def test_landing_page(end_to_end_context):
+    # Open a new page and go to the site.
+    page = end_to_end_context.browser.new_page()
     page.goto(f"{E2E_TEST_URI}/")
 
     # Check to make sure that we've arrived at the next page.

From 564fc7352120829ad28320eb9897736efaaa3f3e Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Fri, 23 Feb 2024 17:38:47 -0500
Subject: [PATCH 81/89] Fixed up documentation to match current state;
 blackened formatting

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 docs/end_to_end_tests.md                      | 29 +++++++++----------
 tests/app/main/views/test_manage_users.py     |  6 ++--
 tests/app/main/views/test_template_folders.py |  8 +++--
 tests/conftest.py                             | 14 +++++----
 tests/end_to_end/conftest.py                  |  1 -
 5 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/docs/end_to_end_tests.md b/docs/end_to_end_tests.md
index 557bdf327..11758a16e 100644
--- a/docs/end_to_end_tests.md
+++ b/docs/end_to_end_tests.md
@@ -110,29 +110,22 @@ Inside the `tests/end_to_end` folder you'll see a `conftest.py` file,
 which is similar to the one found in the root `tests` folder but is
 specific to the E2E tests.
 
-There a few fixtures defined in here, but the three most important at
-this time are these:
+There a few fixtures defined in here, but the two most important at this
+time are these:
 
 - `end_to_end_context`:  A Playwright context object needed to interact
   with a browser instance.
 - `authenticated_page`:  A Playwright page object that has gone through
   the sign in process the E2E user is authenticated.
-- `unauthenticated_page`:  A Playwright page object that has only loaded
-  the home page; no authentication done.
 
 In short, if you're starting a test from scratch and testing pages that
 do not require authentication, you'll start with the
-`unauthenticated_page` fixture and work from there.
+`end_to_end_context` fixture and work from there.
 
 Any test that requires you to be authenticated, you'll start with the
 `authenticated_page` object as that'll have taken care of getting
 everything set for you and logged into the site with the E2E test user.
 
-The `end_to_end_context` fixture is there more for the two page than for
-direct use, but there may be instances where it's easier to get data
-or manipulate tests in ways that are better done with the context object
-instead of working back from the page object.
-
 
 ### Creating a new test file
 
@@ -153,7 +146,7 @@ much easier.
 
 ### Using the fixtures
 
-To use the `authenticated_page` or `unauthenticated_page` fixtures, you
+To use the `authenticated_page` or `end_to_end_context` fixtures, you
 start by defining a test function and then passing in the fixture you
 need as a positional argument.  This works the same as the other
 functions defined to create a test for pytest.
@@ -161,12 +154,17 @@ functions defined to create a test for pytest.
 For example, the test for the landing page starts with this:
 
 ```python
-def test_landing_page(unauthenticated_page):
-    page = unauthenticated_page
+def test_landing_page(end_to_end_context):
+    # Open a new page and go to the site.
+    page = end_to_end_context.browser.new_page()
+    page.goto(f"{E2E_TEST_URI}/")
+
+    # Check to make sure that we've arrived at the next page.
+    page.wait_for_load_state("domcontentloaded")
     ...
 ```
 
-Note the passing in of the `unauthenticated_page` fixture - there is no
+Note the passing in of the `end_to_end_context` fixture - there is no
 need to import this or anything, just pass it into the function.  pytest
 takes care of everything else for you.
 
@@ -187,7 +185,8 @@ Again, it's helpful to assign the fixture to a `page` variable for easy
 reference throughout the test.
 
 Lastly, if you need want access to the Playwright context object that is
-used behind the page fixtures, you can reference it directly as well:
+used behind the page fixtures, you can reference it directly as well
+using the `end_to_end_context` fixture:
 
 ```python
 def test_add_new_service_workflow(authenticated_page, end_to_end_context):
diff --git a/tests/app/main/views/test_manage_users.py b/tests/app/main/views/test_manage_users.py
index 9bdabf925..c3d128155 100644
--- a/tests/app/main/views/test_manage_users.py
+++ b/tests/app/main/views/test_manage_users.py
@@ -862,9 +862,9 @@ def test_should_show_page_if_prefilled_user_is_already_invited(
     mock_get_invites_for_service,
     platform_admin_user,
 ):
-    active_user_with_permission_to_other_service[
-        "email_address"
-    ] = "user_1@testnotify.gsa.gov"
+    active_user_with_permission_to_other_service["email_address"] = (
+        "user_1@testnotify.gsa.gov"
+    )
     client_request.login(platform_admin_user)
     mocker.patch(
         "app.models.user.user_api_client.get_user",
diff --git a/tests/app/main/views/test_template_folders.py b/tests/app/main/views/test_template_folders.py
index fae020e58..0bf2fcb08 100644
--- a/tests/app/main/views/test_template_folders.py
+++ b/tests/app/main/views/test_template_folders.py
@@ -31,9 +31,11 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
         "name": name,
         "id": folder_id or str(uuid.uuid4()),
         "parent_id": parent,
-        "users_with_permission": users_with_permission
-        if users_with_permission is not None
-        else [sample_uuid()],
+        "users_with_permission": (
+            users_with_permission
+            if users_with_permission is not None
+            else [sample_uuid()]
+        ),
     }
 
 
diff --git a/tests/conftest.py b/tests/conftest.py
index 6c4f94b4f..4c2ceeea9 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -904,9 +904,11 @@ def create_service_templates(service_id, number_of_templates=4):
                 "{}_template_{}".format(template_type, template_number),
                 template_type,
                 "{} template {} content".format(template_type, template_number),
-                subject="{} template {} subject".format(template_type, template_number)
-                if template_type == "email"
-                else None,
+                subject=(
+                    "{} template {} subject".format(template_type, template_number)
+                    if template_type == "email"
+                    else None
+                ),
             )
         )
 
@@ -1101,9 +1103,9 @@ def active_user_with_permission_to_other_service(
     active_user_with_permission_to_two_services["permissions"].pop(SERVICE_ONE_ID)
     active_user_with_permission_to_two_services["services"].pop(0)
     active_user_with_permission_to_two_services["name"] = "Service Two User"
-    active_user_with_permission_to_two_services[
-        "email_address"
-    ] = "service-two-user@test.gsa.gov"
+    active_user_with_permission_to_two_services["email_address"] = (
+        "service-two-user@test.gsa.gov"
+    )
     return active_user_with_permission_to_two_services
 
 
diff --git a/tests/end_to_end/conftest.py b/tests/end_to_end/conftest.py
index f21fbe0fc..16940d4e0 100644
--- a/tests/end_to_end/conftest.py
+++ b/tests/end_to_end/conftest.py
@@ -68,7 +68,6 @@ def login_for_end_to_end_testing(browser):
     context.storage_state(path=auth_state_path)
 
 
-
 @pytest.fixture(scope="session")
 def end_to_end_authenticated_context(browser):
     # Create and load a previously authenticated context for Playwright E2E

From 66909e96249a56385b8454c25505a31a731a7762 Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Fri, 23 Feb 2024 17:50:25 -0800
Subject: [PATCH 82/89] added conditional

---
 app/main/views/dashboard.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/main/views/dashboard.py b/app/main/views/dashboard.py
index 24b3e0490..4d5aca14d 100644
--- a/app/main/views/dashboard.py
+++ b/app/main/views/dashboard.py
@@ -76,6 +76,7 @@ def service_dashboard(service_id):
             "notifications": aggregate_notifications_by_job.get(job["id"], []),
         }
         for job in job_response
+        if aggregate_notifications_by_job.get(job["id"], [])
     ]
     return render_template(
         "views/dashboard/dashboard.html",

From 470574e1971b47fe4e6329c8f701323c2116569e Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Tue, 20 Feb 2024 08:28:26 -0800
Subject: [PATCH 83/89] enable login.gov link on demo and production and adjust
 test

---
 app/main/views/sign_in.py            | 2 +-
 tests/app/main/views/test_sign_in.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/main/views/sign_in.py b/app/main/views/sign_in.py
index be313c59b..853b33648 100644
--- a/app/main/views/sign_in.py
+++ b/app/main/views/sign_in.py
@@ -198,7 +198,7 @@ def sign_in():
         form=form,
         again=bool(redirect_url),
         other_device=other_device,
-        login_gov_enabled=bool(notify_env in ["development", "staging"]),
+        login_gov_enabled=True,
         password_reset_url=password_reset_url,
         initial_signin_url=initial_signin_url,
     )
diff --git a/tests/app/main/views/test_sign_in.py b/tests/app/main/views/test_sign_in.py
index 7970afa08..453790536 100644
--- a/tests/app/main/views/test_sign_in.py
+++ b/tests/app/main/views/test_sign_in.py
@@ -21,8 +21,8 @@ def test_render_sign_in_template_for_new_user(client_request):
     # Removing for the pilot
     # assert page.select('main a')[0].text == 'create one now'
     # assert page.select('main a')[0]['href'] == url_for('main.register')
-    assert page.select("main a")[0].text == "Forgot your password?"
-    assert page.select("main a")[0]["href"] == url_for("main.forgot_password")
+    assert page.select("main a")[1].text == "Forgot your password?"
+    assert page.select("main a")[1]["href"] == url_for("main.forgot_password")
     assert "Sign in again" not in normalize_spaces(page.text)
 
 

From 4e32ef37b6515e04d3215e0ed8b39d6f8e93954b Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Tue, 20 Feb 2024 12:43:31 -0500
Subject: [PATCH 84/89] Adjust connectivity to Login.gov

- Adds Login.gov to remaining egress proxies (both prototype and production URLs)
- Swaps links to Login.gov to production environment

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 .github/workflows/deploy-demo.yml                      | 10 +++++-----
 .github/workflows/deploy.yml                           | 10 +++++-----
 deploy-config/egress_proxy/notify-admin-demo.allow.acl |  2 ++
 .../egress_proxy/notify-admin-production.allow.acl     |  2 ++
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/deploy-demo.yml b/.github/workflows/deploy-demo.yml
index e1d76775a..bf9757493 100644
--- a/.github/workflows/deploy-demo.yml
+++ b/.github/workflows/deploy-demo.yml
@@ -56,12 +56,12 @@ jobs:
           NR_BROWSER_KEY: ${{ secrets.NR_BROWSER_KEY }}
           LOGIN_PEM: ${{ secrets.LOGIN_PEM }}
           LOGIN_DOT_GOV_CLIENT_ID: "urn:gov:gsa:openidconnect.profiles:sp:sso:gsa:notify-gov"
-          LOGIN_DOT_GOV_USER_INFO_URL: "https://idp.int.identitysandbox.gov/api/openid_connect/userinfo"
-          LOGIN_DOT_GOV_ACCESS_TOKEN_URL: "https://idp.int.identitysandbox.gov/api/openid_connect/token"
-          LOGIN_DOT_GOV_LOGOUT_URL: "https://idp.int.identitysandbox.gov/openid_connect/logout?client_id=urn:gov:gsa:openidconnect.profiles:sp:sso:gsa:notify-gov&post_logout_redirect_uri=https://notify-demo.app.cloud.gov/sign-out"
-          LOGIN_DOT_GOV_BASE_LOGOUT_URL: "https://idp.int.identitysandbox.gov/openid_connect/logout?"
+          LOGIN_DOT_GOV_USER_INFO_URL: "https://secure.login.gov/api/openid_connect/userinfo"
+          LOGIN_DOT_GOV_ACCESS_TOKEN_URL: "https://secure.login.gov/api/openid_connect/token"
+          LOGIN_DOT_GOV_LOGOUT_URL: "https://secure.login.gov/openid_connect/logout?client_id=urn:gov:gsa:openidconnect.profiles:sp:sso:gsa:notify-gov&post_logout_redirect_uri=https://notify-demo.app.cloud.gov/sign-out"
+          LOGIN_DOT_GOV_BASE_LOGOUT_URL: "https://secure.login.gov/openid_connect/logout?"
           LOGIN_DOT_GOV_SIGNOUT_REDIRECT: "https://notify-demo.app.cloud.gov/sign-out"
-          LOGIN_DOT_GOV_INITIAL_SIGNIN_URL: "https://idp.int.identitysandbox.gov/openid_connect/authorize?acr_values=http%3A%2F%2Fidmanagement.gov%2Fns%2Fassurance%2Fial%2F1&client_id=urn:gov:gsa:openidconnect.profiles:sp:sso:gsa:notify-gov&nonce=01234567890123456789012345&prompt=select_account&redirect_uri=https://notify-demo.app.cloud.gov/sign-in&response_type=code&scope=openid+email&state=abcdefghijklmnopabcdefghijklmnop"
+          LOGIN_DOT_GOV_INITIAL_SIGNIN_URL: "https://secure.login.gov/openid_connect/authorize?acr_values=http%3A%2F%2Fidmanagement.gov%2Fns%2Fassurance%2Fial%2F1&client_id=urn:gov:gsa:openidconnect.profiles:sp:sso:gsa:notify-gov&nonce=01234567890123456789012345&prompt=select_account&redirect_uri=https://notify-demo.app.cloud.gov/sign-in&response_type=code&scope=openid+email&state=abcdefghijklmnopabcdefghijklmnop"
         with:
           cf_username: ${{ secrets.CLOUDGOV_USERNAME }}
           cf_password: ${{ secrets.CLOUDGOV_PASSWORD }}
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 767acae72..915994d58 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -62,12 +62,12 @@ jobs:
           NR_BROWSER_KEY: ${{ secrets.NR_BROWSER_KEY }}
           LOGIN_PEM: ${{ secrets.LOGIN_PEM }}
           LOGIN_DOT_GOV_CLIENT_ID: "urn:gov:gsa:openidconnect.profiles:sp:sso:gsa:notify-gov"
-          LOGIN_DOT_GOV_USER_INFO_URL: "https://idp.int.identitysandbox.gov/api/openid_connect/userinfo"
-          LOGIN_DOT_GOV_ACCESS_TOKEN_URL: "https://idp.int.identitysandbox.gov/api/openid_connect/token"
-          LOGIN_DOT_GOV_LOGOUT_URL: "https://idp.int.identitysandbox.gov/openid_connect/logout?client_id=urn:gov:gsa:openidconnect.profiles:sp:sso:gsa:notify-gov&post_logout_redirect_uri=https://notify-staging.app.cloud.gov/sign-out"
-          LOGIN_DOT_GOV_BASE_LOGOUT_URL: "https://idp.int.identitysandbox.gov/openid_connect/logout?"
+          LOGIN_DOT_GOV_USER_INFO_URL: "https://secure.login.gov/api/openid_connect/userinfo"
+          LOGIN_DOT_GOV_ACCESS_TOKEN_URL: "https://secure.login.gov/api/openid_connect/token"
+          LOGIN_DOT_GOV_LOGOUT_URL: "https://secure.login.gov/openid_connect/logout?client_id=urn:gov:gsa:openidconnect.profiles:sp:sso:gsa:notify-gov&post_logout_redirect_uri=https://notify-staging.app.cloud.gov/sign-out"
+          LOGIN_DOT_GOV_BASE_LOGOUT_URL: "https://secure.login.gov/openid_connect/logout?"
           LOGIN_DOT_GOV_SIGNOUT_REDIRECT: "https://notify-staging.app.cloud.gov/sign-out"
-          LOGIN_DOT_GOV_INITIAL_SIGNIN_URL: "https://idp.int.identitysandbox.gov/openid_connect/authorize?acr_values=http%3A%2F%2Fidmanagement.gov%2Fns%2Fassurance%2Fial%2F1&client_id=urn:gov:gsa:openidconnect.profiles:sp:sso:gsa:notify-gov&nonce=01234567890123456789012345&prompt=select_account&redirect_uri=https://notify-staging.app.cloud.gov/sign-in&response_type=code&scope=openid+email&state=abcdefghijklmnopabcdefghijklmnop"
+          LOGIN_DOT_GOV_INITIAL_SIGNIN_URL: "https://secure.login.gov/openid_connect/authorize?acr_values=http%3A%2F%2Fidmanagement.gov%2Fns%2Fassurance%2Fial%2F1&client_id=urn:gov:gsa:openidconnect.profiles:sp:sso:gsa:notify-gov&nonce=01234567890123456789012345&prompt=select_account&redirect_uri=https://notify-staging.app.cloud.gov/sign-in&response_type=code&scope=openid+email&state=abcdefghijklmnopabcdefghijklmnop"
         with:
           cf_username: ${{ secrets.CLOUDGOV_USERNAME }}
           cf_password: ${{ secrets.CLOUDGOV_PASSWORD }}
diff --git a/deploy-config/egress_proxy/notify-admin-demo.allow.acl b/deploy-config/egress_proxy/notify-admin-demo.allow.acl
index 4718f99e7..41bf3a365 100644
--- a/deploy-config/egress_proxy/notify-admin-demo.allow.acl
+++ b/deploy-config/egress_proxy/notify-admin-demo.allow.acl
@@ -1,2 +1,4 @@
 gov-collector.newrelic.com
 egress-proxy-notify-admin-demo.apps.internal
+idp.int.identitysandbox.gov
+secure.login.gov
diff --git a/deploy-config/egress_proxy/notify-admin-production.allow.acl b/deploy-config/egress_proxy/notify-admin-production.allow.acl
index 2173a6b4b..8103b0915 100644
--- a/deploy-config/egress_proxy/notify-admin-production.allow.acl
+++ b/deploy-config/egress_proxy/notify-admin-production.allow.acl
@@ -1,2 +1,4 @@
 gov-collector.newrelic.com
 egress-proxy-notify-admin-production.apps.internal
+idp.int.identitysandbox.gov
+secure.login.gov

From 92fc35b6f60b2349f7a83f47d84c6f3d85022ba2 Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Mon, 26 Feb 2024 17:39:33 -0500
Subject: [PATCH 85/89] Only enable Login.gov link for demo right now

We are holding off on production until we have a chance to share more information with pilot partners.

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 app/main/views/sign_in.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/main/views/sign_in.py b/app/main/views/sign_in.py
index 853b33648..c6eaee87e 100644
--- a/app/main/views/sign_in.py
+++ b/app/main/views/sign_in.py
@@ -198,7 +198,7 @@ def sign_in():
         form=form,
         again=bool(redirect_url),
         other_device=other_device,
-        login_gov_enabled=True,
+        login_gov_enabled=bool(notify_env in ["development", "staging", "demo"]),
         password_reset_url=password_reset_url,
         initial_signin_url=initial_signin_url,
     )

From f8b8dd5fb3018f428c57563d08d1b9e187347c5b Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Mon, 26 Feb 2024 17:59:18 -0500
Subject: [PATCH 86/89] Fix broken test and include note about why

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 tests/app/main/views/test_sign_in.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/app/main/views/test_sign_in.py b/tests/app/main/views/test_sign_in.py
index 453790536..5675946dc 100644
--- a/tests/app/main/views/test_sign_in.py
+++ b/tests/app/main/views/test_sign_in.py
@@ -21,8 +21,10 @@ def test_render_sign_in_template_for_new_user(client_request):
     # Removing for the pilot
     # assert page.select('main a')[0].text == 'create one now'
     # assert page.select('main a')[0]['href'] == url_for('main.register')
-    assert page.select("main a")[1].text == "Forgot your password?"
-    assert page.select("main a")[1]["href"] == url_for("main.forgot_password")
+    # TODO:  Fix this test to be less brittle! If the Login.gov link is enabled,
+    #        then these indices need to be 1 instead of 0.
+    assert page.select("main a")[0].text == "Forgot your password?"
+    assert page.select("main a")[0]["href"] == url_for("main.forgot_password")
     assert "Sign in again" not in normalize_spaces(page.text)
 
 

From 6ec0de4b63abc456c0f491f942094005c85f26cd Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Mon, 26 Feb 2024 18:07:26 -0500
Subject: [PATCH 87/89] One final note about why the test is brittle

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 tests/app/main/views/test_sign_in.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/app/main/views/test_sign_in.py b/tests/app/main/views/test_sign_in.py
index 5675946dc..f85c756ea 100644
--- a/tests/app/main/views/test_sign_in.py
+++ b/tests/app/main/views/test_sign_in.py
@@ -23,6 +23,7 @@ def test_render_sign_in_template_for_new_user(client_request):
     # assert page.select('main a')[0]['href'] == url_for('main.register')
     # TODO:  Fix this test to be less brittle! If the Login.gov link is enabled,
     #        then these indices need to be 1 instead of 0.
+    #        Currently it's not enabled for the test or production environments.
     assert page.select("main a")[0].text == "Forgot your password?"
     assert page.select("main a")[0]["href"] == url_for("main.forgot_password")
     assert "Sign in again" not in normalize_spaces(page.text)

From 2c6e02137bbdcdf1ccceeee49877c743dc518fce Mon Sep 17 00:00:00 2001
From: Jonathan Bobel <jonathan.bobel@gsa.gov>
Date: Thu, 1 Feb 2024 12:09:43 -0500
Subject: [PATCH 88/89] Updates per Meghan

---
 app/templates/views/guidance/index.html |  4 +--
 app/templates/views/roadmap.html        |  4 +--
 app/templates/views/security.html       | 37 ++-----------------------
 app/templates/views/support/index.html  |  6 ++--
 4 files changed, 9 insertions(+), 42 deletions(-)

diff --git a/app/templates/views/guidance/index.html b/app/templates/views/guidance/index.html
index e754ef245..b7d6ffa1a 100644
--- a/app/templates/views/guidance/index.html
+++ b/app/templates/views/guidance/index.html
@@ -41,7 +41,7 @@
   <h3>To create and format your message</h3>
   <ol class="list">
     <li>All messages start from a template</li>
-    <li>Click “Send Messages”. You’ll see existing templates.</li>
+    <li>Click “<a href={{ url_for('.choose_template', service_id=current_service.id) }}>Send Messages</a>”. You’ll see existing templates.</li>
     <li>Add a new template or choose an existing template and select Edit.</li>
   </ol>
 
@@ -120,7 +120,7 @@
 
 
   {# Identify your program #}
-  <h2 class="padding-top-1" id="identify-program">Identify your program</h2>
+  <h2 class="padding-top-1" id="indentify-program">Identify your program</h2>
   <p>You can help your recipients identify your texts as legitimate by customizing your messages to clearly state who they
   are from. Consider using the program or benefit name that is most familiar to your recipients.</p>
 
diff --git a/app/templates/views/roadmap.html b/app/templates/views/roadmap.html
index 6ea2e7cfb..58c9ad4d1 100644
--- a/app/templates/views/roadmap.html
+++ b/app/templates/views/roadmap.html
@@ -50,9 +50,9 @@
     <li>Message send/failure analytics</li>
   </ul>
 
-  <h3id="next">Next</h3>
+  <h3 id="next">Next</h3>
 
-  <p>If the pilot is successful, we hope to recruit additional high-impact partners to improve outcomes for low-income individuals and families.</p>
+  <p>If the pilot is successful, we hope to recruit additional partners to improve outcomes for low-income individuals and families.</p>
 
   <p>Goals during this stage:</p>
 
diff --git a/app/templates/views/security.html b/app/templates/views/security.html
index d676b37bf..35abece07 100644
--- a/app/templates/views/security.html
+++ b/app/templates/views/security.html
@@ -65,9 +65,9 @@
   <h3 class="font-body-lg">Protect sensitive information</h3>
   <p>Some messages include sensitive information like security codes or password reset links.</p>
   <p>If you’re sending a message with sensitive information, you can choose to hide those details on the Notify dashboard once the message has been sent. This means that only the message recipient will be able to see that information.</p>
+  <img src="{{ asset_url('images/product/security-review-message.png') }}"
+  alt="Screenshot of a teat message in review with the link to 'hide personalization after sending' circled.">
 
-  <h2 class="font-body-lg" id="user-permissions-signing-in">User permissions and signing in</h2>
-  <p>You can set different user permissions in Notify. This lets you control who in your team has access to certain parts of the service.</p>
   <h3 class="font-body-lg">Two-factor authentication</h3>
   <p>To sign in to Notify, you’ll need to enter:</p>
   <ul class="list list-bullet">
@@ -76,11 +76,6 @@
   </ul>
   <p>If signing in with a text message is a problem for your team, <a class="usa-link" href="{{ url_for('main.support') }}">contact us</a> to find out about using an email link instead.</p>
 
-  <img src="{{ asset_url('images/product/security-review-message.png') }}"
-    alt="Screenshot of a teat message in review with the link to 'hide personalization after sending' circled.">
-
-  <h4>How to hide PII after sending a message</h4>
-
   <h3>User permissions and signing in</h3>
   <p>You can set different user permissions in Notify. This lets you control who in your team has access to certain parts of
   the service.</p>
@@ -93,32 +88,4 @@
   </ul>
   <p>If signing in with a text message is a problem for your team, <a href="https://beta.notify.gov/support">contact us</a> to find out about using an email link instead.</p>
 
-  <!-- <h2 class="font-body-lg" id="information-risk-management">Information risk management</h2>
-  <p>Our approach to information risk management follows NCSC guidance. It assesses:</p>
-  <ul class="list list-bullet">
-    <li>how Notify is built</li>
-    <li>the infrastructure Notify is built upon</li>
-    <li>support for the Notify service</li>
-  </ul>
-  <p>This approach also applies to the service providers Notify uses to send messages.</p> -->
-
-  <!-- <h2 class="font-body-lg" id="how-we-manage-risk">How we manage risks on Notify</h2>
-  <p>Things we do to manage risks on Notify include:</p>
-  <ul class="list list-bullet">
-    <li>formal risk assessments based on <a class="usa-link" href="http://www.iso.org/iso/catalogue_detail?csnumber=56742">ISO 27005:2011</a> and National Cyber Security Centre guidance</li>
-    <li><a class="usa-link" href="https://www.ncsc.gov.uk/information/check-penetration-testing">CHECK</a>-based testing, both annually and when any major changes are made to Notify</li>
-    <li>residual risk statement preparation and active management of the risk treatment plan</li>
-    <li>regular updates to the Privacy Impact Assessment</li>
-    <li>security impact assessments</li>
-  </ul> -->
-
-  <!-- <h2 class="font-body-lg" id="cabinet-office-approval">Cabinet Office approval</h2>
-  <p>Notify has been assessed and approved by the Cabinet Office Senior Information Risk Officer (SIRO). The SIRO checks this approval once a year.</p>
-  <p>Notify also has approval from the Office of the Government’s SIRO to host data within the EEA.</p>
-
-  <h2 class="font-body-lg" id="classifications-and-security-vetting">Classifications and security vetting</h2>
-  <p>You can use Notify to send messages classified as ‘OFFICIAL’ or ‘OFFICIAL-SENSITIVE’ under the <a class="usa-link" href="https://www.gov.uk/government/publications/government-security-classifications">Government Security Classifications</a> policy.</p>
-  <p>Notify does not process data classified as ‘SECRET’ or ‘TOP SECRET’.</p>
-  <p>The Notify team has Security Check (SC) level clearance from <a class="usa-link" href="https://www.gov.uk/government/organizations/united-kingdom-security-vetting">United Kingdom Security Vetting</a> (UKSV).</p> -->
-
 {% endblock %}
diff --git a/app/templates/views/support/index.html b/app/templates/views/support/index.html
index d9d6abd53..dd5ad9c10 100644
--- a/app/templates/views/support/index.html
+++ b/app/templates/views/support/index.html
@@ -13,9 +13,9 @@
   <h1 class="font-body-2xl margin-bottom-3">Contact us</h1>
   <p>Notify is designed to be easy to use.</p>
   <ul class="list list-bullet">
-    <li>For information on personalization and data preparation, see <a href="/using-notify/guidance">Guidance</a>.</li>
-    <li>For help interpreting delivery reports, see <a href="/using-notify/delivery-status">Delivery Status</a>.</li>
-    <li>For details on pricing and what counts as a message part, see <a href="/using-notify/pricing"></a>Pricing.</li>
+    <li>For information on personalization and data preparation, see <a href={{ url_for("main.guidance_index") }}>Guidance</a>.</li>
+    <li>For help interpreting delivery reports, see <a href={{ url_for("main.message_status") }}>Delivery Status</a>.</li>
+    <li>For details on pricing and what counts as a message part, see <a href={{ url_for("main.pricing") }}>Pricing</a>.</li>
   </ul>
 
   <p>If you have other questions, we are available at <a class="usa-link" href="mailto:notify-support@gsa.gov">notify-support@gsa.gov</a>.</p>

From e9f96332870e9e0f59769dbbcf1cce9c5386938a Mon Sep 17 00:00:00 2001
From: Carlo Costino <ccostino@users.noreply.github.com>
Date: Tue, 27 Feb 2024 11:01:37 -0500
Subject: [PATCH 89/89] Fix typo

---
 app/templates/views/security.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/security.html b/app/templates/views/security.html
index 35abece07..6d0b3e67d 100644
--- a/app/templates/views/security.html
+++ b/app/templates/views/security.html
@@ -66,7 +66,7 @@
   <p>Some messages include sensitive information like security codes or password reset links.</p>
   <p>If you’re sending a message with sensitive information, you can choose to hide those details on the Notify dashboard once the message has been sent. This means that only the message recipient will be able to see that information.</p>
   <img src="{{ asset_url('images/product/security-review-message.png') }}"
-  alt="Screenshot of a teat message in review with the link to 'hide personalization after sending' circled.">
+  alt="Screenshot of a test message in review with the link to 'hide personalization after sending' circled.">
 
   <h3 class="font-body-lg">Two-factor authentication</h3>
   <p>To sign in to Notify, you’ll need to enter:</p>