From 4f3607850827e1d7e92e6e906c6637caa8ba55a2 Mon Sep 17 00:00:00 2001
From: Mounir Nayab <mounir.nayab@xelians.fr>
Date: Wed, 8 Jul 2020 14:24:59 +0200
Subject: [PATCH] [FENIX-58] add static constant for sitecode
---
.../gouv/vitamui/cas/authentication/UserPrincipalResolver.java | 3 ++-
.../main/java/fr/gouv/vitamui/commons/api/CommonConstants.java | 2 ++
.../gouv/vitamui/commons/security/client/dto/AuthUserDto.java | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
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 82abf84c..fb4a093a 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 3807b6fa..234e04a7 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 aed4e4c8..44cd65a8 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;
}
--
GitLab