darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-25 08:44:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Set folder permissions when creating and accepting invites to services

Browse Source 
Added a folder permissions form to the page to invite users to services.
This only shows if the service has 'edit_folder_permissions' enabled,
and all folder checkboxes are checked by default. This change means that
InviteApiClient.create_invite now sends folder_permissions through to
notifications_api (so invites get created with folder permissions).

Started passing the folder_permissions through to notifications-api when
accepting an invite. This changes UserApiClient.add_user_to_service to
send folder_permissions to notifications_api so that new users get folder
permissions when they are added to the service.
This commit is contained in:
Katie Smith
2019-03-15 14:57:39 +00:00
parent 782bd34394
commit c39f6d49ea
10 changed files with 82 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
tests/app/main/views/test_manage_users.py
View File

@@ -578,12 +578,37 @@ def test_should_show_page_for_inviting_user(
logged_in_client,
active_user_with_permissions,
mocker,
mock_get_template_folders,
):
service = create_sample_service(active_user_with_permissions)
response = logged_in_client.get(url_for('main.invite_user', service_id=service['id']))
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
assert 'Invite a team member' in response.get_data(as_text=True)
assert 'Invite a team member' in page.find('h1').text.strip()
assert response.status_code == 200
assert not page.find('div', class_='checkboxes-nested')
def test_should_show_folder_permission_form_if_service_has_folder_permissions_enabled(
logged_in_client,
mocker,
mock_get_template_folders,
service_one
):
service_one['permissions'].append('edit_folder_permissions')
mock_get_template_folders.return_value = [
{'id': 'folder-id-1', 'name': 'folder_one', 'parent_id': None, 'users_with_permission': []},
{'id': 'folder-id-2', 'name': 'folder_two', 'parent_id': None, 'users_with_permission': []},
{'id': 'folder-id-3', 'name': 'folder_three', 'parent_id': 'folder-id-1', 'users_with_permission': []},
]
response = logged_in_client.get(url_for('main.invite_user', service_id=service_one['id']))
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
assert 'Invite a team member' in page.find('h1').text.strip()
assert response.status_code == 200
folder_checkboxes = page.find('div', class_='checkboxes-nested').find_all('li')
assert len(folder_checkboxes) == 3
@pytest.mark.parametrize('email_address, gov_user', [
@@ -597,6 +622,7 @@ def test_invite_user(
sample_invite,
email_address,
gov_user,
mock_get_template_folders,
):
service = create_sample_service(active_user_with_permissions)
sample_invite['email_address'] = 'test@example.gov.uk'
@@ -629,7 +655,8 @@ def test_invite_user(
sample_invite['service'],
email_address,
expected_permissions,
'sms_auth')
'sms_auth',
folder_permissions=sample_invite['folder_permissions'])
@pytest.mark.parametrize('auth_type', [
@@ -648,7 +675,8 @@ def test_invite_user_with_email_auth_service(
gov_user,
mocker,
service_one,
auth_type
auth_type,
mock_get_template_folders,
):
service_one['permissions'].append('email_auth')
sample_invite['email_address'] = 'test@example.gov.uk'
@@ -682,7 +710,8 @@ def test_invite_user_with_email_auth_service(
sample_invite['service'],
email_address,
expected_permissions,
auth_type)
auth_type,
folder_permissions=sample_invite['folder_permissions'])
def test_cancel_invited_user_cancels_user_invitations(
@@ -785,6 +814,7 @@ def test_user_cant_invite_themselves(
mocker,
active_user_with_permissions,
mock_create_invite,
mock_get_template_folders,
):
service = create_sample_service(active_user_with_permissions)
response = logged_in_client.post(