From cc8f8dfcc2deebe15b6bf2c58ae443b965650b54 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Fri, 8 Sep 2023 08:38:27 -0700
Subject: [PATCH 1/8] initial

---
 app/main/views/sign_in.py              |  24 ++++
 app/main/views/verify.py               |   3 +
 poetry.lock                            | 191 +++++++++++++++----------
 pyproject.toml                         |   1 +
 tests/conftest.py                      |  15 +-
 tests/end_to_end/test_accounts_page.py |  10 +-
 6 files changed, 163 insertions(+), 81 deletions(-)

diff --git a/app/main/views/sign_in.py b/app/main/views/sign_in.py
index 75ca23117..00bd09994 100644
--- a/app/main/views/sign_in.py
+++ b/app/main/views/sign_in.py
@@ -1,3 +1,5 @@
+import os
+
 from flask import (
     Markup,
     abort,
@@ -13,6 +15,7 @@ from flask_login import current_user
 from app import login_manager
 from app.main import main
 from app.main.forms import LoginForm
+from app.main.views.verify import activate_user
 from app.models.user import InvitedUser, User
 from app.utils import hide_from_search_engines
 from app.utils.login import is_safe_redirect_url
@@ -21,7 +24,17 @@ from app.utils.login import is_safe_redirect_url
 @main.route("/sign-in", methods=(["GET", "POST"]))
 @hide_from_search_engines
 def sign_in():
+
     redirect_url = request.args.get("next")
+
+    # TODO this is not the right test to do to find test users
+    if os.getenv("NOTIFY_E2E_TEST_EMAIL") == 'ken.kehl@fedramp.gov':
+        user_id = session["user_details"]["id"]
+        activate_user(user_id)
+        return redirect(
+            url_for("main.show_accounts_or_dashboard", next=redirect_url)
+        )
+
     if current_user and current_user.is_authenticated:
         if redirect_url and is_safe_redirect_url(redirect_url):
             return redirect(redirect_url)
@@ -54,10 +67,21 @@ def sign_in():
                     else:
                         invited_user.accept_invite()
 
+                # TODO this is not the right test to do to find test users
+                if os.getenv("NOTIFY_E2E_TEST_EMAIL") == 'ken.kehl@fedramp.gov':
+                    user_id = session["user_details"]["id"]
+                    activate_user(user_id)
+                    return redirect(
+                        url_for("main.show_accounts_or_dashboard", next=redirect_url)
+                    )
+
                 user.send_login_code()
 
                 if user.sms_auth:
+
                     return redirect(url_for(".two_factor_sms", next=redirect_url))
+
+
                 if user.email_auth:
                     return redirect(
                         url_for(".two_factor_email_sent", next=redirect_url)
diff --git a/app/main/views/verify.py b/app/main/views/verify.py
index 0201edfcc..6c44d343f 100644
--- a/app/main/views/verify.py
+++ b/app/main/views/verify.py
@@ -16,6 +16,9 @@ from app.utils.login import redirect_to_sign_in
 def verify():
     user_id = session["user_details"]["id"]
 
+    print(f"RETURN ABRUPT WITH ACTIVATE USER")
+    return activate_user(user_id)
+
     def _check_code(code):
         return user_api_client.check_verify_code(user_id, code, "sms")
 
diff --git a/poetry.lock b/poetry.lock
index f90fac873..82c4cd167 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -155,19 +155,30 @@ files = [
     {file = "blinker-1.6.2.tar.gz", hash = "sha256:4afd3de66ef3a9f8067559fb7a1cbe555c17dcbe15971b05d1b625c3e7abe213"},
 ]
 
+[[package]]
+name = "boolean-py"
+version = "4.0"
+description = "Define boolean algebras, create and parse boolean expressions and create custom boolean DSL."
+optional = false
+python-versions = "*"
+files = [
+    {file = "boolean.py-4.0-py3-none-any.whl", hash = "sha256:2876f2051d7d6394a531d82dc6eb407faa0b01a0a0b3083817ccd7323b8d96bd"},
+    {file = "boolean.py-4.0.tar.gz", hash = "sha256:17b9a181630e43dde1851d42bef546d616d5d9b4480357514597e78b203d06e4"},
+]
+
 [[package]]
 name = "boto3"
-version = "1.28.40"
+version = "1.28.43"
 description = "The AWS SDK for Python"
 optional = false
 python-versions = ">= 3.7"
 files = [
-    {file = "boto3-1.28.40-py3-none-any.whl", hash = "sha256:bd7c760afb195eaeaab907dc6b2c21fa64ddbba3fed4a869e80d820ddbd6cc70"},
-    {file = "boto3-1.28.40.tar.gz", hash = "sha256:6ff9a5b815e106656596064d51c9b6ba97a307807baa5f89634384b7d3f7ecc6"},
+    {file = "boto3-1.28.43-py3-none-any.whl", hash = "sha256:4cd3e96900fb50bddc9f48007176c80d15396d08c5248b25a41220f3570e014f"},
+    {file = "boto3-1.28.43.tar.gz", hash = "sha256:c0211a3e830432851c73fa1e136b14dbb6d02b5c9a5e1272c557e63538620b88"},
 ]
 
 [package.dependencies]
-botocore = ">=1.31.40,<1.32.0"
+botocore = ">=1.31.43,<1.32.0"
 jmespath = ">=0.7.1,<2.0.0"
 s3transfer = ">=0.6.0,<0.7.0"
 
@@ -176,13 +187,13 @@ crt = ["botocore[crt] (>=1.21.0,<2.0a0)"]
 
 [[package]]
 name = "botocore"
-version = "1.31.40"
+version = "1.31.43"
 description = "Low-level, data-driven core of boto 3."
 optional = false
 python-versions = ">= 3.7"
 files = [
-    {file = "botocore-1.31.40-py3-none-any.whl", hash = "sha256:df766969f0d9ef9eda1a9c9946e0e173c10199f37a9e4c92861f11ddb5c9e702"},
-    {file = "botocore-1.31.40.tar.gz", hash = "sha256:ce22a82ef8674f49691477d09558992cc87e7331f65c6a5b0da897ab192240ca"},
+    {file = "botocore-1.31.43-py3-none-any.whl", hash = "sha256:d8b0c41c8c75d82f15fee57f7d54a852a99810faacbeb9d6f3f022558a2c330e"},
+    {file = "botocore-1.31.43.tar.gz", hash = "sha256:b4a3a1fcf75011351e2b0d3eb991f51f8d44a375d3e065f907dac67db232fc97"},
 ]
 
 [package.dependencies]
@@ -472,63 +483,63 @@ files = [
 
 [[package]]
 name = "coverage"
-version = "7.3.0"
+version = "7.3.1"
 description = "Code coverage measurement for Python"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "coverage-7.3.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:db76a1bcb51f02b2007adacbed4c88b6dee75342c37b05d1822815eed19edee5"},
-    {file = "coverage-7.3.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:c02cfa6c36144ab334d556989406837336c1d05215a9bdf44c0bc1d1ac1cb637"},
-    {file = "coverage-7.3.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:477c9430ad5d1b80b07f3c12f7120eef40bfbf849e9e7859e53b9c93b922d2af"},
-    {file = "coverage-7.3.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ce2ee86ca75f9f96072295c5ebb4ef2a43cecf2870b0ca5e7a1cbdd929cf67e1"},
-    {file = "coverage-7.3.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:68d8a0426b49c053013e631c0cdc09b952d857efa8f68121746b339912d27a12"},
-    {file = "coverage-7.3.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:b3eb0c93e2ea6445b2173da48cb548364f8f65bf68f3d090404080d338e3a689"},
-    {file = "coverage-7.3.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:90b6e2f0f66750c5a1178ffa9370dec6c508a8ca5265c42fbad3ccac210a7977"},
-    {file = "coverage-7.3.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:96d7d761aea65b291a98c84e1250cd57b5b51726821a6f2f8df65db89363be51"},
-    {file = "coverage-7.3.0-cp310-cp310-win32.whl", hash = "sha256:63c5b8ecbc3b3d5eb3a9d873dec60afc0cd5ff9d9f1c75981d8c31cfe4df8527"},
-    {file = "coverage-7.3.0-cp310-cp310-win_amd64.whl", hash = "sha256:97c44f4ee13bce914272589b6b41165bbb650e48fdb7bd5493a38bde8de730a1"},
-    {file = "coverage-7.3.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:74c160285f2dfe0acf0f72d425f3e970b21b6de04157fc65adc9fd07ee44177f"},
-    {file = "coverage-7.3.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:b543302a3707245d454fc49b8ecd2c2d5982b50eb63f3535244fd79a4be0c99d"},
-    {file = "coverage-7.3.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ad0f87826c4ebd3ef484502e79b39614e9c03a5d1510cfb623f4a4a051edc6fd"},
-    {file = "coverage-7.3.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:13c6cbbd5f31211d8fdb477f0f7b03438591bdd077054076eec362cf2207b4a7"},
-    {file = "coverage-7.3.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fac440c43e9b479d1241fe9d768645e7ccec3fb65dc3a5f6e90675e75c3f3e3a"},
-    {file = "coverage-7.3.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:3c9834d5e3df9d2aba0275c9f67989c590e05732439b3318fa37a725dff51e74"},
-    {file = "coverage-7.3.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:4c8e31cf29b60859876474034a83f59a14381af50cbe8a9dbaadbf70adc4b214"},
-    {file = "coverage-7.3.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:7a9baf8e230f9621f8e1d00c580394a0aa328fdac0df2b3f8384387c44083c0f"},
-    {file = "coverage-7.3.0-cp311-cp311-win32.whl", hash = "sha256:ccc51713b5581e12f93ccb9c5e39e8b5d4b16776d584c0f5e9e4e63381356482"},
-    {file = "coverage-7.3.0-cp311-cp311-win_amd64.whl", hash = "sha256:887665f00ea4e488501ba755a0e3c2cfd6278e846ada3185f42d391ef95e7e70"},
-    {file = "coverage-7.3.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:d000a739f9feed900381605a12a61f7aaced6beae832719ae0d15058a1e81c1b"},
-    {file = "coverage-7.3.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:59777652e245bb1e300e620ce2bef0d341945842e4eb888c23a7f1d9e143c446"},
-    {file = "coverage-7.3.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c9737bc49a9255d78da085fa04f628a310c2332b187cd49b958b0e494c125071"},
-    {file = "coverage-7.3.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5247bab12f84a1d608213b96b8af0cbb30d090d705b6663ad794c2f2a5e5b9fe"},
-    {file = "coverage-7.3.0-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e2ac9a1de294773b9fa77447ab7e529cf4fe3910f6a0832816e5f3d538cfea9a"},
-    {file = "coverage-7.3.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:85b7335c22455ec12444cec0d600533a238d6439d8d709d545158c1208483873"},
-    {file = "coverage-7.3.0-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:36ce5d43a072a036f287029a55b5c6a0e9bd73db58961a273b6dc11a2c6eb9c2"},
-    {file = "coverage-7.3.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:211a4576e984f96d9fce61766ffaed0115d5dab1419e4f63d6992b480c2bd60b"},
-    {file = "coverage-7.3.0-cp312-cp312-win32.whl", hash = "sha256:56afbf41fa4a7b27f6635bc4289050ac3ab7951b8a821bca46f5b024500e6321"},
-    {file = "coverage-7.3.0-cp312-cp312-win_amd64.whl", hash = "sha256:7f297e0c1ae55300ff688568b04ff26b01c13dfbf4c9d2b7d0cb688ac60df479"},
-    {file = "coverage-7.3.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:ac0dec90e7de0087d3d95fa0533e1d2d722dcc008bc7b60e1143402a04c117c1"},
-    {file = "coverage-7.3.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:438856d3f8f1e27f8e79b5410ae56650732a0dcfa94e756df88c7e2d24851fcd"},
-    {file = "coverage-7.3.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1084393c6bda8875c05e04fce5cfe1301a425f758eb012f010eab586f1f3905e"},
-    {file = "coverage-7.3.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:49ab200acf891e3dde19e5aa4b0f35d12d8b4bd805dc0be8792270c71bd56c54"},
-    {file = "coverage-7.3.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a67e6bbe756ed458646e1ef2b0778591ed4d1fcd4b146fc3ba2feb1a7afd4254"},
-    {file = "coverage-7.3.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:8f39c49faf5344af36042b293ce05c0d9004270d811c7080610b3e713251c9b0"},
-    {file = "coverage-7.3.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:7df91fb24c2edaabec4e0eee512ff3bc6ec20eb8dccac2e77001c1fe516c0c84"},
-    {file = "coverage-7.3.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:34f9f0763d5fa3035a315b69b428fe9c34d4fc2f615262d6be3d3bf3882fb985"},
-    {file = "coverage-7.3.0-cp38-cp38-win32.whl", hash = "sha256:bac329371d4c0d456e8d5f38a9b0816b446581b5f278474e416ea0c68c47dcd9"},
-    {file = "coverage-7.3.0-cp38-cp38-win_amd64.whl", hash = "sha256:b859128a093f135b556b4765658d5d2e758e1fae3e7cc2f8c10f26fe7005e543"},
-    {file = "coverage-7.3.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:fc0ed8d310afe013db1eedd37176d0839dc66c96bcfcce8f6607a73ffea2d6ba"},
-    {file = "coverage-7.3.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e61260ec93f99f2c2d93d264b564ba912bec502f679793c56f678ba5251f0393"},
-    {file = "coverage-7.3.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:97af9554a799bd7c58c0179cc8dbf14aa7ab50e1fd5fa73f90b9b7215874ba28"},
-    {file = "coverage-7.3.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3558e5b574d62f9c46b76120a5c7c16c4612dc2644c3d48a9f4064a705eaee95"},
-    {file = "coverage-7.3.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:37d5576d35fcb765fca05654f66aa71e2808d4237d026e64ac8b397ffa66a56a"},
-    {file = "coverage-7.3.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:07ea61bcb179f8f05ffd804d2732b09d23a1238642bf7e51dad62082b5019b34"},
-    {file = "coverage-7.3.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:80501d1b2270d7e8daf1b64b895745c3e234289e00d5f0e30923e706f110334e"},
-    {file = "coverage-7.3.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:4eddd3153d02204f22aef0825409091a91bf2a20bce06fe0f638f5c19a85de54"},
-    {file = "coverage-7.3.0-cp39-cp39-win32.whl", hash = "sha256:2d22172f938455c156e9af2612650f26cceea47dc86ca048fa4e0b2d21646ad3"},
-    {file = "coverage-7.3.0-cp39-cp39-win_amd64.whl", hash = "sha256:60f64e2007c9144375dd0f480a54d6070f00bb1a28f65c408370544091c9bc9e"},
-    {file = "coverage-7.3.0-pp38.pp39.pp310-none-any.whl", hash = "sha256:5492a6ce3bdb15c6ad66cb68a0244854d9917478877a25671d70378bdc8562d0"},
-    {file = "coverage-7.3.0.tar.gz", hash = "sha256:49dbb19cdcafc130f597d9e04a29d0a032ceedf729e41b181f51cd170e6ee865"},
+    {file = "coverage-7.3.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:cd0f7429ecfd1ff597389907045ff209c8fdb5b013d38cfa7c60728cb484b6e3"},
+    {file = "coverage-7.3.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:966f10df9b2b2115da87f50f6a248e313c72a668248be1b9060ce935c871f276"},
+    {file = "coverage-7.3.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0575c37e207bb9b98b6cf72fdaaa18ac909fb3d153083400c2d48e2e6d28bd8e"},
+    {file = "coverage-7.3.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:245c5a99254e83875c7fed8b8b2536f040997a9b76ac4c1da5bff398c06e860f"},
+    {file = "coverage-7.3.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4c96dd7798d83b960afc6c1feb9e5af537fc4908852ef025600374ff1a017392"},
+    {file = "coverage-7.3.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:de30c1aa80f30af0f6b2058a91505ea6e36d6535d437520067f525f7df123887"},
+    {file = "coverage-7.3.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:50dd1e2dd13dbbd856ffef69196781edff26c800a74f070d3b3e3389cab2600d"},
+    {file = "coverage-7.3.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:b9c0c19f70d30219113b18fe07e372b244fb2a773d4afde29d5a2f7930765136"},
+    {file = "coverage-7.3.1-cp310-cp310-win32.whl", hash = "sha256:770f143980cc16eb601ccfd571846e89a5fe4c03b4193f2e485268f224ab602f"},
+    {file = "coverage-7.3.1-cp310-cp310-win_amd64.whl", hash = "sha256:cdd088c00c39a27cfa5329349cc763a48761fdc785879220d54eb785c8a38520"},
+    {file = "coverage-7.3.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:74bb470399dc1989b535cb41f5ca7ab2af561e40def22d7e188e0a445e7639e3"},
+    {file = "coverage-7.3.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:025ded371f1ca280c035d91b43252adbb04d2aea4c7105252d3cbc227f03b375"},
+    {file = "coverage-7.3.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a6191b3a6ad3e09b6cfd75b45c6aeeffe7e3b0ad46b268345d159b8df8d835f9"},
+    {file = "coverage-7.3.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7eb0b188f30e41ddd659a529e385470aa6782f3b412f860ce22b2491c89b8593"},
+    {file = "coverage-7.3.1-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:75c8f0df9dfd8ff745bccff75867d63ef336e57cc22b2908ee725cc552689ec8"},
+    {file = "coverage-7.3.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:7eb3cd48d54b9bd0e73026dedce44773214064be93611deab0b6a43158c3d5a0"},
+    {file = "coverage-7.3.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:ac3c5b7e75acac31e490b7851595212ed951889918d398b7afa12736c85e13ce"},
+    {file = "coverage-7.3.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:5b4ee7080878077af0afa7238df1b967f00dc10763f6e1b66f5cced4abebb0a3"},
+    {file = "coverage-7.3.1-cp311-cp311-win32.whl", hash = "sha256:229c0dd2ccf956bf5aeede7e3131ca48b65beacde2029f0361b54bf93d36f45a"},
+    {file = "coverage-7.3.1-cp311-cp311-win_amd64.whl", hash = "sha256:c6f55d38818ca9596dc9019eae19a47410d5322408140d9a0076001a3dcb938c"},
+    {file = "coverage-7.3.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:5289490dd1c3bb86de4730a92261ae66ea8d44b79ed3cc26464f4c2cde581fbc"},
+    {file = "coverage-7.3.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:ca833941ec701fda15414be400c3259479bfde7ae6d806b69e63b3dc423b1832"},
+    {file = "coverage-7.3.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cd694e19c031733e446c8024dedd12a00cda87e1c10bd7b8539a87963685e969"},
+    {file = "coverage-7.3.1-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:aab8e9464c00da5cb9c536150b7fbcd8850d376d1151741dd0d16dfe1ba4fd26"},
+    {file = "coverage-7.3.1-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:87d38444efffd5b056fcc026c1e8d862191881143c3aa80bb11fcf9dca9ae204"},
+    {file = "coverage-7.3.1-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:8a07b692129b8a14ad7a37941a3029c291254feb7a4237f245cfae2de78de037"},
+    {file = "coverage-7.3.1-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:2829c65c8faaf55b868ed7af3c7477b76b1c6ebeee99a28f59a2cb5907a45760"},
+    {file = "coverage-7.3.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:1f111a7d85658ea52ffad7084088277135ec5f368457275fc57f11cebb15607f"},
+    {file = "coverage-7.3.1-cp312-cp312-win32.whl", hash = "sha256:c397c70cd20f6df7d2a52283857af622d5f23300c4ca8e5bd8c7a543825baa5a"},
+    {file = "coverage-7.3.1-cp312-cp312-win_amd64.whl", hash = "sha256:5ae4c6da8b3d123500f9525b50bf0168023313963e0e2e814badf9000dd6ef92"},
+    {file = "coverage-7.3.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:ca70466ca3a17460e8fc9cea7123c8cbef5ada4be3140a1ef8f7b63f2f37108f"},
+    {file = "coverage-7.3.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:f2781fd3cabc28278dc982a352f50c81c09a1a500cc2086dc4249853ea96b981"},
+    {file = "coverage-7.3.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6407424621f40205bbe6325686417e5e552f6b2dba3535dd1f90afc88a61d465"},
+    {file = "coverage-7.3.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:04312b036580ec505f2b77cbbdfb15137d5efdfade09156961f5277149f5e344"},
+    {file = "coverage-7.3.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ac9ad38204887349853d7c313f53a7b1c210ce138c73859e925bc4e5d8fc18e7"},
+    {file = "coverage-7.3.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:53669b79f3d599da95a0afbef039ac0fadbb236532feb042c534fbb81b1a4e40"},
+    {file = "coverage-7.3.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:614f1f98b84eb256e4f35e726bfe5ca82349f8dfa576faabf8a49ca09e630086"},
+    {file = "coverage-7.3.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:f1a317fdf5c122ad642db8a97964733ab7c3cf6009e1a8ae8821089993f175ff"},
+    {file = "coverage-7.3.1-cp38-cp38-win32.whl", hash = "sha256:defbbb51121189722420a208957e26e49809feafca6afeef325df66c39c4fdb3"},
+    {file = "coverage-7.3.1-cp38-cp38-win_amd64.whl", hash = "sha256:f4f456590eefb6e1b3c9ea6328c1e9fa0f1006e7481179d749b3376fc793478e"},
+    {file = "coverage-7.3.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:f12d8b11a54f32688b165fd1a788c408f927b0960984b899be7e4c190ae758f1"},
+    {file = "coverage-7.3.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:f09195dda68d94a53123883de75bb97b0e35f5f6f9f3aa5bf6e496da718f0cb6"},
+    {file = "coverage-7.3.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c6601a60318f9c3945be6ea0f2a80571f4299b6801716f8a6e4846892737ebe4"},
+    {file = "coverage-7.3.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:07d156269718670d00a3b06db2288b48527fc5f36859425ff7cec07c6b367745"},
+    {file = "coverage-7.3.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:636a8ac0b044cfeccae76a36f3b18264edcc810a76a49884b96dd744613ec0b7"},
+    {file = "coverage-7.3.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:5d991e13ad2ed3aced177f524e4d670f304c8233edad3210e02c465351f785a0"},
+    {file = "coverage-7.3.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:586649ada7cf139445da386ab6f8ef00e6172f11a939fc3b2b7e7c9082052fa0"},
+    {file = "coverage-7.3.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:4aba512a15a3e1e4fdbfed2f5392ec221434a614cc68100ca99dcad7af29f3f8"},
+    {file = "coverage-7.3.1-cp39-cp39-win32.whl", hash = "sha256:6bc6f3f4692d806831c136c5acad5ccedd0262aa44c087c46b7101c77e139140"},
+    {file = "coverage-7.3.1-cp39-cp39-win_amd64.whl", hash = "sha256:553d7094cb27db58ea91332e8b5681bac107e7242c23f7629ab1316ee73c4981"},
+    {file = "coverage-7.3.1-pp38.pp39.pp310-none-any.whl", hash = "sha256:220eb51f5fb38dfdb7e5d54284ca4d0cd70ddac047d750111a68ab1798945194"},
+    {file = "coverage-7.3.1.tar.gz", hash = "sha256:6cb7fe1581deb67b782c153136541e20901aa312ceedaf1467dcb35255787952"},
 ]
 
 [package.extras]
@@ -592,16 +603,17 @@ test-randomorder = ["pytest-randomly"]
 
 [[package]]
 name = "cyclonedx-python-lib"
-version = "4.1.0"
+version = "4.2.1"
 description = "A library for producing CycloneDX SBOM (Software Bill of Materials) files."
 optional = false
 python-versions = ">=3.7,<4.0"
 files = [
-    {file = "cyclonedx_python_lib-4.1.0-py3-none-any.whl", hash = "sha256:28b8c6c96372345c61464561b3040ede38d1c82026f706d87e8728ba5f7f4ddb"},
-    {file = "cyclonedx_python_lib-4.1.0.tar.gz", hash = "sha256:7996657f9788758ed05bea8c247e3e6ffcccfbc48818cd34795a4ae094b307bd"},
+    {file = "cyclonedx_python_lib-4.2.1-py3-none-any.whl", hash = "sha256:b6b3818d48ed932545d3c5c819cbfe9a1fe452fba363388d2005ba9b054c81cb"},
+    {file = "cyclonedx_python_lib-4.2.1.tar.gz", hash = "sha256:adcb074d00e5171754fc2f04269987cdf11342d2dbce2b9eeee7ebb218b1ed94"},
 ]
 
 [package.dependencies]
+license-expression = ">=30,<31"
 packageurl-python = ">=0.11"
 py-serializable = ">=0.11.1,<0.12.0"
 sortedcontainers = ">=2.4.0,<3.0.0"
@@ -994,13 +1006,13 @@ smmap = ">=3.0.1,<6"
 
 [[package]]
 name = "gitpython"
-version = "3.1.34"
+version = "3.1.35"
 description = "GitPython is a Python library used to interact with Git repositories"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "GitPython-3.1.34-py3-none-any.whl", hash = "sha256:5d3802b98a3bae1c2b8ae0e1ff2e4aa16bcdf02c145da34d092324f599f01395"},
