mirror of
https://github.com/GSA/notifications-api.git
synced 2026-03-03 08:52:22 -05:00
@@ -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"
|
||||
}
|
||||
|
||||
@@ -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})
|
||||
|
||||
@@ -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,
|
||||
}
|
||||
|
||||
|
||||
@@ -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")
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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(
|
||||
|
||||
Reference in New Issue
Block a user