mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-09-05 16:28:24 -04:00
notify-api-412 use black to enforce python coding style
This commit is contained in:
@@ -17,20 +17,22 @@ from tests.conftest import (
|
||||
|
||||
@pytest.fixture()
|
||||
def mock_no_users_for_service(mocker):
|
||||
mocker.patch('app.models.user.Users.client_method', return_value=[])
|
||||
mocker.patch("app.models.user.Users.client_method", return_value=[])
|
||||
|
||||
|
||||
@pytest.fixture(scope='function')
|
||||
@pytest.fixture(scope="function")
|
||||
def mock_get_existing_user_by_email(mocker, api_user_active):
|
||||
return mocker.patch('app.user_api_client.get_user_by_email', return_value=api_user_active)
|
||||
return mocker.patch(
|
||||
"app.user_api_client.get_user_by_email", return_value=api_user_active
|
||||
)
|
||||
|
||||
|
||||
@pytest.fixture(scope='function')
|
||||
@pytest.fixture(scope="function")
|
||||
def mock_check_invite_token(mocker, sample_invite):
|
||||
return mocker.patch('app.invite_api_client.check_token', return_value=sample_invite)
|
||||
return mocker.patch("app.invite_api_client.check_token", return_value=sample_invite)
|
||||
|
||||
|
||||
@freeze_time('2021-12-12 12:12:12')
|
||||
@freeze_time("2021-12-12 12:12:12")
|
||||
def test_existing_user_accept_invite_calls_api_and_redirects_to_dashboard(
|
||||
client_request,
|
||||
service_one,
|
||||
@@ -47,21 +49,28 @@ def test_existing_user_accept_invite_calls_api_and_redirects_to_dashboard(
|
||||
mock_update_user_attribute,
|
||||
):
|
||||
client_request.logout()
|
||||
expected_service = service_one['id']
|
||||
expected_permissions = {'view_activity', 'send_messages', 'manage_service', 'manage_api_keys'}
|
||||
expected_service = service_one["id"]
|
||||
expected_permissions = {
|
||||
"view_activity",
|
||||
"send_messages",
|
||||
"manage_service",
|
||||
"manage_api_keys",
|
||||
}
|
||||
|
||||
client_request.get(
|
||||
'main.accept_invite',
|
||||
token='thisisnotarealtoken',
|
||||
_expected_redirect=url_for('main.service_dashboard', service_id=expected_service),
|
||||
"main.accept_invite",
|
||||
token="thisisnotarealtoken",
|
||||
_expected_redirect=url_for(
|
||||
"main.service_dashboard", service_id=expected_service
|
||||
),
|
||||
)
|
||||
|
||||
mock_check_invite_token.assert_called_with('thisisnotarealtoken')
|
||||
mock_get_existing_user_by_email.assert_called_with('invited_user@test.gsa.gov')
|
||||
mock_check_invite_token.assert_called_with("thisisnotarealtoken")
|
||||
mock_get_existing_user_by_email.assert_called_with("invited_user@test.gsa.gov")
|
||||
assert mock_accept_invite.call_count == 1
|
||||
mock_add_user_to_service.assert_called_with(
|
||||
expected_service,
|
||||
api_user_active['id'],
|
||||
api_user_active["id"],
|
||||
expected_permissions,
|
||||
[],
|
||||
)
|
||||
@@ -84,21 +93,23 @@ def test_existing_user_with_no_permissions_or_folder_permissions_accept_invite(
|
||||
):
|
||||
client_request.logout()
|
||||
|
||||
expected_service = service_one['id']
|
||||
sample_invite['permissions'] = ''
|
||||
expected_service = service_one["id"]
|
||||
sample_invite["permissions"] = ""
|
||||
expected_permissions = set()
|
||||
expected_folder_permissions = []
|
||||
mocker.patch('app.invite_api_client.accept_invite', return_value=sample_invite)
|
||||
mocker.patch("app.invite_api_client.accept_invite", return_value=sample_invite)
|
||||
|
||||
client_request.get(
|
||||
'main.accept_invite',
|
||||
token='thisisnotarealtoken',
|
||||
"main.accept_invite",
|
||||
token="thisisnotarealtoken",
|
||||
_expected_status=302,
|
||||
)
|
||||
mock_add_user_to_service.assert_called_with(expected_service,
|
||||
api_user_active['id'],
|
||||
expected_permissions,
|
||||
expected_folder_permissions)
|
||||
mock_add_user_to_service.assert_called_with(
|
||||
expected_service,
|
||||
api_user_active["id"],
|
||||
expected_permissions,
|
||||
expected_folder_permissions,
|
||||
)
|
||||
|
||||
|
||||
def test_if_existing_user_accepts_twice_they_redirect_to_sign_in(
|
||||
@@ -112,20 +123,20 @@ def test_if_existing_user_accepts_twice_they_redirect_to_sign_in(
|
||||
client_request.logout()
|
||||
# Logging out updates the current session ID to `None`
|
||||
mock_update_user_attribute.reset_mock()
|
||||
sample_invite['status'] = 'accepted'
|
||||
sample_invite["status"] = "accepted"
|
||||
|
||||
page = client_request.get(
|
||||
'main.accept_invite',
|
||||
token='thisisnotarealtoken',
|
||||
"main.accept_invite",
|
||||
token="thisisnotarealtoken",
|
||||
_follow_redirects=True,
|
||||
)
|
||||
|
||||
assert (
|
||||
page.h1.string,
|
||||
page.select('main p')[0].text.strip(),
|
||||
page.select("main p")[0].text.strip(),
|
||||
) == (
|
||||
'You need to sign in again',
|
||||
'We signed you out because you have not used Notify for a while.',
|
||||
"You need to sign in again",
|
||||
"We signed you out because you have not used Notify for a while.",
|
||||
)
|
||||
# We don’t let people update `email_access_validated_at` using an
|
||||
# already-accepted invite
|
||||
@@ -144,27 +155,30 @@ def test_invite_goes_in_session(
|
||||
mock_add_user_to_service,
|
||||
mock_accept_invite,
|
||||
):
|
||||
sample_invite['email_address'] = 'test@user.gsa.gov'
|
||||
sample_invite["email_address"] = "test@user.gsa.gov"
|
||||
|
||||
client_request.get(
|
||||
'main.accept_invite',
|
||||
token='thisisnotarealtoken',
|
||||
"main.accept_invite",
|
||||
token="thisisnotarealtoken",
|
||||
_expected_status=302,
|
||||
_expected_redirect=url_for(
|
||||
'main.service_dashboard',
|
||||
"main.service_dashboard",
|
||||
service_id=SERVICE_ONE_ID,
|
||||
),
|
||||
_follow_redirects=False,
|
||||
)
|
||||
|
||||
with client_request.session_transaction() as session:
|
||||
assert session['invited_user_id'] == sample_invite['id']
|
||||
assert session["invited_user_id"] == sample_invite["id"]
|
||||
|
||||
|
||||
@pytest.mark.parametrize('user, landing_page_title', [
|
||||
(create_active_user_with_permissions(), 'Dashboard'),
|
||||
(create_active_caseworking_user(), 'Templates'),
|
||||
])
|
||||
@pytest.mark.parametrize(
|
||||
"user, landing_page_title",
|
||||
[
|
||||
(create_active_user_with_permissions(), "Dashboard"),
|
||||
(create_active_caseworking_user(), "Templates"),
|
||||
],
|
||||
)
|
||||
def test_accepting_invite_removes_invite_from_session(
|
||||
client_request,
|
||||
mocker,
|
||||
@@ -190,22 +204,22 @@ def test_accepting_invite_removes_invite_from_session(
|
||||
user,
|
||||
landing_page_title,
|
||||
):
|
||||
sample_invite['email_address'] = user['email_address']
|
||||
sample_invite["email_address"] = user["email_address"]
|
||||
|
||||
client_request.login(user)
|
||||
|
||||
page = client_request.get(
|
||||
'main.accept_invite',
|
||||
token='thisisnotarealtoken',
|
||||
"main.accept_invite",
|
||||
token="thisisnotarealtoken",
|
||||
_follow_redirects=True,
|
||||
)
|
||||
assert normalize_spaces(page.select_one('h1').text) == landing_page_title
|
||||
assert normalize_spaces(page.select_one("h1").text) == landing_page_title
|
||||
|
||||
with client_request.session_transaction() as session:
|
||||
assert 'invited_user_id' not in session
|
||||
assert "invited_user_id" not in session
|
||||
|
||||
|
||||
@freeze_time('2021-12-12T12:12:12')
|
||||
@freeze_time("2021-12-12T12:12:12")
|
||||
def test_existing_user_of_service_get_redirected_to_signin(
|
||||
client_request,
|
||||
mocker,
|
||||
@@ -218,21 +232,21 @@ def test_existing_user_of_service_get_redirected_to_signin(
|
||||
mock_update_user_attribute,
|
||||
):
|
||||
client_request.logout()
|
||||
sample_invite['email_address'] = api_user_active['email_address']
|
||||
mocker.patch('app.models.user.Users.client_method', return_value=[api_user_active])
|
||||
sample_invite["email_address"] = api_user_active["email_address"]
|
||||
mocker.patch("app.models.user.Users.client_method", return_value=[api_user_active])
|
||||
|
||||
page = client_request.get(
|
||||
'main.accept_invite',
|
||||
token='thisisnotarealtoken',
|
||||
"main.accept_invite",
|
||||
token="thisisnotarealtoken",
|
||||
_follow_redirects=True,
|
||||
)
|
||||
|
||||
assert (
|
||||
page.h1.string,
|
||||
page.select('main p')[0].text.strip(),
|
||||
page.select("main p")[0].text.strip(),
|
||||
) == (
|
||||
'You need to sign in again',
|
||||
'We signed you out because you have not used Notify for a while.',
|
||||
"You need to sign in again",
|
||||
"We signed you out because you have not used Notify for a while.",
|
||||
)
|
||||
assert mock_accept_invite.call_count == 1
|
||||
|
||||
@@ -252,22 +266,27 @@ def test_accept_invite_redirects_if_api_raises_an_error_that_they_are_already_pa
|
||||
):
|
||||
client_request.logout()
|
||||
|
||||
mocker.patch('app.user_api_client.add_user_to_service', side_effect=HTTPError(
|
||||
response=Mock(
|
||||
status_code=400,
|
||||
json={
|
||||
"result": "error",
|
||||
"message": {f"User id: {api_user_active['id']} already part of service id: {SERVICE_ONE_ID}"}
|
||||
},
|
||||
mocker.patch(
|
||||
"app.user_api_client.add_user_to_service",
|
||||
side_effect=HTTPError(
|
||||
response=Mock(
|
||||
status_code=400,
|
||||
json={
|
||||
"result": "error",
|
||||
"message": {
|
||||
f"User id: {api_user_active['id']} already part of service id: {SERVICE_ONE_ID}"
|
||||
},
|
||||
},
|
||||
),
|
||||
message=f"User id: {api_user_active['id']} already part of service id: {SERVICE_ONE_ID}",
|
||||
),
|
||||
message=f"User id: {api_user_active['id']} already part of service id: {SERVICE_ONE_ID}"
|
||||
))
|
||||
)
|
||||
|
||||
client_request.get(
|
||||
'main.accept_invite',
|
||||
token='thisisnotarealtoken',
|
||||
"main.accept_invite",
|
||||
token="thisisnotarealtoken",
|
||||
_follow_redirects=False,
|
||||
_expected_redirect=url_for('main.service_dashboard', service_id=SERVICE_ONE_ID)
|
||||
_expected_redirect=url_for("main.service_dashboard", service_id=SERVICE_ONE_ID),
|
||||
)
|
||||
|
||||
|
||||
@@ -288,28 +307,35 @@ def test_existing_signed_out_user_accept_invite_redirects_to_sign_in(
|
||||
mock_update_user_attribute,
|
||||
):
|
||||
client_request.logout()
|
||||
expected_service = service_one['id']
|
||||
expected_permissions = {'view_activity', 'send_messages', 'manage_service', 'manage_api_keys'}
|
||||
expected_service = service_one["id"]
|
||||
expected_permissions = {
|
||||
"view_activity",
|
||||
"send_messages",
|
||||
"manage_service",
|
||||
"manage_api_keys",
|
||||
}
|
||||
|
||||
page = client_request.get(
|
||||
'main.accept_invite',
|
||||
token='thisisnotarealtoken',
|
||||
"main.accept_invite",
|
||||
token="thisisnotarealtoken",
|
||||
_follow_redirects=True,
|
||||
)
|
||||
|
||||
mock_check_invite_token.assert_called_with('thisisnotarealtoken')
|
||||
mock_get_existing_user_by_email.assert_called_with('invited_user@test.gsa.gov')
|
||||
mock_add_user_to_service.assert_called_with(expected_service,
|
||||
api_user_active['id'],
|
||||
expected_permissions,
|
||||
sample_invite['folder_permissions'])
|
||||
mock_check_invite_token.assert_called_with("thisisnotarealtoken")
|
||||
mock_get_existing_user_by_email.assert_called_with("invited_user@test.gsa.gov")
|
||||
mock_add_user_to_service.assert_called_with(
|
||||
expected_service,
|
||||
api_user_active["id"],
|
||||
expected_permissions,
|
||||
sample_invite["folder_permissions"],
|
||||
)
|
||||
assert mock_accept_invite.call_count == 1
|
||||
assert (
|
||||
page.h1.string,
|
||||
page.select('main p')[0].text.strip(),
|
||||
page.select("main p")[0].text.strip(),
|
||||
) == (
|
||||
'You need to sign in again',
|
||||
'We signed you out because you have not used Notify for a while.',
|
||||
"You need to sign in again",
|
||||
"We signed you out because you have not used Notify for a while.",
|
||||
)
|
||||
|
||||
|
||||
@@ -325,13 +351,13 @@ def test_new_user_accept_invite_calls_api_and_redirects_to_registration(
|
||||
):
|
||||
client_request.logout()
|
||||
client_request.get(
|
||||
'main.accept_invite',
|
||||
token='thisisnotarealtoken',
|
||||
_expected_redirect='/register-from-invite',
|
||||
"main.accept_invite",
|
||||
token="thisisnotarealtoken",
|
||||
_expected_redirect="/register-from-invite",
|
||||
)
|
||||
|
||||
mock_check_invite_token.assert_called_with('thisisnotarealtoken')
|
||||
mock_dont_get_user_by_email.assert_called_with('invited_user@test.gsa.gov')
|
||||
mock_check_invite_token.assert_called_with("thisisnotarealtoken")
|
||||
mock_dont_get_user_by_email.assert_called_with("invited_user@test.gsa.gov")
|
||||
|
||||
|
||||
def test_new_user_accept_invite_calls_api_and_views_registration_page(
|
||||
@@ -348,34 +374,34 @@ def test_new_user_accept_invite_calls_api_and_views_registration_page(
|
||||
):
|
||||
client_request.logout()
|
||||
page = client_request.get(
|
||||
'main.accept_invite',
|
||||
token='thisisnotarealtoken',
|
||||
"main.accept_invite",
|
||||
token="thisisnotarealtoken",
|
||||
_follow_redirects=True,
|
||||
)
|
||||
|
||||
mock_check_invite_token.assert_called_with('thisisnotarealtoken')
|
||||
mock_dont_get_user_by_email.assert_called_with('invited_user@test.gsa.gov')
|
||||
mock_get_invited_user_by_id.assert_called_once_with(sample_invite['id'])
|
||||
mock_check_invite_token.assert_called_with("thisisnotarealtoken")
|
||||
mock_dont_get_user_by_email.assert_called_with("invited_user@test.gsa.gov")
|
||||
mock_get_invited_user_by_id.assert_called_once_with(sample_invite["id"])
|
||||
|
||||
assert page.h1.string.strip() == 'Create an account'
|
||||
assert page.h1.string.strip() == "Create an account"
|
||||
|
||||
assert normalize_spaces(page.select_one('main p').text) == (
|
||||
'Your account will be created with this email address: '
|
||||
'invited_user@test.gsa.gov'
|
||||
assert normalize_spaces(page.select_one("main p").text) == (
|
||||
"Your account will be created with this email address: "
|
||||
"invited_user@test.gsa.gov"
|
||||
)
|
||||
|
||||
form = page.find('form')
|
||||
name = form.find('input', id='name')
|
||||
password = form.find('input', id='password')
|
||||
service = form.find('input', type='hidden', id='service')
|
||||
email = form.find('input', type='hidden', id='email_address')
|
||||
form = page.find("form")
|
||||
name = form.find("input", id="name")
|
||||
password = form.find("input", id="password")
|
||||
service = form.find("input", type="hidden", id="service")
|
||||
email = form.find("input", type="hidden", id="email_address")
|
||||
|
||||
assert email
|
||||
assert email.attrs['value'] == 'invited_user@test.gsa.gov'
|
||||
assert email.attrs["value"] == "invited_user@test.gsa.gov"
|
||||
assert name
|
||||
assert password
|
||||
assert service
|
||||
assert service.attrs['value'] == service_one['id']
|
||||
assert service.attrs["value"] == service_one["id"]
|
||||
|
||||
|
||||
def test_cancelled_invited_user_accepts_invited_redirect_to_cancelled_invitation(
|
||||
@@ -388,21 +414,24 @@ def test_cancelled_invited_user_accepts_invited_redirect_to_cancelled_invitation
|
||||
):
|
||||
client_request.logout()
|
||||
mock_update_user_attribute.reset_mock()
|
||||
sample_invite['status'] = 'cancelled'
|
||||
page = client_request.get('main.accept_invite', token='thisisnotarealtoken')
|
||||
sample_invite["status"] = "cancelled"
|
||||
page = client_request.get("main.accept_invite", token="thisisnotarealtoken")
|
||||
|
||||
app.invite_api_client.check_token.assert_called_with('thisisnotarealtoken')
|
||||
app.invite_api_client.check_token.assert_called_with("thisisnotarealtoken")
|
||||
|
||||
assert page.h1.string.strip() == 'The invitation you were sent has been cancelled'
|
||||
assert page.h1.string.strip() == "The invitation you were sent has been cancelled"
|
||||
# We don’t let people update `email_access_validated_at` using an
|
||||
# cancelled invite
|
||||
assert mock_update_user_attribute.called is False
|
||||
|
||||
|
||||
@pytest.mark.parametrize('admin_endpoint, api_endpoint', [
|
||||
('main.accept_invite', 'app.invite_api_client.check_token'),
|
||||
('main.accept_org_invite', 'app.org_invite_api_client.check_token'),
|
||||
])
|
||||
@pytest.mark.parametrize(
|
||||
"admin_endpoint, api_endpoint",
|
||||
[
|
||||
("main.accept_invite", "app.invite_api_client.check_token"),
|
||||
("main.accept_org_invite", "app.org_invite_api_client.check_token"),
|
||||
],
|
||||
)
|
||||
def test_new_user_accept_invite_with_malformed_token(
|
||||
admin_endpoint,
|
||||
api_endpoint,
|
||||
@@ -411,26 +440,34 @@ def test_new_user_accept_invite_with_malformed_token(
|
||||
mocker,
|
||||
):
|
||||
client_request.logout()
|
||||
mocker.patch(api_endpoint, side_effect=HTTPError(
|
||||
response=Mock(
|
||||
status_code=400,
|
||||
json={
|
||||
'result': 'error',
|
||||
'message': {
|
||||
'invitation': {
|
||||
'Something’s wrong with this link. Make sure you’ve copied the whole thing.'
|
||||
}
|
||||
}
|
||||
}
|
||||
mocker.patch(
|
||||
api_endpoint,
|
||||
side_effect=HTTPError(
|
||||
response=Mock(
|
||||
status_code=400,
|
||||
json={
|
||||
"result": "error",
|
||||
"message": {
|
||||
"invitation": {
|
||||
"Something’s wrong with this link. Make sure you’ve copied the whole thing."
|
||||
}
|
||||
},
|
||||
},
|
||||
),
|
||||
message={
|
||||
"invitation": "Something’s wrong with this link. Make sure you’ve copied the whole thing."
|
||||
},
|
||||
),
|
||||
message={'invitation': 'Something’s wrong with this link. Make sure you’ve copied the whole thing.'}
|
||||
))
|
||||
)
|
||||
|
||||
page = client_request.get(admin_endpoint, token='thisisnotarealtoken', _follow_redirects=True)
|
||||
page = client_request.get(
|
||||
admin_endpoint, token="thisisnotarealtoken", _follow_redirects=True
|
||||
)
|
||||
|
||||
assert normalize_spaces(
|
||||
page.select_one('.banner-dangerous').text
|
||||
) == 'Something’s wrong with this link. Make sure you’ve copied the whole thing.'
|
||||
assert (
|
||||
normalize_spaces(page.select_one(".banner-dangerous").text)
|
||||
== "Something’s wrong with this link. Make sure you’ve copied the whole thing."
|
||||
)
|
||||
|
||||
|
||||
def test_new_user_accept_invite_completes_new_registration_redirects_to_verify(
|
||||
@@ -451,40 +488,43 @@ def test_new_user_accept_invite_completes_new_registration_redirects_to_verify(
|
||||
mocker,
|
||||
):
|
||||
client_request.logout()
|
||||
expected_redirect_location = '/register-from-invite'
|
||||
expected_redirect_location = "/register-from-invite"
|
||||
|
||||
client_request.get(
|
||||
'main.accept_invite',
|
||||
token='thisisnotarealtoken',
|
||||
"main.accept_invite",
|
||||
token="thisisnotarealtoken",
|
||||
_expected_redirect=expected_redirect_location,
|
||||
)
|
||||
with client_request.session_transaction() as session:
|
||||
assert session.get('invited_user_id') == sample_invite['id']
|
||||
assert session.get("invited_user_id") == sample_invite["id"]
|
||||
|
||||
data = {'service': sample_invite['service'],
|
||||
'email_address': sample_invite['email_address'],
|
||||
'from_user': sample_invite['from_user'],
|
||||
'password': 'longpassword',
|
||||
'mobile_number': '+12027890123',
|
||||
'name': 'Invited User',
|
||||
'auth_type': 'email_auth'
|
||||
}
|
||||
data = {
|
||||
"service": sample_invite["service"],
|
||||
"email_address": sample_invite["email_address"],
|
||||
"from_user": sample_invite["from_user"],
|
||||
"password": "longpassword",
|
||||
"mobile_number": "+12027890123",
|
||||
"name": "Invited User",
|
||||
"auth_type": "email_auth",
|
||||
}
|
||||
|
||||
expected_redirect_location = '/verify'
|
||||
expected_redirect_location = "/verify"
|
||||
client_request.post(
|
||||
'main.register_from_invite',
|
||||
"main.register_from_invite",
|
||||
_data=data,
|
||||
_expected_redirect=expected_redirect_location,
|
||||
)
|
||||
|
||||
mock_send_verify_code.assert_called_once_with(ANY, 'sms', data['mobile_number'])
|
||||
mock_get_invited_user_by_id.assert_called_once_with(sample_invite['id'])
|
||||
mock_send_verify_code.assert_called_once_with(ANY, "sms", data["mobile_number"])
|
||||
mock_get_invited_user_by_id.assert_called_once_with(sample_invite["id"])
|
||||
|
||||
mock_register_user.assert_called_with(data['name'],
|
||||
data['email_address'],
|
||||
data['mobile_number'],
|
||||
data['password'],
|
||||
data['auth_type'])
|
||||
mock_register_user.assert_called_with(
|
||||
data["name"],
|
||||
data["email_address"],
|
||||
data["mobile_number"],
|
||||
data["password"],
|
||||
data["auth_type"],
|
||||
)
|
||||
|
||||
assert mock_accept_invite.call_count == 1
|
||||
|
||||
@@ -499,16 +539,18 @@ def test_signed_in_existing_user_cannot_use_anothers_invite(
|
||||
mock_accept_invite,
|
||||
mock_get_service,
|
||||
):
|
||||
mocker.patch('app.user_api_client.get_users_for_service', return_value=[api_user_active])
|
||||
mocker.patch(
|
||||
"app.user_api_client.get_users_for_service", return_value=[api_user_active]
|
||||
)
|
||||
|
||||
page = client_request.get(
|
||||
'main.accept_invite',
|
||||
token='thisisnotarealtoken',
|
||||
"main.accept_invite",
|
||||
token="thisisnotarealtoken",
|
||||
_follow_redirects=True,
|
||||
_expected_status=403,
|
||||
)
|
||||
assert page.h1.string.strip() == 'You’re not allowed to see this page'
|
||||
flash_banners = page.find_all('div', class_='banner-dangerous')
|
||||
assert page.h1.string.strip() == "You’re not allowed to see this page"
|
||||
flash_banners = page.find_all("div", class_="banner-dangerous")
|
||||
assert len(flash_banners) == 1
|
||||
banner_contents = normalize_spaces(flash_banners[0].text)
|
||||
assert "You’re signed in as test@user.gsa.gov." in banner_contents
|
||||
@@ -524,20 +566,20 @@ def test_accept_invite_does_not_treat_email_addresses_as_case_sensitive(
|
||||
sample_invite,
|
||||
mock_accept_invite,
|
||||
mock_check_invite_token,
|
||||
mock_get_user_by_email
|
||||
mock_get_user_by_email,
|
||||
):
|
||||
# the email address of api_user_active is 'test@user.gsa.gov'
|
||||
sample_invite['email_address'] = 'TEST@user.gsa.gov'
|
||||
mocker.patch('app.models.user.Users.client_method', return_value=[api_user_active])
|
||||
sample_invite["email_address"] = "TEST@user.gsa.gov"
|
||||
mocker.patch("app.models.user.Users.client_method", return_value=[api_user_active])
|
||||
|
||||
client_request.get(
|
||||
'main.accept_invite',
|
||||
token='thisisnotarealtoken',
|
||||
"main.accept_invite",
|
||||
token="thisisnotarealtoken",
|
||||
_expected_status=302,
|
||||
_expected_redirect=url_for(
|
||||
'main.service_dashboard',
|
||||
"main.service_dashboard",
|
||||
service_id=SERVICE_ONE_ID,
|
||||
)
|
||||
),
|
||||
)
|
||||
|
||||
|
||||
@@ -573,53 +615,63 @@ def test_new_invited_user_verifies_and_added_to_service(
|
||||
|
||||
# visit accept token page
|
||||
client_request.get(
|
||||
'main.accept_invite',
|
||||
token='thisisnotarealtoken',
|
||||
_expected_redirect=url_for('main.register_from_invite'),
|
||||
"main.accept_invite",
|
||||
token="thisisnotarealtoken",
|
||||
_expected_redirect=url_for("main.register_from_invite"),
|
||||
)
|
||||
|
||||
# get redirected to register from invite
|
||||
data = {
|
||||
'service': sample_invite['service'],
|
||||
'email_address': sample_invite['email_address'],
|
||||
'from_user': sample_invite['from_user'],
|
||||
'password': 'longpassword',
|
||||
'mobile_number': '+12027890123',
|
||||
'name': 'Invited User',
|
||||
'auth_type': 'sms_auth'
|
||||
"service": sample_invite["service"],
|
||||
"email_address": sample_invite["email_address"],
|
||||
"from_user": sample_invite["from_user"],
|
||||
"password": "longpassword",
|
||||
"mobile_number": "+12027890123",
|
||||
"name": "Invited User",
|
||||
"auth_type": "sms_auth",
|
||||
}
|
||||
client_request.post(
|
||||
'main.register_from_invite',
|
||||
"main.register_from_invite",
|
||||
_data=data,
|
||||
_expected_redirect=url_for('main.verify'),
|
||||
_expected_redirect=url_for("main.verify"),
|
||||
)
|
||||
|
||||
# that sends user on to verify
|
||||
page = client_request.post(
|
||||
'main.verify',
|
||||
_data={'sms_code': '123456'},
|
||||
"main.verify",
|
||||
_data={"sms_code": "123456"},
|
||||
_follow_redirects=True,
|
||||
)
|
||||
|
||||
# when they post codes back to admin user should be added to
|
||||
# service and sent on to dash board
|
||||
expected_permissions = {'view_activity', 'send_messages', 'manage_service', 'manage_api_keys'}
|
||||
expected_permissions = {
|
||||
"view_activity",
|
||||
"send_messages",
|
||||
"manage_service",
|
||||
"manage_api_keys",
|
||||
}
|
||||
|
||||
with client_request.session_transaction() as session:
|
||||
assert 'invited_user_id' not in session
|
||||
new_user_id = session['user_id']
|
||||
mock_add_user_to_service.assert_called_with(data['service'], new_user_id, expected_permissions, [])
|
||||
mock_accept_invite.assert_called_with(data['service'], sample_invite['id'])
|
||||
mock_check_verify_code.assert_called_once_with(new_user_id, '123456', 'sms')
|
||||
assert service_one['id'] == session['service_id']
|
||||
assert "invited_user_id" not in session
|
||||
new_user_id = session["user_id"]
|
||||
mock_add_user_to_service.assert_called_with(
|
||||
data["service"], new_user_id, expected_permissions, []
|
||||
)
|
||||
mock_accept_invite.assert_called_with(data["service"], sample_invite["id"])
|
||||
mock_check_verify_code.assert_called_once_with(new_user_id, "123456", "sms")
|
||||
assert service_one["id"] == session["service_id"]
|
||||
|
||||
assert page.find('h1').text == 'Dashboard'
|
||||
assert page.find("h1").text == "Dashboard"
|
||||
|
||||
|
||||
@pytest.mark.parametrize('service_permissions, trial_mode, expected_endpoint, extra_args', (
|
||||
([], True, 'main.service_dashboard', {}),
|
||||
([], False, 'main.service_dashboard', {}),
|
||||
))
|
||||
@pytest.mark.parametrize(
|
||||
"service_permissions, trial_mode, expected_endpoint, extra_args",
|
||||
(
|
||||
([], True, "main.service_dashboard", {}),
|
||||
([], False, "main.service_dashboard", {}),
|
||||
),
|
||||
)
|
||||
def test_new_invited_user_is_redirected_to_correct_place(
|
||||
mocker,
|
||||
client_request,
|
||||
@@ -638,37 +690,38 @@ def test_new_invited_user_is_redirected_to_correct_place(
|
||||
extra_args,
|
||||
):
|
||||
client_request.logout()
|
||||
mocker.patch('app.service_api_client.get_service', return_value={
|
||||
'data': service_json(
|
||||
sample_invite['service'],
|
||||
restricted=trial_mode,
|
||||
permissions=service_permissions,
|
||||
)
|
||||
})
|
||||
mocker.patch(
|
||||
"app.service_api_client.get_service",
|
||||
return_value={
|
||||
"data": service_json(
|
||||
sample_invite["service"],
|
||||
restricted=trial_mode,
|
||||
permissions=service_permissions,
|
||||
)
|
||||
},
|
||||
)
|
||||
client_request.get(
|
||||
'main.accept_invite',
|
||||
token='thisisnotarealtoken',
|
||||
"main.accept_invite",
|
||||
token="thisisnotarealtoken",
|
||||
_expected_status=302,
|
||||
)
|
||||
|
||||
with client_request.session_transaction() as session:
|
||||
session['user_details'] = {
|
||||
'email': sample_invite['email_address'],
|
||||
'id': sample_invite['id'],
|
||||
session["user_details"] = {
|
||||
"email": sample_invite["email_address"],
|
||||
"id": sample_invite["id"],
|
||||
}
|
||||
|
||||
client_request.post(
|
||||
'main.verify',
|
||||
_data={'sms_code': '123456'},
|
||||
"main.verify",
|
||||
_data={"sms_code": "123456"},
|
||||
_expected_redirect=url_for(
|
||||
expected_endpoint,
|
||||
service_id=sample_invite['service'],
|
||||
**extra_args
|
||||
)
|
||||
expected_endpoint, service_id=sample_invite["service"], **extra_args
|
||||
),
|
||||
)
|
||||
|
||||
|
||||
@freeze_time('2021-12-12 12:12:12')
|
||||
@freeze_time("2021-12-12 12:12:12")
|
||||
def test_existing_user_accepts_and_sets_email_auth(
|
||||
client_request,
|
||||
api_user_active,
|
||||
@@ -680,29 +733,33 @@ def test_existing_user_accepts_and_sets_email_auth(
|
||||
mock_check_invite_token,
|
||||
mock_update_user_attribute,
|
||||
mock_add_user_to_service,
|
||||
mocker
|
||||
mocker,
|
||||
):
|
||||
sample_invite['email_address'] = api_user_active['email_address']
|
||||
sample_invite["email_address"] = api_user_active["email_address"]
|
||||
|
||||
service_one['permissions'].append('email_auth')
|
||||
sample_invite['auth_type'] = 'email_auth'
|
||||
service_one["permissions"].append("email_auth")
|
||||
sample_invite["auth_type"] = "email_auth"
|
||||
|
||||
client_request.get(
|
||||
'main.accept_invite',
|
||||
token='thisisnotarealtoken',
|
||||
"main.accept_invite",
|
||||
token="thisisnotarealtoken",
|
||||
_expected_status=302,
|
||||
_expected_redirect=url_for('main.service_dashboard', service_id=service_one['id']),
|
||||
_expected_redirect=url_for(
|
||||
"main.service_dashboard", service_id=service_one["id"]
|
||||
),
|
||||
)
|
||||
|
||||
mock_get_existing_user_by_email.assert_called_once_with('test@user.gsa.gov')
|
||||
mock_get_existing_user_by_email.assert_called_once_with("test@user.gsa.gov")
|
||||
assert mock_update_user_attribute.call_args_list == [
|
||||
call(api_user_active['id'], email_access_validated_at='2021-12-12T12:12:12'),
|
||||
call(api_user_active['id'], auth_type='email_auth'),
|
||||
call(api_user_active["id"], email_access_validated_at="2021-12-12T12:12:12"),
|
||||
call(api_user_active["id"], auth_type="email_auth"),
|
||||
]
|
||||
mock_add_user_to_service.assert_called_once_with(ANY, api_user_active['id'], ANY, ANY)
|
||||
mock_add_user_to_service.assert_called_once_with(
|
||||
ANY, api_user_active["id"], ANY, ANY
|
||||
)
|
||||
|
||||
|
||||
@freeze_time('2021-12-12 12:12:12')
|
||||
@freeze_time("2021-12-12 12:12:12")
|
||||
def test_platform_admin_user_accepts_and_preserves_auth(
|
||||
client_request,
|
||||
platform_admin_user,
|
||||
@@ -712,35 +769,39 @@ def test_platform_admin_user_accepts_and_preserves_auth(
|
||||
mock_no_users_for_service,
|
||||
mock_accept_invite,
|
||||
mock_add_user_to_service,
|
||||
mocker
|
||||
mocker,
|
||||
):
|
||||
sample_invite['email_address'] = platform_admin_user['email_address']
|
||||
sample_invite['auth_type'] = 'email_auth'
|
||||
service_one['permissions'].append('email_auth')
|
||||
sample_invite["email_address"] = platform_admin_user["email_address"]
|
||||
sample_invite["auth_type"] = "email_auth"
|
||||
service_one["permissions"].append("email_auth")
|
||||
|
||||
mocker.patch('app.user_api_client.get_user_by_email', return_value=platform_admin_user)
|
||||
mocker.patch(
|
||||
"app.user_api_client.get_user_by_email", return_value=platform_admin_user
|
||||
)
|
||||
mock_update_user_attribute = mocker.patch(
|
||||
'app.user_api_client.update_user_attribute',
|
||||
"app.user_api_client.update_user_attribute",
|
||||
return_value=platform_admin_user,
|
||||
)
|
||||
|
||||
client_request.login(platform_admin_user)
|
||||
|
||||
client_request.get(
|
||||
'main.accept_invite',
|
||||
token='thisisnotarealtoken',
|
||||
"main.accept_invite",
|
||||
token="thisisnotarealtoken",
|
||||
_expected_status=302,
|
||||
_expected_redirect=url_for('main.service_dashboard', service_id=service_one['id']),
|
||||
_expected_redirect=url_for(
|
||||
"main.service_dashboard", service_id=service_one["id"]
|
||||
),
|
||||
)
|
||||
|
||||
mock_update_user_attribute.assert_called_once_with(
|
||||
platform_admin_user['id'],
|
||||
email_access_validated_at='2021-12-12T12:12:12',
|
||||
platform_admin_user["id"],
|
||||
email_access_validated_at="2021-12-12T12:12:12",
|
||||
)
|
||||
assert mock_add_user_to_service.called
|
||||
|
||||
|
||||
@freeze_time('2021-12-12 12:12:12')
|
||||
@freeze_time("2021-12-12 12:12:12")
|
||||
def test_existing_user_doesnt_get_auth_changed_by_service_without_permission(
|
||||
client_request,
|
||||
api_user_active,
|
||||
@@ -752,28 +813,30 @@ def test_existing_user_doesnt_get_auth_changed_by_service_without_permission(
|
||||
mock_accept_invite,
|
||||
mock_update_user_attribute,
|
||||
mock_add_user_to_service,
|
||||
mocker
|
||||
mocker,
|
||||
):
|
||||
sample_invite['email_address'] = api_user_active['email_address']
|
||||
sample_invite["email_address"] = api_user_active["email_address"]
|
||||
|
||||
assert 'email_auth' not in service_one['permissions']
|
||||
assert "email_auth" not in service_one["permissions"]
|
||||
|
||||
sample_invite['auth_type'] = 'email_auth'
|
||||
sample_invite["auth_type"] = "email_auth"
|
||||
|
||||
client_request.get(
|
||||
'main.accept_invite',
|
||||
token='thisisnotarealtoken',
|
||||
"main.accept_invite",
|
||||
token="thisisnotarealtoken",
|
||||
_expected_status=302,
|
||||
_expected_redirect=url_for('main.service_dashboard', service_id=service_one['id']),
|
||||
_expected_redirect=url_for(
|
||||
"main.service_dashboard", service_id=service_one["id"]
|
||||
),
|
||||
)
|
||||
|
||||
mock_update_user_attribute.assert_called_once_with(
|
||||
api_user_active['id'],
|
||||
email_access_validated_at='2021-12-12T12:12:12',
|
||||
api_user_active["id"],
|
||||
email_access_validated_at="2021-12-12T12:12:12",
|
||||
)
|
||||
|
||||
|
||||
@freeze_time('2021-12-12 12:12:12')
|
||||
@freeze_time("2021-12-12 12:12:12")
|
||||
def test_existing_email_auth_user_without_phone_cannot_set_sms_auth(
|
||||
client_request,
|
||||
api_user_active,
|
||||
@@ -784,32 +847,34 @@ def test_existing_email_auth_user_without_phone_cannot_set_sms_auth(
|
||||
mock_accept_invite,
|
||||
mock_update_user_attribute,
|
||||
mock_add_user_to_service,
|
||||
mocker
|
||||
mocker,
|
||||
):
|
||||
sample_invite['email_address'] = api_user_active['email_address']
|
||||
sample_invite["email_address"] = api_user_active["email_address"]
|
||||
|
||||
service_one['permissions'].append('email_auth')
|
||||
service_one["permissions"].append("email_auth")
|
||||
|
||||
api_user_active['auth_type'] = 'email_auth'
|
||||
api_user_active['mobile_number'] = None
|
||||
sample_invite['auth_type'] = 'sms_auth'
|
||||
api_user_active["auth_type"] = "email_auth"
|
||||
api_user_active["mobile_number"] = None
|
||||
sample_invite["auth_type"] = "sms_auth"
|
||||
|
||||
mocker.patch('app.user_api_client.get_user_by_email', return_value=api_user_active)
|
||||
mocker.patch("app.user_api_client.get_user_by_email", return_value=api_user_active)
|
||||
|
||||
client_request.get(
|
||||
'main.accept_invite',
|
||||
token='thisisnotarealtoken',
|
||||
"main.accept_invite",
|
||||
token="thisisnotarealtoken",
|
||||
_expected_status=302,
|
||||
_expected_redirect=url_for('main.service_dashboard', service_id=service_one['id']),
|
||||
_expected_redirect=url_for(
|
||||
"main.service_dashboard", service_id=service_one["id"]
|
||||
),
|
||||
)
|
||||
|
||||
mock_update_user_attribute.assert_called_once_with(
|
||||
api_user_active['id'],
|
||||
email_access_validated_at='2021-12-12T12:12:12',
|
||||
api_user_active["id"],
|
||||
email_access_validated_at="2021-12-12T12:12:12",
|
||||
)
|
||||
|
||||
|
||||
@freeze_time('2021-12-12 12:12:12')
|
||||
@freeze_time("2021-12-12 12:12:12")
|
||||
def test_existing_email_auth_user_with_phone_can_set_sms_auth(
|
||||
client_request,
|
||||
api_user_active,
|
||||
@@ -821,21 +886,25 @@ def test_existing_email_auth_user_with_phone_can_set_sms_auth(
|
||||
mock_accept_invite,
|
||||
mock_update_user_attribute,
|
||||
mock_add_user_to_service,
|
||||
mocker
|
||||
mocker,
|
||||
):
|
||||
sample_invite['email_address'] = api_user_active['email_address']
|
||||
service_one['permissions'].append('email_auth')
|
||||
sample_invite['auth_type'] = 'sms_auth'
|
||||
sample_invite["email_address"] = api_user_active["email_address"]
|
||||
service_one["permissions"].append("email_auth")
|
||||
sample_invite["auth_type"] = "sms_auth"
|
||||
|
||||
client_request.get(
|
||||
'main.accept_invite',
|
||||
token='thisisnotarealtoken',
|
||||
"main.accept_invite",
|
||||
token="thisisnotarealtoken",
|
||||
_expected_status=302,
|
||||
_expected_redirect=url_for('main.service_dashboard', service_id=service_one['id']),
|
||||
_expected_redirect=url_for(
|
||||
"main.service_dashboard", service_id=service_one["id"]
|
||||
),
|
||||
)
|
||||
|
||||
mock_get_existing_user_by_email.assert_called_once_with(sample_invite['email_address'])
|
||||
mock_get_existing_user_by_email.assert_called_once_with(
|
||||
sample_invite["email_address"]
|
||||
)
|
||||
assert mock_update_user_attribute.call_args_list == [
|
||||
call(api_user_active['id'], email_access_validated_at='2021-12-12T12:12:12'),
|
||||
call(api_user_active['id'], auth_type='sms_auth'),
|
||||
call(api_user_active["id"], email_access_validated_at="2021-12-12T12:12:12"),
|
||||
call(api_user_active["id"], auth_type="sms_auth"),
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user