-    {file = "GitPython-3.1.34.tar.gz", hash = "sha256:85f7d365d1f6bf677ae51039c1ef67ca59091c7ebd5a3509aa399d4eda02d6dd"},
+    {file = "GitPython-3.1.35-py3-none-any.whl", hash = "sha256:c19b4292d7a1d3c0f653858db273ff8a6614100d1eb1528b014ec97286193c09"},
+    {file = "GitPython-3.1.35.tar.gz", hash = "sha256:9cbefbd1789a5fe9bcf621bb34d3f441f3a90c8461d377f84eda73e721d9b06b"},
 ]
 
 [package.dependencies]
@@ -1379,6 +1391,24 @@ completion = ["shtab"]
 docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"]
 testing = ["pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-mypy (>=0.9.1)", "pytest-ruff"]
 
+[[package]]
+name = "license-expression"
+version = "30.1.1"
+description = "license-expression is a comprehensive utility library to parse, compare, simplify and normalize license expressions (such as SPDX license expressions) using boolean logic."
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "license-expression-30.1.1.tar.gz", hash = "sha256:42375df653ad85e6f5b4b0385138b2dbea1f5d66360783d8625c3e4f97f11f0c"},
+    {file = "license_expression-30.1.1-py3-none-any.whl", hash = "sha256:8d7e5e2de0d04fc104a4f952c440e8f08a5ba63480a0dad015b294770b7e58ec"},
+]
+
+[package.dependencies]
+"boolean.py" = ">=4.0"
+
+[package.extras]
+docs = ["Sphinx (==5.1.0)", "doc8 (>=0.8.1)", "sphinx-rtd-theme (>=0.5.0)", "sphinxcontrib-apidoc (>=0.3.0)"]
+testing = ["black", "isort", "pytest (>=6,!=7.0.0)", "pytest-xdist (>=2)", "twine"]
+
 [[package]]
 name = "lml"
 version = "0.1.0"
