From ada2fcc3450646264fea091d0781df047d7e8dde Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Tue, 12 Aug 2025 10:50:28 -0700 Subject: [PATCH 1/6] remove email check --- app/dao/users_dao.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/dao/users_dao.py b/app/dao/users_dao.py index 8a411b27e..003aaece0 100644 --- a/app/dao/users_dao.py +++ b/app/dao/users_dao.py @@ -53,9 +53,6 @@ def get_login_gov_user(login_uuid, email_address): db.session.rollback() return user - # Remove this 1 July 2025, all users should have login.gov uuids by now - stmt = select(User).where(User.email_address.ilike(email_address)) - user = db.session.execute(stmt).scalars().first() if user: save_user_attribute(user, {"login_uuid": login_uuid}) From f625d4dc763a227d2ed34b1ea9843fa2926315ee Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Tue, 12 Aug 2025 11:09:03 -0700 Subject: [PATCH 2/6] fix test --- .ds.baseline | 4 ++-- tests/app/db.py | 2 ++ tests/app/user/test_rest.py | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.ds.baseline b/.ds.baseline index c4d01163b..8a248a4dd 100644 --- a/.ds.baseline +++ b/.ds.baseline @@ -257,7 +257,7 @@ "filename": "tests/app/db.py", "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8", "is_verified": false, - "line_number": 90, + "line_number": 91, "is_secret": false } ], @@ -374,5 +374,5 @@ } ] }, - "generated_at": "2025-07-02T18:56:01Z" + "generated_at": "2025-08-12T18:08:49Z" } diff --git a/tests/app/db.py b/tests/app/db.py index 4177c6b05..408e1ed4c 100644 --- a/tests/app/db.py +++ b/tests/app/db.py @@ -82,6 +82,7 @@ def create_user( id_=None, name="Test User", platform_admin=False, + login_uuid=None, ): data = { "id": id_ or uuid.uuid4(), @@ -91,6 +92,7 @@ def create_user( "mobile_number": mobile_number, "state": state, "platform_admin": platform_admin, + "login_uuid": login_uuid, } stmt = select(User).where(User.email_address == email) user = db.session.execute(stmt).scalars().first() diff --git a/tests/app/user/test_rest.py b/tests/app/user/test_rest.py index 1223487ab..4233d9027 100644 --- a/tests/app/user/test_rest.py +++ b/tests/app/user/test_rest.py @@ -1067,7 +1067,7 @@ def test_find_users_by_email_finds_user_by_full_email(notify_db_session, admin_r def test_get_user_login_gov_user(notify_db_session, admin_request): - create_user(email="findel.mestro@foo.com") + create_user(email="findel.mestro@foo.com", login_uuid="123456") data = {"email": "findel.mestro@foo.com", "login_uuid": "123456"} users = admin_request.post( @@ -1075,7 +1075,7 @@ def test_get_user_login_gov_user(notify_db_session, admin_request): _data=data, ) - assert users["data"]["email_address"] == "findel.mestro@foo.com" + assert users["data"]["login_uuid"] == "123456" def test_find_users_by_email_handles_no_results(notify_db_session, admin_request): From e4ea12d44cbd541ab22f6f0eb222622a380c715f Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Tue, 12 Aug 2025 11:36:26 -0700 Subject: [PATCH 3/6] fix test --- tests/app/user/test_rest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/app/user/test_rest.py b/tests/app/user/test_rest.py index 4233d9027..09afbdce2 100644 --- a/tests/app/user/test_rest.py +++ b/tests/app/user/test_rest.py @@ -1075,7 +1075,7 @@ def test_get_user_login_gov_user(notify_db_session, admin_request): _data=data, ) - assert users["data"]["login_uuid"] == "123456" + assert users["data"]["email_address"] == "findel.mestro@foo.com" def test_find_users_by_email_handles_no_results(notify_db_session, admin_request): From e5470ddb4753d31bab897414585820490820d60c Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Tue, 12 Aug 2025 12:05:55 -0700 Subject: [PATCH 4/6] fix sample user --- tests/app/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/app/conftest.py b/tests/app/conftest.py index 135c54931..1f9904612 100644 --- a/tests/app/conftest.py +++ b/tests/app/conftest.py @@ -187,7 +187,7 @@ def service_factory(sample_user): @pytest.fixture(scope="function") def sample_user(notify_db_session): - return create_user(email="notify@digital.fake.gov") + return create_user(email="notify@digital.fake.gov", login_uuid="123456") @pytest.fixture(scope="function") From c15d8d731943f59ca46bb981c4389a6d3c4cd7a3 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Tue, 12 Aug 2025 12:16:24 -0700 Subject: [PATCH 5/6] hmmm --- app/models.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/models.py b/app/models.py index 01618d9ee..6873cee43 100644 --- a/app/models.py +++ b/app/models.py @@ -222,6 +222,7 @@ class User(db.Model): "id": self.id, "name": self.name, "email_address": self.email_address, + "login_uuid": self.login_uuid, "auth_type": self.auth_type, "current_session_id": self.current_session_id, "failed_login_count": self.failed_login_count, @@ -247,6 +248,7 @@ class User(db.Model): "id": self.id, "name": self.name, "email_address": self.email_address, + "login_uuid": self.login_uuid, "mobile_number": self.mobile_number, } From dde58d7b8ac572a738fb594dc5a2746d48aa10b4 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Tue, 12 Aug 2025 12:28:03 -0700 Subject: [PATCH 6/6] hmmm --- tests/app/dao/test_users_dao.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/app/dao/test_users_dao.py b/tests/app/dao/test_users_dao.py index a07d6308a..997f34610 100644 --- a/tests/app/dao/test_users_dao.py +++ b/tests/app/dao/test_users_dao.py @@ -133,7 +133,7 @@ def test_get_user_by_email(sample_user): def test_get_login_gov_user(sample_user): - user_from_db = get_login_gov_user("fake_login_gov_uuid", sample_user.email_address) + user_from_db = get_login_gov_user("123456", sample_user.email_address) assert sample_user.email_address == user_from_db.email_address assert user_from_db.login_uuid is not None