mirror of
https://github.com/GSA/notifications-admin.git
synced 2025-12-11 07:33:36 -05:00
Replace "admin roles" with "ui permissions"
In response to: [1].
While this does introduce a new term ("admin roles" is still used
elsewhere in the code), I plan to fix this in a follow-up PR (it
turned out to be quite a big change to do on this branch).
[1]: https://github.com/alphagov/notifications-admin/pull/3970#discussion_r673292339
This commit is contained in:
@@ -7,8 +7,8 @@ EVENT_SCHEMAS = {
|
|||||||
"update_user_email": {"user_id", "updated_by_id", "original_email_address", "new_email_address"},
|
"update_user_email": {"user_id", "updated_by_id", "original_email_address", "new_email_address"},
|
||||||
"update_user_mobile_number": {"user_id", "updated_by_id", "original_mobile_number", "new_mobile_number"},
|
"update_user_mobile_number": {"user_id", "updated_by_id", "original_mobile_number", "new_mobile_number"},
|
||||||
"remove_user_from_service": {"user_id", "removed_by_id", "service_id"},
|
"remove_user_from_service": {"user_id", "removed_by_id", "service_id"},
|
||||||
"add_user_to_service": {"user_id", "invited_by_id", "service_id", "admin_roles"},
|
"add_user_to_service": {"user_id", "invited_by_id", "service_id", "ui_permissions"},
|
||||||
"set_user_permissions": {"user_id", "service_id", "original_admin_roles", "new_admin_roles", "set_by_id"},
|
"set_user_permissions": {"user_id", "service_id", "original_ui_permissions", "new_ui_permissions", "set_by_id"},
|
||||||
"archive_user": {"user_id", "archived_by_id"},
|
"archive_user": {"user_id", "archived_by_id"},
|
||||||
"change_broadcast_account_type": {"service_id", "changed_by_id", "service_mode", "broadcast_channel", "provider_restriction"}, # noqa: E501 (length)
|
"change_broadcast_account_type": {"service_id", "changed_by_id", "service_mode", "broadcast_channel", "provider_restriction"}, # noqa: E501 (length)
|
||||||
"archive_service": {"service_id", "archived_by_id"},
|
"archive_service": {"service_id", "archived_by_id"},
|
||||||
|
|||||||
@@ -135,8 +135,8 @@ class User(JSONModel, UserMixin):
|
|||||||
create_set_user_permissions_event(
|
create_set_user_permissions_event(
|
||||||
user_id=self.id,
|
user_id=self.id,
|
||||||
service_id=service_id,
|
service_id=service_id,
|
||||||
original_admin_roles=self.permissions_for_service(service_id),
|
original_ui_permissions=self.permissions_for_service(service_id),
|
||||||
new_admin_roles=permissions,
|
new_ui_permissions=permissions,
|
||||||
set_by_id=set_by_id,
|
set_by_id=set_by_id,
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -425,7 +425,7 @@ class User(JSONModel, UserMixin):
|
|||||||
user_id=self.id,
|
user_id=self.id,
|
||||||
invited_by_id=invited_by_id,
|
invited_by_id=invited_by_id,
|
||||||
service_id=service_id,
|
service_id=service_id,
|
||||||
admin_roles=permissions,
|
ui_permissions=permissions,
|
||||||
)
|
)
|
||||||
except HTTPError as exception:
|
except HTTPError as exception:
|
||||||
if exception.status_code == 400 and 'already part of service' in exception.message:
|
if exception.status_code == 400 and 'already part of service' in exception.message:
|
||||||
|
|||||||
@@ -152,8 +152,8 @@ def test_set_permissions(client, mocker, active_user_view_permissions, fake_uuid
|
|||||||
mock_event.assert_called_once_with(
|
mock_event.assert_called_once_with(
|
||||||
service_id=SERVICE_ONE_ID,
|
service_id=SERVICE_ONE_ID,
|
||||||
user_id=active_user_view_permissions['id'],
|
user_id=active_user_view_permissions['id'],
|
||||||
original_admin_roles={'view_activity'},
|
original_ui_permissions={'view_activity'},
|
||||||
new_admin_roles={'manage_templates'},
|
new_ui_permissions={'manage_templates'},
|
||||||
set_by_id=fake_uuid,
|
set_by_id=fake_uuid,
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -174,5 +174,5 @@ def test_add_to_service(client, mocker, api_user_active, fake_uuid):
|
|||||||
service_id=SERVICE_ONE_ID,
|
service_id=SERVICE_ONE_ID,
|
||||||
user_id=api_user_active['id'],
|
user_id=api_user_active['id'],
|
||||||
invited_by_id=fake_uuid,
|
invited_by_id=fake_uuid,
|
||||||
admin_roles={'manage_templates'},
|
ui_permissions={'manage_templates'},
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -50,7 +50,7 @@ def test_create_add_user_to_service_event_calls_events_api(client, mock_events):
|
|||||||
"user_id": str(uuid.uuid4()),
|
"user_id": str(uuid.uuid4()),
|
||||||
"invited_by_id": str(uuid.uuid4()),
|
"invited_by_id": str(uuid.uuid4()),
|
||||||
"service_id": str(uuid.uuid4()),
|
"service_id": str(uuid.uuid4()),
|
||||||
"admin_roles": {'manage_templates'},
|
"ui_permissions": {'manage_templates'},
|
||||||
}
|
}
|
||||||
|
|
||||||
create_add_user_to_service_event(**kwargs)
|
create_add_user_to_service_event(**kwargs)
|
||||||
@@ -137,8 +137,8 @@ def test_set_user_permissions(client, mock_events):
|
|||||||
kwargs = {
|
kwargs = {
|
||||||
"user_id": str(uuid.uuid4()),
|
"user_id": str(uuid.uuid4()),
|
||||||
"service_id": str(uuid.uuid4()),
|
"service_id": str(uuid.uuid4()),
|
||||||
"original_admin_roles": set("manage_templates"),
|
"original_ui_permissions": set("manage_templates"),
|
||||||
"new_admin_roles": set("view_activity"),
|
"new_ui_permissions": set("view_activity"),
|
||||||
"set_by_id": str(uuid.uuid4()),
|
"set_by_id": str(uuid.uuid4()),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user