@@ -1974,13 +2004,13 @@ ptyprocess = ">=0.5"
 
 [[package]]
 name = "phonenumbers"
-version = "8.13.19"
+version = "8.13.20"
 description = "Python version of Google's common library for parsing, formatting, storing and validating international phone numbers."
 optional = false
 python-versions = "*"
 files = [
-    {file = "phonenumbers-8.13.19-py2.py3-none-any.whl", hash = "sha256:ba542f20f6dc83be8f127f240f9b5b7e7c1dec42aceff1879400d4dc0c781d81"},
-    {file = "phonenumbers-8.13.19.tar.gz", hash = "sha256:38180247697240ccedd74dec4bfbdbc22bb108b9c5f991f270ca3e41395e6f96"},
+    {file = "phonenumbers-8.13.20-py2.py3-none-any.whl", hash = "sha256:97f151fc904b0d6274dd92b02c82a7936e7dcaf9c7204f2f3e9c7ed0381f5098"},
+    {file = "phonenumbers-8.13.20.tar.gz", hash = "sha256:bf2b35a806d37979e5361109429da46d9a047e59d9af98639d733c834e7dab22"},
 ]
 
 [[package]]
@@ -2167,6 +2197,21 @@ files = [
     {file = "poetry_core-1.7.0.tar.gz", hash = "sha256:8f679b83bd9c820082637beca1204124d5d2a786e4818da47ec8acefd0353b74"},
 ]
 
