diff --git a/cas/cas-server/src/main/java/fr/gouv/vitamui/cas/authentication/UserPrincipalResolver.java b/cas/cas-server/src/main/java/fr/gouv/vitamui/cas/authentication/UserPrincipalResolver.java index 82abf84cc31b8e75c0034e039e8966960095e948..fb4a093a71832a7fd1db0d76608eadcf2e8ddae3 100644 --- a/cas/cas-server/src/main/java/fr/gouv/vitamui/cas/authentication/UserPrincipalResolver.java +++ b/cas/cas-server/src/main/java/fr/gouv/vitamui/cas/authentication/UserPrincipalResolver.java @@ -66,6 +66,7 @@ import static fr.gouv.vitamui.commons.api.CommonConstants.SUPER_USER_ATTRIBUTE; import static fr.gouv.vitamui.commons.api.CommonConstants.SUPER_USER_IDENTIFIER_ATTRIBUTE; import static fr.gouv.vitamui.commons.api.CommonConstants.SURROGATION_PARAMETER; import static fr.gouv.vitamui.commons.api.CommonConstants.TENANTS_BY_APP_ATTRIBUTE; +import static fr.gouv.vitamui.commons.api.CommonConstants.SITE_CODE; import static fr.gouv.vitamui.commons.api.CommonConstants.TYPE_ATTRIBUTE; import static fr.gouv.vitamui.commons.api.CommonConstants.USER_ID_ATTRIBUTE; @@ -217,7 +218,7 @@ public class UserPrincipalResolver implements PrincipalResolver { attributes.put(AUTHTOKEN_ATTRIBUTE, Collections.singletonList(authUser.getAuthToken())); attributes.put(PROOF_TENANT_ID_ATTRIBUTE, Collections.singletonList(authUser.getProofTenantIdentifier())); attributes.put(TENANTS_BY_APP_ATTRIBUTE, Collections.singletonList(new CasJsonWrapper(authUser.getTenantsByApp()))); - attributes.put("siteCode", Collections.singletonList(user.getSiteCode())); + attributes.put(SITE_CODE, Collections.singletonList(user.getSiteCode())); final Set<String> roles = new HashSet<>(); final List<ProfileDto> profiles = authUser.getProfileGroup().getProfiles(); profiles.forEach(profile -> profile.getRoles().forEach(role -> roles.add(role.getName()))); diff --git a/commons/commons-api/src/main/java/fr/gouv/vitamui/commons/api/CommonConstants.java b/commons/commons-api/src/main/java/fr/gouv/vitamui/commons/api/CommonConstants.java index 3807b6fa7ee7114355ea227652ed7ec4af1fe2d0..234e04a7b89cd8c8029771db4d2ac60032f8ec85 100644 --- a/commons/commons-api/src/main/java/fr/gouv/vitamui/commons/api/CommonConstants.java +++ b/commons/commons-api/src/main/java/fr/gouv/vitamui/commons/api/CommonConstants.java @@ -165,6 +165,8 @@ public class CommonConstants { public static final String TENANTS_BY_APP_ATTRIBUTE = "tenantsByApp"; + public static final String SITE_CODE = "siteCode"; + public static final String CUSTOMER_ID_ATTRIBUTE = "customerId"; public static final String CUSTOMER_IDENTIFIER_ATTRIBUTE = "customerIdentifier"; diff --git a/commons/commons-security/src/main/java/fr/gouv/vitamui/commons/security/client/dto/AuthUserDto.java b/commons/commons-security/src/main/java/fr/gouv/vitamui/commons/security/client/dto/AuthUserDto.java index aed4e4c8037e03ea7feb4f23698377626510922a..44cd65a8a651fa7bc49c80afb1db85efb9ebb7dd 100644 --- a/commons/commons-security/src/main/java/fr/gouv/vitamui/commons/security/client/dto/AuthUserDto.java +++ b/commons/commons-security/src/main/java/fr/gouv/vitamui/commons/security/client/dto/AuthUserDto.java @@ -246,7 +246,7 @@ public class AuthUserDto extends UserDto implements UserDetails { setTenantsByApp((List<TenantInformationDto>) parseJson(value, new TypeReference<List<TenantInformationDto>>() { })); break; - case "siteCode" : + case SITE_CODE : setSiteCode((String) value); break; }