Merge branch 'feature/ISTWCMS-4632-lkmorlan-role-expire-permissions' into '1.0.x'

ISTWCMS-4632: Use new role_expire permissions

See merge request !73

config/install/user.role.uw_role_site_owner.yml

@@ -42,7 +42,6 @@ permissions:
   - 'access site reports'
   - 'access user profiles'
   - 'administer main menu items'
-  - 'administer role expire'
   - 'administer shortcuts'
   - 'administer universal analytics'
   - 'administer users'
@@ -52,4 +51,5 @@ permissions:
   - 'can view my_dashboard dashboard'
   - 'create and edit custom blocks'
   - 'customize shortcut links'
+  - 'edit users role expire'
   - 'enable disable ofis profiles'

src/Access/UwNodeAccessCheck.php

@@ -55,11 +55,6 @@ class UwNodeAccessCheck implements AccessInterface {
       }
     }
 
-    // Role Expire config: admin/config/system/role-expire.
-    if ($route_name === 'role_expire.config') {
-      return $account->hasPermission('administer role expire configuration') ? AccessResult::allowed() : AccessResult::forbidden();
-    }
-
     // Dashboard config: admin/config/dashboards/dashboardssettings.
     if ($route_name === 'dashboards.dashboards_settings_form') {
       return $account->hasPermission('access dashboard config') ? AccessResult::allowed() : AccessResult::forbidden();

src/Routing/UwNodeAccessRouteSubscriber.php

@@ -24,8 +24,6 @@ class UwNodeAccessRouteSubscriber extends RouteSubscriberBase {
       'entity.node.delete_form',
       // Menu link edit pages.
       'menu_ui.link_edit',
-      // Role Expire config: admin/config/system/role-expire.
-      'role_expire.config',
     ];
     foreach ($access_route_names as $route_name) {
       if ($route = $collection->get($route_name)) {

uw_cfg_common.permissions.yml

@@ -4,10 +4,6 @@
 'access dashboard config':
   title: 'Access dashboard configuration'
   description: 'Allows access to admin/config/dashboards/dashboardssettings.'
-'administer role expire configuration':
-  title: 'Administer role expire configuration'
-  description: 'Allows access to admin/config/system/role-expire.'
-  restrict access: true
 'access manage toolbar item':
   title: 'Access "Manage" toolbar item'
   description: 'Allows access to the toolbar item "Manage". Without this, "People" and "Reports" will appear under "Workbench" to those who have access.'