+[[package]]
+name = "poetry-dotenv-plugin"
+version = "0.2.0"
+description = "A Poetry plugin to automatically load environment variables from .env files"
+optional = false
+python-versions = ">=3.7,<4"
+files = [
+    {file = "poetry_dotenv_plugin-0.2.0-py3-none-any.whl", hash = "sha256:dc2fd816a96e32586afb6507f01de6070a8a50877207ae20efa7c6a75648143a"},
+    {file = "poetry_dotenv_plugin-0.2.0.tar.gz", hash = "sha256:9bdd0a96d81ba5f2e75bda7c8944e2c5132b0c615c44452770dd1e7f1aca62f6"},
+]
+
+[package.dependencies]
+poetry = ">=1.2.0a1"
+python-dotenv = ">=0.10.0"
+
 [[package]]
 name = "poetry-plugin-export"
 version = "1.5.0"
@@ -3250,13 +3295,13 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"]
 
 [[package]]
 name = "virtualenv"
-version = "20.24.4"
+version = "20.24.5"
 description = "Virtual Python Environment builder"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "virtualenv-20.24.4-py3-none-any.whl", hash = "sha256:29c70bb9b88510f6414ac3e55c8b413a1f96239b6b789ca123437d5e892190cb"},
-    {file = "virtualenv-20.24.4.tar.gz", hash = "sha256:772b05bfda7ed3b8ecd16021ca9716273ad9f4467c801f27e83ac73430246dca"},
+    {file = "virtualenv-20.24.5-py3-none-any.whl", hash = "sha256:b80039f280f4919c77b30f1c23294ae357c4c8701042086e3fc005963e4e537b"},
+    {file = "virtualenv-20.24.5.tar.gz", hash = "sha256:e8361967f6da6fbdf1426483bfe9fca8287c242ac0bc30429905721cefbff752"},
 ]
 
 [package.dependencies]
@@ -3467,4 +3512,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.9"
-content-hash = "9e0494d37bd9c6e7fe433a39845a611dc64f2d39ea5be8723d1680ce0419b007"
+content-hash = "cac74512f0b5b7c09e05c6da4a0caa1c5678db6132680f698722b21bd9f5dc05"
diff --git a/pyproject.toml b/pyproject.toml
index d1eed9f4b..9b9a8ba4e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -31,6 +31,7 @@ pyexcel-xlsx = "==0.6.0"
 openpyxl = "==3.0.10"
 pyproj = "==3.6.0"
 python-dotenv = "==1.0.0"
+poetry-dotenv-plugin = "==0.2.0"
 pytz = "==2023.3"
 rtreelib = "==0.2.0"
 werkzeug = "~=2.3"
diff --git a/tests/conftest.py b/tests/conftest.py
index 30b5fe780..ddb49d4d5 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -3600,7 +3600,9 @@ 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"))
+    # TODO
+    page.goto("http://localhost:6012/")
+    # page.goto(os.getenv("NOTIFY_E2E_TEST_URI"))
 
     sign_in_button = page.get_by_role("link", name="Sign in")
 
@@ -3622,8 +3624,11 @@ def login_for_end_to_end_testing(browser):
     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"))
