From 008b990e14260f664d1e9210e88706bc49ba0bfc Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Wed, 8 Nov 2023 07:51:57 -0800 Subject: [PATCH] code review feedback --- app/notify_client/service_api_client.py | 2 -- tests/app/main/views/test_manage_users.py | 18 ++++++++++++++++++ tests/app/main/views/test_sign_in.py | 16 +++++++++++++++- 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/app/notify_client/service_api_client.py b/app/notify_client/service_api_client.py index 881f435f8..434bf8b3b 100644 --- a/app/notify_client/service_api_client.py +++ b/app/notify_client/service_api_client.py @@ -3,8 +3,6 @@ from datetime import datetime from app.extensions import redis_client from app.notify_client import NotifyAdminAPIClient, _attach_current_user, cache -# from notifications_utils.clients.redis import daily_total_cache_key - class ServiceAPIClient(NotifyAdminAPIClient): @cache.delete("user-{user_id}") diff --git a/tests/app/main/views/test_manage_users.py b/tests/app/main/views/test_manage_users.py index 45232c35d..718c5fbe5 100644 --- a/tests/app/main/views/test_manage_users.py +++ b/tests/app/main/views/test_manage_users.py @@ -15,6 +15,7 @@ from tests.conftest import ( create_active_user_manage_template_permissions, create_active_user_view_permissions, create_active_user_with_permissions, + create_platform_admin_user, normalize_spaces, sample_uuid, ) @@ -1330,6 +1331,23 @@ def test_user_cant_invite_themselves( assert not mock_create_invite.called +def test_user_cant_invite_themselves_platform_admin( + client_request, + mocker, + mock_create_invite, + mock_get_template_folders, +): + platform_admin = create_platform_admin_user() + client_request.login(platform_admin) + page = client_request.post( + "main.invite_user", + service_id=SERVICE_ONE_ID, + _follow_redirects=True, + _expected_status=200, + ) + assert "Invite a team member" in page.h1.string.strip() + + def test_no_permission_manage_users_page( client_request, service_one, diff --git a/tests/app/main/views/test_sign_in.py b/tests/app/main/views/test_sign_in.py index 4cc4275ef..74c158ab8 100644 --- a/tests/app/main/views/test_sign_in.py +++ b/tests/app/main/views/test_sign_in.py @@ -4,7 +4,7 @@ import pytest from flask import url_for from app.models.user import User -from tests.conftest import SERVICE_ONE_ID, normalize_spaces +from tests.conftest import SERVICE_ONE_ID, create_platform_admin_user, normalize_spaces def test_render_sign_in_template_for_new_user(client_request): @@ -77,6 +77,20 @@ def test_doesnt_redirect_to_sign_in_if_no_session_info( client_request.get("main.add_service") +def test_doesnt_redirect_to_sign_in_if_no_session_info_platform_admin( + client_request, + mock_get_organization_by_domain, +): + platform_admin = create_platform_admin_user() + client_request.login(platform_admin) + platform_admin["current_session_id"] = str(uuid.UUID(int=1)) + + with client_request.session_transaction() as session: + session["current_session_id"] = None + + client_request.get("main.add_service") + + @pytest.mark.parametrize( ("db_sess_id", "cookie_sess_id"), [