Merge pull request #24 from pajavyskocil/master_RPC

Fix the AdapterRpc

Author: tauceti2

lib/Adapter.php

@@ -74,7 +74,7 @@ public abstract function getUserAttributes($user, $attrNames);
 	 * @param int $userId
 	 * @return sspmod_perun_model_Group[] from vo which are assigned to all facilities with spEntityId for this userId
 	 */
-	public abstract function isUserOnFacility($spEntityId, $userId);
+	public abstract function getUsersGroupsOnFacility($spEntityId, $userId);
 
 	/**
 	 * @param sspmod_perun_model_HasId[] $entities

lib/AdapterLdap.php

@@ -140,7 +140,7 @@ public function getUserAttributes($user, $attrNames)
 	}
 
 
-	public function isUserOnFacility($spEntityId, $userId)
+	public function getUsersGroupsOnFacility($spEntityId, $userId)
 	{
 		$resources = sspmod_perun_LdapConnector::searchForEntities($this->ldapBase,
 			"(&(objectClass=perunResource)(entityID=$spEntityId))",

lib/AdapterRpc.php

@@ -4,6 +4,8 @@
  * Class sspmod_perun_AdapterRpc
  *
  * Perun adapter which uses Perun RPC interface
+ * @author Michal Prochazka <[email protected]>
+ * @author Pavel Vyskocil <[email protected]>
  */
 class sspmod_perun_AdapterRpc extends sspmod_perun_Adapter
 {
@@ -152,9 +154,47 @@ public function getUserAttributes($user, $attrNames)
 	}
 
 
-	public  function isUserOnFacility($spEntityId, $userId)
+	public  function getUsersGroupsOnFacility($spEntityId, $userId)
 	{
-		throw new BadMethodCallException("NotImplementedException");
+		$facilities = sspmod_perun_RpcConnector::get('facilitiesManager', 'getFacilitiesByAttribute', array(
+			'attributeName' => 'urn:perun:facility:attribute-def:def:entityID',
+			'attributeValue' => $spEntityId,
+		));
+
+		$allowedResources = array();
+		foreach ($facilities as $facility) {
+			$resources = sspmod_perun_RpcConnector::get('facilitiesManager', 'getAssignedResources', array(
+				'facility' => $facility['id'],
+			));
+			$allowedResources = array_merge($allowedResources, $resources);
+		}
+
+		$members = sspmod_perun_RpcConnector::get('membersManager', 'getMembersByUser', array(
+			'user' => $userId,
+		));
+
+		$validMembers = array();
+		foreach ($members as $member) {
+			if ($member['status'] === 'VALID') {
+				array_push($validMembers, $member);
+			}
+		}
+
+		$allGroups = array();
+		foreach ($allowedResources as $resource) {
+			foreach ($validMembers as $member) {
+				$groups = sspmod_perun_RpcConnector::get('resourcesManager', 'getAssignedGroups', array(
+					'resource' => $resource['id'],
+					'member' => $member['id'],
+				));
+				foreach ($groups as $group) {
+					array_push($allGroups, new sspmod_perun_model_Group($group['id'], $group['name'], $group['description']));
+				}
+			}
+		}
+
+		$allGroups = $this->removeDuplicateEntities($allGroups);
+		return $allGroups;
 	}
 
 }

lib/Auth/Process/PerunIdentity.php

@@ -137,7 +137,7 @@ public function process(&$request)
 			$this->register($request, $this->registerUrl, $this->callbackParamName, $vo, $spGroups, $this->interface);
 		}
 
-		$groups = $this->adapter->isUserOnFacility($spEntityId,$user->getId());
+		$groups = $this->adapter->getUsersGroupsOnFacility($spEntityId,$user->getId());
 
 		if (empty($groups)) {
 			SimpleSAML\Logger::warning('Perun user with identity/ies: '. implode(',', $uids) .' is not member of any assigned group for resource (' . $spEntityId . ')');