Merge pull request #283 from dBucik/fix_capabilities

fix: 🐛 Fix EntitlementUtils calling capabilities in LDAP

Author: Dominik František Bučík

lib/AdapterLdap.php

@@ -632,7 +632,7 @@ public function getResourceCapabilities(string $spEntityId, array $userGroups, s
 
             foreach ($resource[self::ASSIGNED_GROUP_ID] as $groupId) {
                 if (in_array($groupId, $userGroupsIds, true)) {
-                    $capabilities = array_merge($capabilities, $resources[self::CAPABILITIES]);
+                    $capabilities = array_merge($capabilities, $resource[self::CAPABILITIES]);
                     break;
                 }
             }

lib/EntitlementUtils.php

@@ -73,13 +73,12 @@ public static function getCapabilities(&$request, $adapter, $prefix, $authority,
         }
 
         try {
-            $resourceCapabilities = $entityIdAttr === null ? $adapter->getResourceCapabilities(
+            $resourceCapabilities = $adapter->getResourceCapabilities(
                 $spEntityId,
-                $request['perun']['groups']
-            ) : $adapter->getResourceCapabilities($spEntityId, $request['perun']['groups'], $entityIdAttr);
-            $facilityCapabilities = $entityIdAttr === null ? $adapter->getFacilityCapabilities(
-                $spEntityId
-            ) : $adapter->getFacilityCapabilities($spEntityId, $entityIdAttr);
+                $request['perun']['groups'],
+                $entityIdAttr ?? ''
+            );
+            $facilityCapabilities = $adapter->getFacilityCapabilities($spEntityId, $entityIdAttr ?? '');
         } catch (Exception $exception) {
             Logger::error(
                 'perun:EntitlementUtils: Exception ' . $exception->getMessage() .