+    # TODO
+    email_address_input.fill("ken.kehl@fedramp.gov")
+    password_input.fill("SunPra1r13")
+    # 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.
@@ -3683,7 +3688,9 @@ def end_to_end_authenticated_context(browser):
     login_for_end_to_end_testing(browser)
 
     auth_state_path = os.path.join(
-        os.getenv("NOTIFY_E2E_AUTH_STATE_PATH"), "state.json"
+        # TODO
+        "playwright/.auth/", "state.json"
+        # os.getenv("NOTIFY_E2E_AUTH_STATE_PATH"), "state.json"
     )
     context = browser.new_context(storage_state=auth_state_path)
 
diff --git a/tests/end_to_end/test_accounts_page.py b/tests/end_to_end/test_accounts_page.py
index 35976929e..4a8f90dc6 100644
--- a/tests/end_to_end/test_accounts_page.py
+++ b/tests/end_to_end/test_accounts_page.py
@@ -3,20 +3,22 @@ import os
 import re
 
 import pytest
+from dotenv import load_dotenv
 from playwright.sync_api import expect
 
 
-@pytest.mark.skip(reason="Not authenticating test users.")
-def test_accounts_page(end_to_end_authenticated_context):
+def test_accounts_page(end_to_end_context):
+    load_dotenv()
     # Open a new page and go to the staging site.
-    page = end_to_end_authenticated_context.new_page()
+    page = end_to_end_context.new_page()
+    print(page)
 
     accounts_uri = "{}accounts".format(os.getenv("NOTIFY_E2E_TEST_URI"))
-
     page.goto(accounts_uri)
 
     # Check to make sure that we've arrived at the next page.
     page.wait_for_load_state("domcontentloaded")
+    print(page)
 
     # Check to make sure that we've arrived at the next page.
     # Check the page title exists and matches what we expect.

From 29ea098fd31c4ed2c8c98ba394c761cf4d2f25e7 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Fri, 8 Sep 2023 12:53:35 -0700
Subject: [PATCH 2/8] make some progress

---
 Makefile                                      |   3 +-
 app/main/views/sign_in.py                     |  17 +-
 app/main/views/verify.py                      |   3 -
 tests/conftest.py                             |   6 +-
 tests/end_to_end/test_accounts_page.py        |  56 ++---
 .../test_landing_and_sign_in_pages.py         | 237 +++++++++---------
 6 files changed, 161 insertions(+), 161 deletions(-)

diff --git a/Makefile b/Makefile
index 83c317c61..9316d46d1 100644
--- a/Makefile
+++ b/Makefile
@@ -78,7 +78,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
+	# poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end
+	poetry run pytest -v --browser chromium tests/end_to_end
 
 .PHONY: js-lint
 js-lint: ## Run javascript linting scanners
diff --git a/app/main/views/sign_in.py b/app/main/views/sign_in.py
index 00bd09994..640bb680d 100644
--- a/app/main/views/sign_in.py
+++ b/app/main/views/sign_in.py
@@ -12,7 +12,7 @@ from flask import (
 )
 from flask_login import current_user
 
-from app import login_manager
+from app import login_manager, user_api_client
 from app.main import main
 from app.main.forms import LoginForm
 from app.main.views.verify import activate_user
@@ -24,16 +24,13 @@ from app.utils.login import is_safe_redirect_url
 @main.route("/sign-in", methods=(["GET", "POST"]))
 @hide_from_search_engines
 def sign_in():
-
     redirect_url = request.args.get("next")
 
     # TODO this is not the right test to do to find test users
-    if os.getenv("NOTIFY_E2E_TEST_EMAIL") == 'ken.kehl@fedramp.gov':
-        user_id = session["user_details"]["id"]
-        activate_user(user_id)
-        return redirect(
-            url_for("main.show_accounts_or_dashboard", next=redirect_url)
-        )
+    if os.getenv("NOTIFY_E2E_TEST_EMAIL") == "ken.kehl@fedramp.gov":
+        user = user_api_client.get_user_by_email("ken.kehl@fedramp.gov")
+        activate_user(user["id"])
+        return redirect(url_for("main.show_accounts_or_dashboard", next=redirect_url))
 
     if current_user and current_user.is_authenticated:
         if redirect_url and is_safe_redirect_url(redirect_url):
@@ -68,7 +65,7 @@ def sign_in():
                         invited_user.accept_invite()
 
                 # TODO this is not the right test to do to find test users
-                if os.getenv("NOTIFY_E2E_TEST_EMAIL") == 'ken.kehl@fedramp.gov':
+                if os.getenv("NOTIFY_E2E_TEST_EMAIL") == "ken.kehl@fedramp.gov":
                     user_id = session["user_details"]["id"]
                     activate_user(user_id)
                     return redirect(
@@ -78,10 +75,8 @@ def sign_in():
                 user.send_login_code()
 
                 if user.sms_auth:
-
                     return redirect(url_for(".two_factor_sms", next=redirect_url))
 
-
                 if user.email_auth:
                     return redirect(
                         url_for(".two_factor_email_sent", next=redirect_url)
diff --git a/app/main/views/verify.py b/app/main/views/verify.py
index 6c44d343f..0201edfcc 100644
--- a/app/main/views/verify.py
+++ b/app/main/views/verify.py
@@ -16,9 +16,6 @@ from app.utils.login import redirect_to_sign_in
 def verify():
     user_id = session["user_details"]["id"]
 
-    print(f"RETURN ABRUPT WITH ACTIVATE USER")
-    return activate_user(user_id)
-
     def _check_code(code):
         return user_api_client.check_verify_code(user_id, code, "sms")
 
diff --git a/tests/conftest.py b/tests/conftest.py
index ddb49d4d5..2d6c2bf6b 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -9,6 +9,7 @@ from uuid import UUID, uuid4
 
 import pytest
 from bs4 import BeautifulSoup
+from dotenv import load_dotenv
 from flask import Flask, url_for
 from notifications_python_client.errors import HTTPError
 from notifications_utils.url_safe_token import generate_token
@@ -33,6 +34,8 @@ from . import (
     user_json,
 )
 
+load_dotenv()
+
 
 class ElementNotFound(Exception):
     pass
@@ -3689,7 +3692,8 @@ def end_to_end_authenticated_context(browser):
 
     auth_state_path = os.path.join(
         # TODO
-        "playwright/.auth/", "state.json"
+        "playwright/.auth/",
+        "state.json"
         # os.getenv("NOTIFY_E2E_AUTH_STATE_PATH"), "state.json"
     )
     context = browser.new_context(storage_state=auth_state_path)
diff --git a/tests/end_to_end/test_accounts_page.py b/tests/end_to_end/test_accounts_page.py
index 4a8f90dc6..3f3a91ca0 100644
--- a/tests/end_to_end/test_accounts_page.py
+++ b/tests/end_to_end/test_accounts_page.py
@@ -2,52 +2,52 @@ import datetime
 import os
 import re
 
-import pytest
-from dotenv import load_dotenv
 from playwright.sync_api import expect
 
 
-def test_accounts_page(end_to_end_context):
-    load_dotenv()
+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()
-    print(page)
+    page.goto(os.getenv("NOTIFY_E2E_TEST_URI"))
 
-    accounts_uri = "{}accounts".format(os.getenv("NOTIFY_E2E_TEST_URI"))
-    page.goto(accounts_uri)
+    sign_in_button = page.get_by_role("link", name="Sign in")
 
-    # Check to make sure that we've arrived at the next page.
+    # 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")
-    print(page)
+    return page
+
+
+def test_accounts_page(end_to_end_context):
+
+    page = _bypass_sign_in(end_to_end_context)
 
-    # Check to make sure that we've arrived at the next page.
     # Check the page title exists and matches what we expect.
-    expect(page).to_have_title(re.compile("Choose service"))
-
-    # Check for the sign in heading.
-    sign_in_heading = page.get_by_role("heading", name="Choose service")
-    expect(sign_in_heading).to_be_visible()
-
-    # Retrieve some prominent elements on the page for testing.
-    add_service_button = page.get_by_role(
-        "button", name=re.compile("Add a new service")
-    )
-
-    expect(add_service_button).to_be_visible()
+    expect(page).to_have_title(re.compile("Dashboard"))
+
+
+def test_add_new_service_workflow(end_to_end_context):
+    page = end_to_end_context.new_page()
+    page.goto(os.getenv("NOTIFY_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")
 
 
-@pytest.mark.skip(reason="Not authenticating test users.")
-def test_add_new_service_workflow(end_to_end_authenticated_context):
     # 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_authenticated_context.browser.browser_type.name,
+        browser_type=end_to_end_context.browser.browser_type.name,
     )
 
-    # Open a new page and go to the staging site.
-    page = end_to_end_authenticated_context.new_page()
-
     accounts_uri = "{}accounts".format(os.getenv("NOTIFY_E2E_TEST_URI"))
 
     page.goto(accounts_uri)
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 b86581af8..0b697e39d 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
@@ -5,9 +5,9 @@ import pytest
 from playwright.sync_api import expect
 
 
-def test_landing_page(end_to_end_context):
+def test_landing_page(browser):
     # Open a new page and go to the staging site.
-    page = end_to_end_context.new_page()
+    page = browser.new_page()
     page.goto(os.getenv("NOTIFY_E2E_TEST_URI"))
 
     # Check to make sure that we've arrived at the next page.
@@ -22,6 +22,7 @@ def test_landing_page(end_to_end_context):
     )
     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")
+    print(page)
 
     # Check to make sure the elements are visible.
     expect(main_header).to_be_visible()
@@ -49,118 +50,120 @@ def test_landing_page(end_to_end_context):
         ).to_be_visible()
 
 
