Merge branch 'instance/fid' into instance/fid_bbi

fid/config/vufind/permissions.ini

@@ -23,16 +23,20 @@ relative_path = ../../../local/config/vufind/permissions.ini
 ; Show staff view for all users by default
 [fid.ReadList]
 role[] = loggedin
-FidApiPermission = read_user_list
+FidApiPermission[] = read_user_list
+permission = fid.ReadList
 
 [fid.EditUser]
 role[] = loggedin
-FidApiPermission = edit_user
+FidApiPermission[] = edit_user
+permission = fid.EditUser
 
 [fid.LimitedAccess]
 role[] = loggedin
-FidApiPermission = limited_access
+FidApiPermission[] = limited_access
+permission = fid.LimitedAccess
 
 [fid.FullAccess]
 role[] = loggedin
-FidApiPermission = full_access
+FidApiPermission[] = full_access
\ No newline at end of file
+permission = fid.FullAccess
\ No newline at end of file

module/fid/src/Role/PermissionProvider/FidApiPermission.php

@@ -67,10 +67,16 @@ class FidApiPermission implements PermissionProviderInterface
      */
     public function getPermissions($options)
     {
-        if ($this->client->isAuthorized($options)) {
-            return ['loggedin'];
+        $authorized = TRUE;
+        foreach ((array)$options as $option) {
+            if (!$this->client->isAuthorized($option)) {
+                // a user missing any role
+                // will not be authorized
+                $authorized = FALSE;
+                break;
+            }
         }
         //  No match? No permissions.
-        return [];
+        return $authorized ? ['loggedin'] : [];
     }
 }

themes/fid/languages/fid/de.ini

@@ -101,4 +101,6 @@ user_edit = "Nutzer %%userid%% bearbeiten"
 permission_read_user_list = "Liste aller Nutzer einsehen"
 permission_edit_user = "Daten anderer Nutzer bearbeiten"
 permission_full_access = "Zugriff auf FID-Lizenzen"
-permission_limited_access = "Einfacher Zugriff"
+permission_limited_access = "Einfacher Zugriff"
\ No newline at end of file
+
+admin_section = "Nutzerverwaltung"
\ No newline at end of file

themes/fid/languages/fid/en.ini

@@ -100,4 +100,6 @@ user_edit = "Edit user %%userid%%"
 permission_read_user_list = "Read list of all users"
 permission_edit_user = "Edit other user's data"
 permission_full_access = "privileged access"
-permission_limited_access = "basic access"
+permission_limited_access = "basic access"
\ No newline at end of file
+
+admin_section = "User Administration"
\ No newline at end of file

themes/fid/templates/myresearch/menu.phtml

@@ -123,4 +123,11 @@
     </a>
   </div>
 <?php endif ?>
+<?php if ($this->permission()->allowDisplay('fid.ReadList')): ?>
+<br/>
+<h4><?=$this->transEsc('fid::admin_section')?></h4>
+<div class="myresearch-menu">
+    <a href="<?=$this->url('fid/admin/list')?>"><?=$this->transEsc('fid::permission_read_user_list')?></a>
+<?php endif; ?>
+</div>
 <!-- fid: myresearch - menu.phtml END -->