Update ues fix (#128)

* Fixed Updating UES in Perun

Author: vyskocilpavel

CHANGELOG.md

@@ -16,6 +16,9 @@ All notable changes to this project will be documented in this file.
     - Added required attribute 'listOfSps.serviceNameAttr' !!!
     - Add translation for multi-languages attributes
 
+#### Fixed
+- Fixed Updating UES in Perun
+
 ## [v3.9.0]
 #### Added
 - Added facility capabilities to PerunEntitlement

lib/AdapterRpc.php

@@ -493,10 +493,13 @@ public function updateUserExtSourceLastAccess($userExtSource)
 
     public function getUserExtSourceAttributes($userExtSourceId, $attrNames)
     {
-        return $this->connector->get('attributesManager', 'getAttributes', [
+        $attrNamesMap = AttributeUtils::getRpcAttrNames($attrNames);
+
+        $perunAttrs = $this->connector->get('attributesManager', 'getAttributes', [
             'userExtSource' => $userExtSourceId,
-            'attrNames' => $attrNames,
+            'attrNames' => array_keys($attrNamesMap),
         ]);
+        return $this->getAttributes($perunAttrs, $attrNamesMap);
     }
 
     public function setUserExtSourceAttributes($userExtSourceId, $attributes)
@@ -608,10 +611,11 @@ private function getAttributes($perunAttrs, $attrNamesMap)
             $perunAttrName = $perunAttr['namespace'] . ':' . $perunAttr['friendlyName'];
             $attributes[$attrNamesMap[$perunAttrName]] = [
                 'id' => $perunAttr['id'],
-                'name' => $perunAttrName,
+                'name' => $attrNamesMap[$perunAttrName],
                 'displayName' => $perunAttr['displayName'],
                 'type' => $perunAttr['type'],
-                'value' => $perunAttr['value']
+                'value' => $perunAttr['value'],
+                'friendlyName' => $perunAttr['friendlyName']
             ];
         }
 

lib/Auth/Process/UpdateUserExtSource.php

@@ -37,12 +37,12 @@ public function __construct($config, $reserved)
         }
 
         if (isset($config['arrayToStringConversion'])) {
-            $this->attrsToConversion = AttributeUtils::getRpcAttrNames((array)$config['arrayToStringConversion']);
+            $this->attrsToConversion = (array)$config['arrayToStringConversion'];
         } else {
             $this->attrsToConversion = [];
         }
 
-        $this->attrMap = AttributeUtils::getRpcAttrNames((array)$config['attrMap']);
+        $this->attrMap = (array)$config['attrMap'];
     }
 
     public function process(&$request)

www/updateUes.php

@@ -19,7 +19,7 @@
 $attrsToConversion = $body['attrsToConversion'];
 $perunUserId = $body['perunUserId'];
 
-const UES_ATTR_NMS = 'urn:perun:ues:attribute-def:def:';
+const UES_ATTR_NMS = 'urn:perun:ues:attribute-def:def';
 
 try {
     $userExtSource = $adapter->getUserExtSource(
@@ -37,7 +37,7 @@
     $attributesFromPerunRaw = $adapter->getUserExtSourceAttributes($userExtSource['id'], array_keys($attrMap));
     $attributesFromPerun = [];
     foreach ($attributesFromPerunRaw as $attributeFromPerunRaw) {
-        $attributesFromPerun[$attributeFromPerunRaw['friendlyName']] = $attributeFromPerunRaw;
+        $attributesFromPerun[$attributeFromPerunRaw['name']] = $attributeFromPerunRaw;
     }
 
     if ($attributesFromPerun === null) {
@@ -50,12 +50,12 @@
 
     foreach ($attributesFromPerun as $attribute) {
 
-        $attrName = UES_ATTR_NMS . $attribute['friendlyName'];
+        $attrName = $attribute['name'];
 
         if (isset($attrMap[$attrName], $attributesFromIdP[$attrMap[$attrName]])) {
             $attr = $attributesFromIdP[$attrMap[$attrName]];
 
-            if (in_array(UES_ATTR_NMS . $attribute['friendlyName'], $attrsToConversion)) {
+            if (in_array($attrName, $attrsToConversion)) {
                 $arrayAsString = [''];
                 foreach ($attr as $value) {
                     $arrayAsString[0] .= $value . ';';
@@ -79,13 +79,19 @@
             }
             if ($valueFromIdP !== $attribute['value']) {
                 $attribute['value'] = $valueFromIdP;
+                $attribute['namespace'] = UES_ATTR_NMS;
                 array_push($attributesToUpdate, $attribute);
             }
         }
     }
 
+    $attributesToUpdateFinal = [];
     if (!empty($attributesToUpdate)) {
-        $adapter->setUserExtSourceAttributes($userExtSource['id'], $attributesToUpdate);
+        foreach ($attributesToUpdate as $attribute) {
+            $attribute['name'] = UES_ATTR_NMS . ":" . $attribute['friendlyName'];
+            array_push($attributesToUpdateFinal, $attribute);
+        }
+        $adapter->setUserExtSourceAttributes($userExtSource['id'], $attributesToUpdateFinal);
     }
 
     $adapter->updateUserExtSourceLastAccess($userExtSource['id']);