-@pytest.mark.skip(reason="Not authenticating test users.")
-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"))
-
-    sign_in_button = page.get_by_role("link", name="Sign in")
-
-    # Test trying to sign in.
-    sign_in_button.click()
-
-    # 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("Sign in"))
-
-    # Check for the sign in heading.
-    sign_in_heading = page.get_by_role("heading", name="Sign in")
-    expect(sign_in_heading).to_be_visible()
-
-    # 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")
-    csrf_token = page.locator('xpath=//input[@name="csrf_token"]')
-    continue_button = page.get_by_role("button", name=re.compile("Continue"))
-    forgot_password_link = page.get_by_role("link", name="Forgot your password?")
-
-    # Make sure form elements are visible and not visible as expected.
-    expect(email_address_input).to_be_visible()
-    expect(password_input).to_be_visible()
-    expect(continue_button).to_be_visible()
-    expect(forgot_password_link).to_be_visible()
-
-    expect(csrf_token).to_be_hidden()
-
-    # Make sure form elements are configured correctly with the right
-    # attributes.
-    expect(email_address_input).to_have_attribute("type", "email")
-    expect(password_input).to_have_attribute("type", "password")
-    expect(csrf_token).to_have_attribute("type", "hidden")
-    expect(continue_button).to_have_attribute("type", "submit")
-    expect(forgot_password_link).to_have_attribute("href", "/forgot-password")
-
-    # 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 the page title exists and matches what we expect.
-    expect(page).to_have_title(re.compile("Check your phone"))
-
-    # Check for the sign in heading.
-    sign_in_heading = page.get_by_role("heading", name="Check your phone")
-    expect(sign_in_heading).to_be_visible()
-
-    # 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")
-    csrf_token = page.locator('xpath=//input[@name="csrf_token"]')
-    continue_button = page.get_by_role("button", name=re.compile("Continue"))
-    not_received_message_link = page.get_by_role(
-        "link", name="Not received a text message?"
-    )
-
-    # Make sure form elements are visible and not visible as expected.
-    expect(mfa_input).to_be_visible()
-    expect(continue_button).to_be_visible()
-    expect(not_received_message_link).to_be_visible()
-
-    expect(csrf_token).to_be_hidden()
-
-    # Make sure form elements are configured correctly with the right
-    # attributes.
-    expect(mfa_input).to_have_attribute("type", "tel")
-    expect(mfa_input).to_have_attribute("pattern", "[0-9]*")
-    expect(csrf_token).to_have_attribute("type", "hidden")
-    expect(continue_button).to_have_attribute("type", "submit")
-    expect(not_received_message_link).to_have_attribute("href", "/text-not-received")
-
-    # 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()
-
-    # # Check to make sure that we've arrived at the next page.
-    # page.wait_for_load_state('domcontentloaded')
-
-    # # Check that no MFA code error happened.
-    # code_not_found_error = page.get_by_text('Code not found')
-    # expect(code_not_found_error).to_have_count(0)
-
-    # # Check the page title exists and matches what we expect.
-    # # This could be either the Dashboard of a service if there is only
-    # # one, or choosing a service if there are multiple.
-    # expect(page).to_have_title(re.compile('Dashboard|Choose service'))
+# 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"))
+#     print(f"test_sign_in_and_mfa_pages initial {page}")
+#
+#     sign_in_button = page.get_by_role("link", name="Sign in")
+#
+#     # Test trying to sign in.
+#     sign_in_button.click()
+#
+#     # 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("Sign in"))
+#
+#     # Check for the sign in heading.
+#     sign_in_heading = page.get_by_role("heading", name="Sign in")
+#     expect(sign_in_heading).to_be_visible()
+#
+#     # 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")
+#     csrf_token = page.locator('xpath=//input[@name="csrf_token"]')
+#     continue_button = page.get_by_role("button", name=re.compile("Continue"))
+#     forgot_password_link = page.get_by_role("link", name="Forgot your password?")
+#
+#     # Make sure form elements are visible and not visible as expected.
+#     expect(email_address_input).to_be_visible()
+#     expect(password_input).to_be_visible()
+#     expect(continue_button).to_be_visible()
+#     expect(forgot_password_link).to_be_visible()
+#
+#     expect(csrf_token).to_be_hidden()
+#
+#     # Make sure form elements are configured correctly with the right
+#     # attributes.
+#     expect(email_address_input).to_have_attribute("type", "email")
+#     expect(password_input).to_have_attribute("type", "password")
+#     expect(csrf_token).to_have_attribute("type", "hidden")
+#     expect(continue_button).to_have_attribute("type", "submit")
+#     expect(forgot_password_link).to_have_attribute("href", "/forgot-password")
+#
+#     # Sign in to the site.
+#     email_address_input.fill(os.getenv("NOTIFY_E2E_TEST_EMAIL"))
+#     password_input.fill(os.getenv("NOTIFY_E2E_TEST_PASSWORD"))
+#     print(f"email and password {os.getenv('NOTIFY_E2E_TEST_EMAIL')} {os.getenv('NOTIFY_E2E_TEST_PASSWORD')}")
+#     continue_button.click()
+#
+#     # Wait for the next page to fully load.
+#     page.wait_for_load_state("domcontentloaded")
+#
+#     # Check the page title exists and matches what we expect.
+#     print(f"test_sign_in_and_mfa_pages finally is {page}")
+#     expect(page).to_have_title(re.compile("Check your phone"))
+#
+#     # Check for the sign in heading.
+#     sign_in_heading = page.get_by_role("heading", name="Check your phone")
+#     expect(sign_in_heading).to_be_visible()
+#
+#     # 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")
+#     csrf_token = page.locator('xpath=//input[@name="csrf_token"]')
+#     continue_button = page.get_by_role("button", name=re.compile("Continue"))
+#     not_received_message_link = page.get_by_role(
+#         "link", name="Not received a text message?"
+#     )
+#
+#     # Make sure form elements are visible and not visible as expected.
+#     expect(mfa_input).to_be_visible()
+#     expect(continue_button).to_be_visible()
+#     expect(not_received_message_link).to_be_visible()
+#
+#     expect(csrf_token).to_be_hidden()
+#
+#     # Make sure form elements are configured correctly with the right
+#     # attributes.
+#     expect(mfa_input).to_have_attribute("type", "tel")
+#     expect(mfa_input).to_have_attribute("pattern", "[0-9]*")
+#     expect(csrf_token).to_have_attribute("type", "hidden")
+#     expect(continue_button).to_have_attribute("type", "submit")
+#     expect(not_received_message_link).to_have_attribute("href", "/text-not-received")
+#
+#     # 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()
+#
+#     # # Check to make sure that we've arrived at the next page.
+#     # page.wait_for_load_state('domcontentloaded')
+#
+#     # # Check that no MFA code error happened.
+#     # code_not_found_error = page.get_by_text('Code not found')
+#     # expect(code_not_found_error).to_have_count(0)
+#
+#     # # Check the page title exists and matches what we expect.
+#     # # This could be either the Dashboard of a service if there is only
+#     # # one, or choosing a service if there are multiple.
+#     # expect(page).to_have_title(re.compile('Dashboard|Choose service'))

