Merge pull request #83 from bwerquin/v2-develop

remove keycloak conf reading
InseeFr · Oct 21, 2021 · b5f5c5e · b5f5c5e
2 parents 8dd4ce7 + e63747e
commit b5f5c5e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 120 deletions.
diff --git a/configuration/build-oidc.json b/configuration/build-oidc.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stromae",
-  "version": "2.1.15",
+  "version": "2.1.16",
   "private": true,
   "dependencies": {
     "@axa-fr/react-oidc-context": "^3.1.6",

diff --git a/src/components/auth/provider/oidc.js b/src/components/auth/provider/oidc.js
@@ -5,12 +5,7 @@ import {
   InMemoryWebStorage,
 } from '@axa-fr/react-oidc-context';
 import { LoaderLogo } from 'components/shared/loader';
-import {
-  buildOidcConfiguration,
-  buildOidcConfigurationFromKeycloak,
-  buildOidcConfigurationFromBuildConfig,
-  buildOidcConfigurationFromKeycloakWithOidc,
-} from 'utils/oidc/build-configuration';
+import { buildOidcConfiguration } from 'utils/oidc/build-configuration';
 import { errorDictionary } from 'i18n';
 import { ErrorFallback } from 'components/shared/error';
 
@@ -21,63 +16,18 @@ const AuthProviderOIDC = ({ children }) => {
   const [error, setError] = useState(null);
 
   useEffect(() => {
-    fetch(`${window.location.origin}/keycloak.json`)
+    fetch(`${window.location.origin}/oidc.json`)
       .then(r => r.json())
       .then(r => {
-        fetch(`${window.location.origin}/build-oidc.json`)
-          .then(r2 => r2.json())
-          .then(r2 => {
-            setOidcConf(
-              buildOidcConfigurationFromKeycloakWithOidc({
-                keycloakConf: r,
-                oidcConf: r2,
-                conf: conf,
-              })
-            );
+        setOidcConf(
+          buildOidcConfiguration({
+            oidcConf: r.config,
+            conf: conf,
           })
-          .catch(() => {
-            setOidcConf(
-              buildOidcConfigurationFromKeycloak({
-                keycloakConf: r,
-                conf: conf,
-              })
-            );
-          });
+        );
         setLoading(false);
       })
       .catch(() => {
-        fetch(`${window.location.origin}/build-oidc.json`)
-          .then(r => r.json())
-          .then(r => {
-            setOidcConf(
-              buildOidcConfigurationFromBuildConfig({
-                oidcConf: r.config,
-                conf: conf,
-              })
-            );
-            setLoading(false);
-          })
-          .catch(() => {
-            setLoading(false);
-            setError(new Error(errorDictionary.noAuthFile));
-          });
-        fetch(`${window.location.origin}/oidc.json`)
-          .then(r => r.json())
-          .then(r => {
-            setOidcConf(
-              buildOidcConfiguration({
-                oidcConf: r.config,
-                conf: conf,
-              })
-            );
-            setLoading(false);
-          })
-          .catch(() => {
-            setLoading(false);
-            setError(new Error(errorDictionary.noAuthFile));
-          });
-      })
-      .catch(e => {
         setLoading(false);
         setError(new Error(errorDictionary.noAuthFile));
       });

diff --git a/src/utils/oidc/build-configuration.js b/src/utils/oidc/build-configuration.js
@@ -29,54 +29,7 @@ export const buildOidcConfiguration = ({ oidcConf, conf }) => {
     response_type: 'code',
     post_logout_redirect_uri: `${portail}/${getCurrentSurvey(pathname)}`,
     silent_redirect_uri: `${origin}/authentication/silent_callback`,
-  };
-  return config;
-};
-
-export const buildOidcConfigurationFromKeycloak = ({ keycloakConf, conf }) => {
-  const { origin, pathname } = window.location;
-  const { portail } = conf;
-  const { realm, 'auth-server-url': authServer, resource } = keycloakConf;
-  return {
-    authority: `${authServer}/realms/${realm}`,
-    client_id: resource,
-    redirect_uri: `${origin}/authentication/callback`,
-    response_type: 'code',
-    post_logout_redirect_uri: `${portail}/${getCurrentSurvey(pathname)}`,
-    scope: 'openid profile email',
-    silent_redirect_uri: `${origin}/authentication/silent_callback`,
     extraQueryParams: `${getKc_idp_hintActive(pathname)}`,
-    automaticSilentRenew: true,
-    loadUserInfo: true,
-  };
-};
-
-export const buildOidcConfigurationFromBuildConfig = ({ oidcConf, conf }) => {
-  const config = {
-    ...oidcConf,
-    client_id: conf.client_id,
   };
   return config;
 };
-
-export const buildOidcConfigurationFromKeycloakWithOidc = ({
-  keycloakConf,
-  conf,
-  oidcConf,
-}) => {
-  const { origin, pathname } = window.location;
-  const { portail } = conf;
-  const { realm, 'auth-server-url': authServer } = keycloakConf;
-  return {
-    authority: `${authServer}/realms/${realm}`,
-    client_id: oidcConf.client_id,
-    redirect_uri: `${origin}/authentication/callback`,
-    response_type: 'code',
-    post_logout_redirect_uri: `${portail}/${getCurrentSurvey(pathname)}`,
-    scope: 'openid profile email',
-    silent_redirect_uri: `${origin}/authentication/silent_callback`,
-    extraQueryParams: `${getKc_idp_hintActive(pathname)}`,
-    automaticSilentRenew: true,
-    loadUserInfo: true,
-  };
-};