Merge pull request #5 from InseeFr/fix_keycloak_sso

Fix keycloak sso
InseeFr · Jan 3, 2023 · 54786e1 · 54786e1
2 parents 4235f75 + 4241cea
commit 54786e1
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 10 deletions.
diff --git a/.k8s/deployment.yaml b/.k8s/deployment.yaml
@@ -14,4 +14,4 @@ spec:
     spec:
       containers:
         - name: dc-management-ui
-          image: inseefr/coleman-management:0.2.3-rc
+          image: inseefr/coleman-management:0.2.4-rc
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "coleman-management",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "private": true,
   "dependencies": {
     "@emotion/react": "^11.9.0",

diff --git a/src/core/api/index.js b/src/core/api/index.js
@@ -9,7 +9,7 @@ const deleteRequest = (url) => (token) => (body) =>
 */
 const getRequest = url => params => token => fetcher(url, token, "GET", params, null);
 const getAllContacts = apiUrl => token => getRequest(`${apiUrl}/api/contacts`)(null)(token);
-const getAllCampaigns = apiUrl => token => getRequest(`${apiUrl}/campaigns`)(null)(token);
+const getAllCampaigns = apiUrl => token => getRequest(`${apiUrl}/api/campaigns`)(null)(token);
 const getAllSurveyUnits = apiUrl => token => getRequest(`${apiUrl}/api/survey-units`)(null)(token);
 
 const getContacts = apiUrl => searchParams => token =>
@@ -19,7 +19,7 @@ const getContactAccreditations = apiUrl => id => token =>
   getRequest(`${apiUrl}/api/contacts/${id}/accreditations`)(null)(token);
 const updateContact = apiUrl => (id, contactInfos) => token =>
   putRequest(`${apiUrl}/api/contacts/${id}`)(contactInfos)(token);
-const getSources = apiUrl => token => getRequest(`${apiUrl}/sources`)(null)(token);
+const getSources = apiUrl => token => getRequest(`${apiUrl}/api/sources`)(null)(token);
 
 // eslint-disable-next-line no-unused-vars
 const getUsers = apiUrl => token => ({

diff --git a/src/core/constants.js b/src/core/constants.js
@@ -34,4 +34,8 @@ export const FAKE_USERS_LIST = [
   "Tarek Tifié",
   "Vishnou Lapaix",
   "Yvon Tremblay",
-].map(funnyName => ({ given_name: funnyName.split(" ")[0], family_name: funnyName.split(" ")[1] }));
+].map(funnyName => ({
+  given_name: funnyName.split(" ")[0],
+  family_name: funnyName.split(" ")[1],
+  preferred_username: funnyName,
+}));
diff --git a/src/core/keycloak/keycloakOidcClient.js b/src/core/keycloak/keycloakOidcClient.js
@@ -12,7 +12,7 @@ export const createKeycloakOidcClient = async ({ url, realm, clientId, evtUserAc
     .catch(error => error);
 
   const login = async () => {
-    await keycloakInstance.login({ redirectUri: window.location.href });
+    await keycloakInstance.login({ idpHint: "sso-insee", redirectUri: window.location.href });
     return new Promise(() => {});
   };
 

diff --git a/src/ui/context/UserAccount/index.jsx b/src/ui/context/UserAccount/index.jsx
@@ -28,10 +28,10 @@ export const UserAccountProvider = ({ children }) => {
     } else {
       const userLoaded = {
         id: id,
-        name: `${oidcUser?.given_name} ${oidcUser?.family_name}`,
+        name: `${oidcUser?.preferred_username}`,
         sourceAccreditations: dataSourceAcc?.content,
-        roles: [...(oidcUser["groupe-ag"] || []), dataRole?.role],
-        canAccess: canAccessToApp(oidcUser["groupe-ag"] || []),
+        roles: [...(oidcUser["inseegroupedefaut"] || []), dataRole?.role],
+        canAccess: canAccessToApp(oidcUser["inseegroupedefaut"] || []),
       };
       setUser(userLoaded);
       if (userLoaded.canAccess)

diff --git a/src/ui/context/auth/provider/noAuth.jsx b/src/ui/context/auth/provider/noAuth.jsx
@@ -33,7 +33,8 @@ export const NoAuthLogin = ({ setOidcClient }) => {
         id: id,
         given_name: fakeUserName.given_name,
         family_name: fakeUserName.family_name,
-        ["groupe-ag"]: [ACCESS_APP_ROLE_ADMIN], // Admin role for noAuth
+        preferred_username: fakeUserName.preferred_username,
+        ["inseegroupedefaut"]: [ACCESS_APP_ROLE_ADMIN], // Admin role for noAuth
       },
       logout: () => (window.location.href = "/"),
     };