Propagate user attributes to fusion map

statisticsnorway · Aug 2, 2023 · 059740f · 059740f
1 parent ed09d56
commit 059740f
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 12 deletions.
diff --git a/onyxia-api/src/main/java/fr/insee/onyxia/api/controller/api/mylab/MyLabController.java b/onyxia-api/src/main/java/fr/insee/onyxia/api/controller/api/mylab/MyLabController.java
@@ -240,6 +240,12 @@ private Collection<Object> publishApps(
         User user = userProvider.getUser(region);
         Map<String, Object> fusion = new HashMap<>();
         fusion.putAll((Map<String, Object>) requestDTO.getOptions());
+        // Substitute userAttribute value with actual value from user's attributes map
+        // This is a hack while we wait for this issue to be fixed: /~https://github.com/InseeFrLab/onyxia-web/issues/410
+        if (fusion.containsKey("userAttributes") && fusion.get("userAttributes") != null) {
+            Map<String, Object> props = (Map<String, Object>) fusion.get("userAttributes");
+            props.replace("value", user.getAttributes().getOrDefault(props.get("userAttribute"), ""));
+        }
         return helmAppsService.installApp(
                 region, project, requestDTO, catalogId, pkg, user, fusion, skipTlsVerify, caFile);
     }

diff --git a/onyxia-api/src/main/java/fr/insee/onyxia/api/security/NoSecurityUserProvider.java b/onyxia-api/src/main/java/fr/insee/onyxia/api/security/NoSecurityUserProvider.java
@@ -19,17 +19,21 @@ public class NoSecurityUserProvider {
 
     @Bean
     public UserProvider getUserProvider() {
-        return (Region region) ->
-                User.newInstance()
-                        .setEmail("toto@tld.fr")
-                        .setNomComplet("John doe")
-                        .setIdep("default")
-                        .setIp(
-                                httpRequestUtils.getClientIpAddressIfServletRequestExist(
-                                        ((ServletRequestAttributes)
-                                                        RequestContextHolder
-                                                                .currentRequestAttributes())
-                                                .getRequest()))
-                        .build();
+        return (Region region) -> {
+            final User user = User.newInstance()
+                    .setEmail("toto@tld.fr")
+                    .setNomComplet("John doe")
+                    .setIdep("default")
+                    .setIp(
+                            httpRequestUtils.getClientIpAddressIfServletRequestExist(
+                                    ((ServletRequestAttributes)
+                                            RequestContextHolder
+                                                    .currentRequestAttributes())
+                                            .getRequest()))
+                    .build();
+            user.getAttributes().put("preferred_username", "toto");
+            user.getAttributes().put("access_token", "mock-token-string");
+            return user;
+        };
     }
 }