Use new object perunFacility in LDAP to search information about facility

Author: vyskocilpavel

CHANGELOG.md

@@ -20,6 +20,7 @@ All notable changes to this project will be documented in this file.
 #### Changed
 - RpcConnector now stores cookie into file
 - Set CONNECTTIMEOUT and TIMEOUT in RpcConnector
+- Use new object perunFacility in LDAP to search information about facility
 
 ## [v3.2.1]
 #### Fixed

lib/AdapterLdap.php

@@ -118,9 +118,16 @@ public function getMemberGroups($user, $vo)
 
     public function getSpGroups($spEntityId)
     {
+        $facility = $this->connector->searchForEntity(
+            $this->ldapBase,
+            "(&(objectClass=perunFacility)(entityID=$spEntityId))",
+            ['perunFacilityId']
+        );
+
+        $id = $facility['perunFacilityId'][0];
         $resources = $this->connector->searchForEntities(
             $this->ldapBase,
-            "(&(objectClass=perunResource)(entityID=$spEntityId))",
+            "(&(objectClass=perunResource)(perunFacilityDn=perunFacilityId=$id,$this->ldapBase))",
             ["perunResourceId", "assignedGroupId", "perunVoId"]
         );
 
@@ -270,9 +277,16 @@ public function setUserExtSourceAttributes($userExtSourceId, $attributes)
 
     public function getUsersGroupsOnFacility($spEntityId, $userId)
     {
+        $facility = $this->connector->searchForEntity(
+            $this->ldapBase,
+            "(&(objectClass=perunFacility)(entityID=$spEntityId))",
+            ['perunFacilityId']
+        );
+
+        $id = $facility['perunFacilityId'][0];
         $resources = $this->connector->searchForEntities(
             $this->ldapBase,
-            "(&(objectClass=perunResource)(entityID=$spEntityId))",
+            "(&(objectClass=perunResource)(perunFacilityDn=perunFacilityId=$id,$this->ldapBase))",
             ["perunResourceId"]
         );
         Logger::debug("Resources - " . var_export($resources, true));