Allow LinkedHashMap attributes value management

Author: zuglah

sample/msgraphapi-to-ldap-advanced/lsc.xml

@@ -45,7 +45,7 @@
                     <msgraphapi:filter>startsWith(mail, 'a')</msgraphapi:filter>
                     <msgraphapi:pivot>userPrincipalName</msgraphapi:pivot>
                     <msgraphapi:pageSize>999</msgraphapi:pageSize>
-                    <msgraphapi:select>userPrincipalName,mail,displayName</msgraphapi:select>
+                    <msgraphapi:select>userPrincipalName,mail,displayName,onPremisesExtensionAttributes</msgraphapi:select>
                 </msgraphapi:msGraphApiUsersService>
             </pluginSourceService>
             <ldapDestinationService>
@@ -61,6 +61,7 @@
                     <string>cn</string>
                     <string>mail</string>
                     <string>sn</string>
+		    <string>description</string>
                 </fetchedAttributes>
                 <getAllFilter>(&amp;(objectClass=person)(uid=*))</getAllFilter>
                 <getOneFilter>(&amp;(objectClass=person)(uid={userPrincipalName}))</getOneFilter>
@@ -99,6 +100,12 @@
                         <string>srcBean.getDatasetValuesById("displayName")</string>
                     </forceValues>
                 </dataset>
+                <dataset>
+                    <name>description<name>
+                    <forceValues>
+                    <string>srcBean.getDatasetFirstValueById("onPremisesExtensionAttributes/extensionAttribute1")</string>
+                    </forceValues>
+                </dataset>
             </propertiesBasedSyncOptions>
         </task>
     </tasks>

src/main/java/org/lsc/plugins/connectors/msgraphapi/MsGraphApiUsersSrcService.java

@@ -46,9 +46,11 @@
 
 import java.util.HashMap;
 import java.util.LinkedHashSet;
+import java.util.Set;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.LinkedHashMap;
 
 import javax.ws.rs.NotFoundException;
 import javax.ws.rs.ProcessingException;
@@ -189,8 +191,26 @@ IBean mapToBean(String idValue, Map<String, Object> user) throws InstantiationEx
         bean.setMainIdentifier(idValue);
 
         LscDatasets datasets = new LscDatasets();
-        user.entrySet().stream()
-            .forEach(entry -> datasets.put(entry.getKey(), entry.getValue() == null ? new LinkedHashSet<>() : entry.getValue()));
+        /* In new version, graphApi uses LinkedHashMap values
+         * like: Key={childKey=value, childKey2=value2, ...}
+         * Then in this case you could retrieve in bean
+         * attribute values as "<Key>/<childKey>" = "<childValue>".
+         * ex: "onPremisesExtensionAttributes/extensionAttribute1" = "toto"
+        */
+        for (Map.Entry entry : user.entrySet()) {
+            if (entry.getValue() instanceof java.util.LinkedHashMap) {
+                LinkedHashMap innerMap = (LinkedHashMap) entry.getValue();
+                Set<String> keys = innerMap.keySet();
+                for ( String key : keys ) {
+                    datasets.put(entry.getKey() + "/" + key,
+                        innerMap.get(key) == null ? new LinkedHashSet<>() : innerMap.get(key));
+                }
+            }
+            else {
+                datasets.put((String)entry.getKey(),
+                    entry.getValue() == null ? new LinkedHashSet<>() : entry.getValue());
+            }
+        }
 
         bean.setDatasets(datasets);