Merge pull request #991 from GSA/fix-service-invite-user-permission

Fix permissions check for inviting users to a service

app/main/views/manage_users.py

@@ -21,7 +21,7 @@ from app.main.forms import (
     SearchUsersForm,
 )
 from app.models.user import InvitedUser, User
-from app.utils.user import is_gov_user, user_has_permissions, user_is_platform_admin
+from app.utils.user import is_gov_user, user_has_permissions
 from app.utils.user_permissions import permission_options
 
 
@@ -42,7 +42,7 @@ def manage_users(service_id):
 @main.route(
     "/services/<uuid:service_id>/users/invite/<uuid:user_id>", methods=["GET", "POST"]
 )
-@user_is_platform_admin
+@user_has_permissions("manage_service")
 def invite_user(service_id, user_id=None):
     form_class = InviteUserForm
     form = form_class(

tests/app/main/views/test_manage_users.py

@@ -762,9 +762,9 @@ def test_edit_user_permissions_shows_authentication_for_email_auth_service(
 def test_should_show_page_for_inviting_user(
     client_request,
     mock_get_template_folders,
-    platform_admin_user,
+    active_user_with_permissions,
 ):
-    client_request.login(platform_admin_user)
+    client_request.login(active_user_with_permissions)
     page = client_request.get(
         "main.invite_user",
         service_id=SERVICE_ONE_ID,
@@ -774,6 +774,21 @@ def test_should_show_page_for_inviting_user(
     assert not page.find("div", class_="checkboxes-nested")
 
 
+def test_should_not_show_page_for_inviting_user_without_permissions(
+    client_request,
+    mock_get_template_folders,
+    active_user_empty_permissions
+):
+    client_request.login(active_user_empty_permissions)
+    page = client_request.get(
+        "main.invite_user",
+        service_id=SERVICE_ONE_ID,
+        _expected_status=403
+    )
+
+    assert "not allowed to see this page" in page.h1.string.strip()
+
+
 def test_should_show_page_for_inviting_user_with_email_prefilled(
     client_request,
     mocker,
@@ -800,10 +815,13 @@ def test_should_show_page_for_inviting_user_with_email_prefilled(
         user_id=fake_uuid,
         # We have the user’s name in the H1 but don’t want it duplicated
         # in the page title
-        _test_page_title=False,
+        _test_page_title=False
-        _expected_status=403,
     )
-    assert "not allowed to see this page" in page.h1.string.strip()
+    assert normalize_spaces(page.select_one("title").text).startswith(
+        "Invite a team member"
+    )
+    assert normalize_spaces(page.select_one("h1").text) == ("Invite Service Two User")
+    assert not page.select("input#email_address") or page.select("input[type=email]")
 
 
 def test_should_show_page_if_prefilled_user_is_already_a_team_member(
@@ -812,10 +830,9 @@ def test_should_show_page_if_prefilled_user_is_already_a_team_member(
     mock_get_template_folders,
     fake_uuid,
     active_user_with_permissions,
-    active_caseworking_user,
+    active_caseworking_user
-    platform_admin_user,
 ):
-    client_request.login(platform_admin_user)
+    client_request.login(active_user_with_permissions)
     mocker.patch(
         "app.models.user.user_api_client.get_user",
         side_effect=[
@@ -1280,9 +1297,11 @@ def test_user_cant_invite_themselves(
             "permissions_field": ["send_messages", "manage_service", "manage_api_keys"],
         },
         _follow_redirects=True,
-        _expected_status=403,
+        _expected_status=200,
     )
-    assert "not allowed to see this page" in page.h1.string.strip()
+    assert page.h1.string.strip() == "Invite a team member"
+    form_error = page.find("span", class_="usa-error-message").text.strip()
+    assert form_error == "Error: You cannot send an invitation to yourself"
     assert not mock_create_invite.called
 
 

tests/conftest.py

@@ -1067,6 +1067,11 @@ def active_user_with_permissions(fake_uuid):
     return create_active_user_with_permissions()
 
 
+@pytest.fixture()
+def active_user_empty_permissions(fake_uuid):
+    return create_active_user_empty_permissions()
+
+
 @pytest.fixture()
 def active_user_with_permission_to_two_services(fake_uuid):
     permissions = [