Using of method getFacilityAttributesValues instead of several calls of getFacilityAttribute

Author: BaranekD

CHANGELOG.md

@@ -16,6 +16,9 @@ All notable changes to this project will be documented in this file.
 #### Added
 - Added logging response time for each request into RPC/LDAP
 
+#### Changed
+- If needed to get more facility attributes, method getFacilityAttributesValues() is used instead of several calls of getFacilityAttribute()
+
 #### Fixed
 - Fix logging request params
 

lib/Adapter.php

@@ -140,10 +140,17 @@ abstract public function searchFacilitiesByAttributeValue($attribute);
     /**
      * @param Facility $facility
      * @param $attrNames array string $attrNames
-     * @return array of attributes
+     * @return array of attribute name -> attribute
      */
     abstract public function getFacilityAttributes($facility, $attrNames);
 
+    /**
+     * @param Facility $facility
+     * @param $attrNames array string $attrNames
+     * @return array of attribute name -> attribute value
+     */
+    abstract public function getFacilityAttributesValues($facility, $attrNames);
+
     /**
      * @param $extSourceName string name of ext source
      * @param $extSourceLogin string login

lib/AdapterLdap.php

@@ -283,6 +283,12 @@ public function getFacilityAttributes($facility, $attrNames)
         // TODO: Implement getFacilityAttributes() method.
     }
 
+    public function getFacilityAttributesValues($facility, $attrNames)
+    {
+        throw new BadMethodCallException('NotImplementedException');
+        // TODO: Implement getFacilityAttributesValues() method.
+    }
+
     public function getUserExtSource($extSourceName, $extSourceLogin)
     {
         // TODO: Implement getUserExtSource() method.

lib/AdapterRpc.php

@@ -433,17 +433,32 @@ public function getFacilityAttributes($facility, $attrNames)
         ]);
         $attributes = [];
         foreach ($perunAttrs as $perunAttr) {
-            array_push($attributes, [
+            $perunAttrName = $perunAttr['namespace'] . ':' . $perunAttr['friendlyName'];
+            $attributes[$perunAttrName] = [
                 'id' => $perunAttr['id'],
-                'name' => $perunAttr['namespace'] . ':' . $perunAttr['friendlyName'],
+                'name' => $perunAttrName,
                 'displayName' => $perunAttr['displayName'],
                 'type' => $perunAttr['type'],
                 'value' => $perunAttr['value']
-            ]);
+            ];
         }
         return $attributes;
     }
 
+    public function getFacilityAttributesValues($facility, $attrNames)
+    {
+        $perunAttrs = $this->connector->get('attributesManager', 'getAttributes', [
+            'facility' => $facility->getId(),
+            'attrNames' => $attrNames,
+        ]);
+        $attributesValues = [];
+        foreach ($perunAttrs as $perunAttr) {
+            $perunAttrName = $perunAttr['namespace'] . ':' . $perunAttr['friendlyName'];
+            $attributesValues[$perunAttrName] = $perunAttr['value'];
+        }
+        return $attributesValues;
+    }
+
     public function getUserExtSource($extSourceName, $extSourceLogin)
     {
         return $this->connector->get('usersManager', 'getUserExtSourceByExtLoginAndExtSourceName', [

lib/Auth/Process/ForceAup.php

@@ -117,6 +117,11 @@ public function process(&$request)
             );
         }
 
+        $attrNames = [
+            $this->perunFacilityReqAupsAttr,
+            $this->perunFacilityVoShortNames
+        ];
+
         try {
             $facility = $this->adapter->getFacilityByEntityId($request['SPMetadata']['entityid']);
 
@@ -127,21 +132,21 @@ public function process(&$request)
             $requiredAups = [];
             $voShortNames = [];
 
-            $facilityAups = $this->adapter->getFacilityAttribute($facility, $this->perunFacilityReqAupsAttr);
+            $facilityAttrValues = $this->adapter->getFacilityAttributesValues(
+                $facility,
+                $attrNames
+            );
 
-            if ($facilityAups !== null) {
-                foreach ($facilityAups as $facilityAup) {
+            if (isset($this->perunFacilityReqAupsAttr, $facilityAttrValues) &&
+                is_array($facilityAttrValues[$this->perunFacilityReqAupsAttr])) {
+                foreach ($facilityAttrValues[$this->perunFacilityReqAupsAttr] as $facilityAup) {
                     array_push($requiredAups, $facilityAup);
                 }
             }
 
-            $facilityVoShortNames = $this->adapter->getFacilityAttribute(
-                $facility,
-                $this->perunFacilityVoShortNames
-            );
-
-            if ($facilityVoShortNames !== null) {
-                foreach ($facilityVoShortNames as $facilityVoShortName) {
+            if (isset($this->perunFacilityVoShortNames, $facilityAttrValues) &&
+                is_array($facilityAttrValues[$this->perunFacilityVoShortNames])) {
+                foreach ($facilityAttrValues[$this->perunFacilityVoShortNames] as $facilityVoShortName) {
                     array_push($voShortNames, $facilityVoShortName);
                 }
             }

lib/Auth/Process/PerunIdentity.php

@@ -429,51 +429,49 @@ public static function unauthorized($request)
      */
     protected function getSPAttributes($spEntityID)
     {
+        $attrNames = [
+            $this->facilityCheckGroupMembershipAttr,
+            $this->facilityVoShortNamesAttr,
+            $this->facilityDynamicRegistrationAttr,
+            $this->facilityRegisterUrlAttr,
+            $this->facilityAllowRegistrationToGroupsAttr,
+        ];
+
         try {
             $facility = $this->rpcAdapter->getFacilityByEntityId($spEntityID);
 
             if ($facility === null) {
                 return;
             }
 
-            $checkGroupMembership = $this->rpcAdapter->getFacilityAttribute(
+            $facilityAttrValues = $this->rpcAdapter->getFacilityAttributesValues(
                 $facility,
-                $this->facilityCheckGroupMembershipAttr
+                $attrNames
             );
-            if ($checkGroupMembership !== null) {
-                $this->checkGroupMembership = $checkGroupMembership;
+
+            if (array_key_exists($this->facilityCheckGroupMembershipAttr, $facilityAttrValues)) {
+                $this->checkGroupMembership = $facilityAttrValues[$this->facilityCheckGroupMembershipAttr];
             }
 
-            $facilityVoShortNames = $this->rpcAdapter->getFacilityAttribute(
-                $facility,
-                $this->facilityVoShortNamesAttr
-            );
-            if (!empty($facilityVoShortNames)) {
-                $this->facilityVoShortNames = $facilityVoShortNames;
+            if (array_key_exists($this->facilityVoShortNamesAttr, $facilityAttrValues) &&
+                !empty($facilityAttrValues[$this->facilityVoShortNamesAttr])) {
+                $this->facilityVoShortNames = $facilityAttrValues[$this->facilityVoShortNamesAttr];
             }
 
-            $dynamicRegistration = $this->rpcAdapter->getFacilityAttribute(
-                $facility,
-                $this->facilityDynamicRegistrationAttr
-            );
-            if ($dynamicRegistration !== null) {
-                $this->dynamicRegistration = $dynamicRegistration;
+            if (array_key_exists($this->facilityDynamicRegistrationAttr, $facilityAttrValues)) {
+                $this->dynamicRegistration = $facilityAttrValues[$this->facilityDynamicRegistrationAttr];
+            }
+
+            if (array_key_exists($this->facilityRegisterUrlAttr, $facilityAttrValues)) {
+                $this->registerUrl = $facilityAttrValues[$this->facilityRegisterUrlAttr];
             }
 
-            $this->registerUrl = $this->rpcAdapter->getFacilityAttribute(
-                $facility,
-                $this->facilityRegisterUrlAttr
-            );
             if ($this->registerUrl === null) {
                 $this->registerUrl = $this->defaultRegisterUrl;
             }
 
-            $allowRegistartionToGroups = $this->rpcAdapter->getFacilityAttribute(
-                $facility,
-                $this->facilityAllowRegistrationToGroupsAttr
-            );
-            if ($allowRegistartionToGroups !== null) {
-                $this->allowRegistrationToGroups = $allowRegistartionToGroups;
+            if (array_key_exists($this->facilityAllowRegistrationToGroupsAttr, $facilityAttrValues)) {
+                $this->allowRegistrationToGroups = $facilityAttrValues[$this->facilityAllowRegistrationToGroupsAttr];
             }
         } catch (\Exception $ex) {
             Logger::warning('perun:PerunIdentity: ' . $ex);