From c7de9dcf6aaec13a0b93b14ab6a9dca3c5cd86a3 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Fri, 8 Sep 2023 14:12:23 -0700
Subject: [PATCH 3/8] flake8 fixes

---
 pyproject.toml                                     |  1 -
 tests/end_to_end/test_accounts_page.py             | 11 ++++-------
 tests/end_to_end/test_landing_and_sign_in_pages.py |  2 --
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 9b9a8ba4e..d1eed9f4b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -31,7 +31,6 @@ pyexcel-xlsx = "==0.6.0"
 openpyxl = "==3.0.10"
 pyproj = "==3.6.0"
 python-dotenv = "==1.0.0"
-poetry-dotenv-plugin = "==0.2.0"
 pytz = "==2023.3"
 rtreelib = "==0.2.0"
 werkzeug = "~=2.3"
diff --git a/tests/end_to_end/test_accounts_page.py b/tests/end_to_end/test_accounts_page.py
index ec53c9085..68a915415 100644
--- a/tests/end_to_end/test_accounts_page.py
+++ b/tests/end_to_end/test_accounts_page.py
@@ -21,7 +21,6 @@ def _bypass_sign_in(end_to_end_context):
 
 
 def test_accounts_page(end_to_end_context):
-
     page = _bypass_sign_in(end_to_end_context)
 
     # Check the page title exists and matches what we expect.
@@ -33,15 +32,14 @@ def test_add_new_service_workflow(end_to_end_context):
     page = end_to_end_context.new_page()
     page.goto(os.getenv("NOTIFY_E2E_TEST_URI"))
 
-    #sign_in_button = page.get_by_role("link", name="Sign in")
-
+    # 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()
-
+    # sign_in_button.click()
+    #
     # 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()
     new_service_name = "E2E Federal Test Service {now} - {browser_type}".format(
@@ -103,7 +101,6 @@ def test_add_new_service_workflow(end_to_end_context):
 
     # Fill in the form.
     service_name_input.fill(new_service_name)
-    print(f"page before federal radio_button click {page}")
     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
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 0b697e39d..bde142a8e 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
@@ -1,7 +1,6 @@
 import os
 import re
 
-import pytest
 from playwright.sync_api import expect
 
 
@@ -22,7 +21,6 @@ def test_landing_page(browser):
     )
     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")
-    print(page)
 
     # Check to make sure the elements are visible.
     expect(main_header).to_be_visible()

From f813a403a9207b4aa4df79647e45f19323e2763c Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Mon, 11 Sep 2023 14:23:12 -0700
Subject: [PATCH 4/8] fix tests to use env vars

---
 app/main/views/sign_in.py              |  4 ++--
 tests/end_to_end/test_accounts_page.py | 31 +++++++++++++++++++-------
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/app/main/views/sign_in.py b/app/main/views/sign_in.py
index 640bb680d..6d5dd3fd9 100644
--- a/app/main/views/sign_in.py
+++ b/app/main/views/sign_in.py
@@ -27,8 +27,8 @@ def sign_in():
     redirect_url = request.args.get("next")
 
     # TODO this is not the right test to do to find test users
-    if os.getenv("NOTIFY_E2E_TEST_EMAIL") == "ken.kehl@fedramp.gov":
-        user = user_api_client.get_user_by_email("ken.kehl@fedramp.gov")
+    if os.getenv("NOTIFY_E2E_TEST_EMAIL"):
+        user = user_api_client.get_user_by_email(os.getenv("NOTIFY_E2E_TEST_EMAIL"))
         activate_user(user["id"])
         return redirect(url_for("main.show_accounts_or_dashboard", next=redirect_url))
 
diff --git a/tests/end_to_end/test_accounts_page.py b/tests/end_to_end/test_accounts_page.py
index 68a915415..f3f89f7dd 100644
--- a/tests/end_to_end/test_accounts_page.py
+++ b/tests/end_to_end/test_accounts_page.py
@@ -8,6 +8,7 @@ from playwright.sync_api import expect
 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"))
 
     sign_in_button = page.get_by_role("link", name="Sign in")
@@ -20,16 +21,10 @@ def _bypass_sign_in(end_to_end_context):
     return page
 
 
-def test_accounts_page(end_to_end_context):
-    page = _bypass_sign_in(end_to_end_context)
-
-    # Check the page title exists and matches what we expect.
-    # TODO this value depends on how many pre-existing services there are.  If 0, "Choose service", else "Dashboard"
-    expect(page).to_have_title(re.compile("Choose service"))
-
 
 def test_add_new_service_workflow(end_to_end_context):
-    page = end_to_end_context.new_page()
+    #page = end_to_end_context.new_page()
+    page = _bypass_sign_in(end_to_end_context)
     page.goto(os.getenv("NOTIFY_E2E_TEST_URI"))
 
     # sign_in_button = page.get_by_role("link", name="Sign in")
@@ -117,3 +112,23 @@ def test_add_new_service_workflow(end_to_end_context):
     service_heading = page.get_by_text(new_service_name)
     expect(service_heading).to_be_visible()
     expect(page).to_have_title(re.compile(new_service_name))
+
+    page.click("text='Settings'")
+
+    # Check to make sure that we've arrived at the next page.
+    page.wait_for_load_state("domcontentloaded")
+
+    page.click("text='Delete this service'")
+
+    # Check to make sure that we've arrived at the next page.
+    page.wait_for_load_state("domcontentloaded")
+
+    page.click("text='Yes, delete'")
+
+    # Check to make sure that we've arrived at the next page.
+    page.wait_for_load_state("domcontentloaded")
+
+    # Check to make sure that we've arrived at the next page.
+    # Check the page title exists and matches what we expect.
+    expect(page).to_have_title(re.compile("Choose service"))
+

From 705808e0e5a9894cd88c8e3983e056b544808700 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Tue, 12 Sep 2023 10:37:14 -0700
Subject: [PATCH 5/8] remove TODO comment

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

diff --git a/app/main/views/sign_in.py b/app/main/views/sign_in.py
index 6d5dd3fd9..84460df40 100644
--- a/app/main/views/sign_in.py
+++ b/app/main/views/sign_in.py
@@ -26,7 +26,6 @@ from app.utils.login import is_safe_redirect_url
 def sign_in():
     redirect_url = request.args.get("next")
 
-    # TODO this is not the right test to do to find test users
     if os.getenv("NOTIFY_E2E_TEST_EMAIL"):
         user = user_api_client.get_user_by_email(os.getenv("NOTIFY_E2E_TEST_EMAIL"))
         activate_user(user["id"])

From 93e4d1b4bbedab03430a3ca95c4ab0cce14ad045 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Tue, 12 Sep 2023 10:45:42 -0700
Subject: [PATCH 6/8] fix whoops

---
 tests/conftest.py | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/tests/conftest.py b/tests/conftest.py
index 2d6c2bf6b..3495c27ea 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -3603,9 +3603,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()
-    # TODO
-    page.goto("http://localhost:6012/")
-    # page.goto(os.getenv("NOTIFY_E2E_TEST_URI"))
+    page.goto(os.getenv("NOTIFY_E2E_TEST_URI"))
 
     sign_in_button = page.get_by_role("link", name="Sign in")
 
@@ -3627,11 +3625,8 @@ def login_for_end_to_end_testing(browser):
     continue_button = page.get_by_role("button", name=re.compile("Continue"))
 
     # Sign in to the site.
-    # TODO
-    email_address_input.fill("ken.kehl@fedramp.gov")
-    password_input.fill("SunPra1r13")
-    # email_address_input.fill(os.getenv("NOTIFY_E2E_TEST_EMAIL"))
-    # password_input.fill(os.getenv("NOTIFY_E2E_TEST_PASSWORD"))
+    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.

