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 index 182ca6c6..f68a91e4 100644 --- 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 @@ -241,10 +241,12 @@ private Collection publishApps( Map fusion = new HashMap<>(); fusion.putAll((Map) 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 + // 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 props = (Map) fusion.get("userAttributes"); - props.replace("value", user.getAttributes().getOrDefault(props.get("userAttribute"), "")); + 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 index 13db8173..2b37430c 100644 --- 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 @@ -20,17 +20,18 @@ public class NoSecurityUserProvider { @Bean public UserProvider getUserProvider() { 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(); + 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;