diff --git a/app/dao/permissions_dao.py b/app/dao/permissions_dao.py index 601a95293..d7215ee58 100644 --- a/app/dao/permissions_dao.py +++ b/app/dao/permissions_dao.py @@ -8,8 +8,16 @@ manage_service = 'manage_service' send_messages = 'send_messages' manage_api_keys = 'manage_api_keys' manage_templates = 'manage_templates' +manage_team = 'manage_team' +view_activity = 'view_activity' # Default permissions for a service -default_service_permissions = [manage_service, send_messages, manage_api_keys, manage_templates] +default_service_permissions = [ + manage_service, + send_messages, + manage_api_keys, + manage_templates, + manage_team, + view_activity] class PermissionDAO(DAOClass): diff --git a/tests/app/user/test_rest.py b/tests/app/user/test_rest.py index c0553cce9..57fb0827a 100644 --- a/tests/app/user/test_rest.py +++ b/tests/app/user/test_rest.py @@ -31,7 +31,8 @@ def test_get_user_list(notify_api, notify_db, notify_db_session, sample_user, sa "failed_login_count": 0, "permissions": { str(sample_admin_service_id): [ - 'manage_service', 'send_messages', 'manage_api_keys', 'manage_templates']} + 'manage_service', 'send_messages', 'manage_api_keys', 'manage_templates', + 'manage_team', 'view_activity']} } print(json_resp['data']) assert expected in json_resp['data'] @@ -62,7 +63,8 @@ def test_get_user(notify_api, notify_db, notify_db_session, sample_user, sample_ "failed_login_count": 0, "permissions": { str(sample_admin_service_id): [ - 'manage_service', 'send_messages', 'manage_api_keys', 'manage_templates']} + 'manage_service', 'send_messages', 'manage_api_keys', 'manage_templates', + 'manage_team', 'view_activity']} } assert json_resp['data'] == expected @@ -203,7 +205,8 @@ def test_put_user(notify_api, notify_db, notify_db_session, sample_user, sample_ "failed_login_count": 0, "permissions": { str(sample_admin_service_id): [ - 'manage_service', 'send_messages', 'manage_api_keys', 'manage_templates']} + 'manage_service', 'send_messages', 'manage_api_keys', 'manage_templates', + 'manage_team', 'view_activity']} } assert json_resp['data'] == expected assert json_resp['data']['email_address'] == new_email @@ -303,7 +306,8 @@ def test_get_user_by_email(notify_api, notify_db, notify_db_session, sample_user "failed_login_count": 0, "permissions": { str(sample_admin_service_id): [ - 'manage_service', 'send_messages', 'manage_api_keys', 'manage_templates']} + 'manage_service', 'send_messages', 'manage_api_keys', 'manage_templates', + 'manage_team', 'view_activity']} } assert json_resp['data'] == expected