From 91f1790c8969a3529d98c7c925fed59450ae9709 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 13 Sep 2023 12:16:43 -0700
Subject: [PATCH 7/8] fix up

---
 Makefile                               |  1 -
 app/main/views/sign_in.py              |  8 --------
 poetry.lock                            | 24 +++++++++++-------------
 tests/conftest.py                      |  5 +----
 tests/end_to_end/test_accounts_page.py |  4 +---
 5 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/Makefile b/Makefile
index 84237d81c..83c317c61 100644
--- a/Makefile
+++ b/Makefile
@@ -79,7 +79,6 @@ dead-code:
 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
-	# poetry run pytest -v --browser chromium tests/end_to_end
 
 .PHONY: js-lint
 js-lint: ## Run javascript linting scanners
diff --git a/app/main/views/sign_in.py b/app/main/views/sign_in.py
index 84460df40..6420ad23b 100644
--- a/app/main/views/sign_in.py
+++ b/app/main/views/sign_in.py
@@ -63,14 +63,6 @@ def sign_in():
                     else:
                         invited_user.accept_invite()
 
-                # TODO this is not the right test to do to find test users
-                if os.getenv("NOTIFY_E2E_TEST_EMAIL") == "ken.kehl@fedramp.gov":
-                    user_id = session["user_details"]["id"]
-                    activate_user(user_id)
-                    return redirect(
-                        url_for("main.show_accounts_or_dashboard", next=redirect_url)
-                    )
-
                 user.send_login_code()
 
                 if user.sms_auth:
diff --git a/poetry.lock b/poetry.lock
index 6471e723a..d741c9dc9 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -168,17 +168,17 @@ files = [
 
 [[package]]
 name = "boto3"
-version = "1.28.45"
+version = "1.28.46"
 description = "The AWS SDK for Python"
 optional = false
 python-versions = ">= 3.7"
 files = [
-    {file = "boto3-1.28.45-py3-none-any.whl", hash = "sha256:682abbd304e93e726163d7de7448c1bf88108c72cf6a23dceb6bba86fdc86dff"},
-    {file = "boto3-1.28.45.tar.gz", hash = "sha256:4ee914266c9bed16978677a367fd05053d8dcaddcbe998c9df30787ab73f87aa"},
+    {file = "boto3-1.28.46-py3-none-any.whl", hash = "sha256:04445d70127c25fad69e2cab7e3f5cb219c8d6e60463af3657f20e29ac517957"},
+    {file = "boto3-1.28.46.tar.gz", hash = "sha256:2ca2852f7b7c1bc2e56f10f968d4c8483c8228b935ecd89a444ae8292ad0dc24"},
 ]
 
 [package.dependencies]
-botocore = ">=1.31.45,<1.32.0"
+botocore = ">=1.31.46,<1.32.0"
 jmespath = ">=0.7.1,<2.0.0"
 s3transfer = ">=0.6.0,<0.7.0"
 
@@ -187,13 +187,13 @@ crt = ["botocore[crt] (>=1.21.0,<2.0a0)"]
 
 [[package]]
 name = "botocore"
-version = "1.31.45"
+version = "1.31.46"
 description = "Low-level, data-driven core of boto 3."
 optional = false
 python-versions = ">= 3.7"
 files = [
-    {file = "botocore-1.31.45-py3-none-any.whl", hash = "sha256:cceb150cff1d7f7a6faf655510a8384eb4505a33b430495fe1744d03a70dc66a"},
-    {file = "botocore-1.31.45.tar.gz", hash = "sha256:85ff64a0ac2705c4ba36268c3b2dbc1184062e9cf729a89dd66c2f54f730fc79"},
+    {file = "botocore-1.31.46-py3-none-any.whl", hash = "sha256:ac0c1258b1782cde42950bd00138fdce6bd7d04855296af8c326d5844a426473"},
+    {file = "botocore-1.31.46.tar.gz", hash = "sha256:6c30be3371624a80d6a881d9c7771a80e0eb82697ee374aaf522cd59b76e14dd"},
 ]
 
 [package.dependencies]
@@ -800,21 +800,19 @@ testing = ["hatch", "pre-commit", "pytest", "tox"]
 
 [[package]]
 name = "filelock"
-version = "3.12.3"
+version = "3.12.4"
 description = "A platform independent file lock."
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "filelock-3.12.3-py3-none-any.whl", hash = "sha256:f067e40ccc40f2b48395a80fcbd4728262fab54e232e090a4063ab804179efeb"},
-    {file = "filelock-3.12.3.tar.gz", hash = "sha256:0ecc1dd2ec4672a10c8550a8182f1bd0c0a5088470ecd5a125e45f49472fac3d"},
+    {file = "filelock-3.12.4-py3-none-any.whl", hash = "sha256:08c21d87ded6e2b9da6728c3dff51baf1dcecf973b768ef35bcbc3447edb9ad4"},
+    {file = "filelock-3.12.4.tar.gz", hash = "sha256:2e6f249f1f3654291606e046b09f1fd5eac39b360664c27f5aad072012f8bcbd"},
 ]
 
-[package.dependencies]
-typing-extensions = {version = ">=4.7.1", markers = "python_version < \"3.11\""}
-
 [package.extras]
 docs = ["furo (>=2023.7.26)", "sphinx (>=7.1.2)", "sphinx-autodoc-typehints (>=1.24)"]
 testing = ["covdefaults (>=2.3)", "coverage (>=7.3)", "diff-cover (>=7.7)", "pytest (>=7.4)", "pytest-cov (>=4.1)", "pytest-mock (>=3.11.1)", "pytest-timeout (>=2.1)"]
+typing = ["typing-extensions (>=4.7.1)"]
 
 [[package]]
 name = "flake8"
diff --git a/tests/conftest.py b/tests/conftest.py
index 3495c27ea..6555c64cd 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -3686,10 +3686,7 @@ def end_to_end_authenticated_context(browser):
     login_for_end_to_end_testing(browser)
 
     auth_state_path = os.path.join(
-        # TODO
-        "playwright/.auth/",
-        "state.json"
-        # os.getenv("NOTIFY_E2E_AUTH_STATE_PATH"), "state.json"
+        os.getenv("NOTIFY_E2E_AUTH_STATE_PATH"), "state.json"
     )
     context = browser.new_context(storage_state=auth_state_path)
 
diff --git a/tests/end_to_end/test_accounts_page.py b/tests/end_to_end/test_accounts_page.py
index f3f89f7dd..c8c8d5a6a 100644
--- a/tests/end_to_end/test_accounts_page.py
+++ b/tests/end_to_end/test_accounts_page.py
@@ -21,9 +21,8 @@ def _bypass_sign_in(end_to_end_context):
     return page
 
 
-
 def test_add_new_service_workflow(end_to_end_context):
-    #page = end_to_end_context.new_page()
+    # page = end_to_end_context.new_page()
     page = _bypass_sign_in(end_to_end_context)
     page.goto(os.getenv("NOTIFY_E2E_TEST_URI"))
 
@@ -131,4 +130,3 @@ def test_add_new_service_workflow(end_to_end_context):
     # Check to make sure that we've arrived at the next page.
     # Check the page title exists and matches what we expect.
     expect(page).to_have_title(re.compile("Choose service"))
-

From e2b82991af92c1c2646eea56bc6e12eee1556753 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 13 Sep 2023 13:47:43 -0700
Subject: [PATCH 8/8] code review feedback

---
 tests/end_to_end/test_landing_and_sign_in_pages.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 bde142a8e..895b3851f 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
@@ -4,9 +4,9 @@ import re
 from playwright.sync_api import expect
 
 
-def test_landing_page(browser):
+def test_landing_page(end_to_end_context):
     # Open a new page and go to the staging site.
-    page = browser.new_page()
+    page = end_to_end_context.browser.new_page()
     page.goto(os.getenv("NOTIFY_E2E_TEST_URI"))
 
     # Check to make sure that we've arrived at the next page.