Remove old authentication flag and update fn call (#447)

Author: Tristan-WorkGH

package-lock.json

@@ -7,7 +7,7 @@
     "dependencies": {
         "@emotion/react": "^11.11.4",
         "@emotion/styled": "^11.11.5",
-        "@gridsuite/commons-ui": "0.61.1",
+        "@gridsuite/commons-ui": "0.62.0",
         "@hookform/resolvers": "^3.3.4",
         "@mui/icons-material": "^5.15.14",
         "@mui/lab": "5.0.0-alpha.169",

package.json

@@ -6,38 +6,33 @@
  */
 
 import React, { useCallback, useEffect, useState } from 'react';
-
 import { useDispatch, useSelector } from 'react-redux';
-
 import {
     Navigate,
     Route,
     Routes,
-    useNavigate,
     useLocation,
+    useMatch,
+    useNavigate,
 } from 'react-router-dom';
-
 import {
     selectComputedLanguage,
     selectLanguage,
     selectTheme,
 } from '../redux/actions';
-
 import {
     AuthenticationRouter,
     CardErrorBoundary,
     getPreLoginPath,
     initializeAuthenticationProd,
+    useSnackMessage,
 } from '@gridsuite/commons-ui';
-
-import { useMatch } from 'react-router-dom';
 import { FormattedMessage } from 'react-intl';
-
 import {
     connectNotificationsWsUpdateConfig,
-    fetchAuthorizationCodeFlowFeatureFlag,
     fetchConfigParameter,
     fetchConfigParameters,
+    fetchIdpSettings,
     fetchValidateUser,
 } from '../utils/rest-api';
 import {
@@ -47,7 +42,6 @@ import {
     PARAM_THEME,
 } from '../utils/config-params';
 import { getComputedLanguage } from '../utils/language';
-import { useSnackMessage } from '@gridsuite/commons-ui';
 import AppTopBar from './app-top-bar';
 import Grid from '@mui/material/Grid';
 import TreeViewsContainer from './tree-views-container';
@@ -149,23 +143,23 @@ const App = () => {
     );
 
     useEffect(() => {
-        fetchAuthorizationCodeFlowFeatureFlag()
-            .then((authorizationCodeFlowEnabled) => {
-                return initializeAuthenticationProd(
-                    dispatch,
-                    initialMatchSilentRenewCallbackUrl != null,
-                    fetch('idpSettings.json'),
-                    fetchValidateUser,
-                    authorizationCodeFlowEnabled,
-                    initialMatchSigninCallbackUrl != null
-                );
-            })
-            .then((userManager) => {
-                setUserManager({ instance: userManager, error: null });
-            })
-            .catch(function (error) {
+        // need subfunction when async as suggested by rule react-hooks/exhaustive-deps
+        (async function initializeAuthentication() {
+            try {
+                setUserManager({
+                    instance: await initializeAuthenticationProd(
+                        dispatch,
+                        initialMatchSilentRenewCallbackUrl != null,
+                        fetchIdpSettings,
+                        fetchValidateUser,
+                        initialMatchSigninCallbackUrl != null
+                    ),
+                    error: null,
+                });
+            } catch (error) {
                 setUserManager({ instance: null, error: error.message });
-            });
+            }
+        })();
         // Note: initialMatchSilentRenewCallbackUrl and dispatch don't change
     }, [
         initialMatchSilentRenewCallbackUrl,

src/components/app.jsx

@@ -173,30 +173,8 @@ export function fetchValidateUser(user) {
         });
 }
 
-export function fetchAuthorizationCodeFlowFeatureFlag() {
-    console.info(`Fetching authorization code flow feature flag...`);
-    return fetchEnv()
-        .then((res) =>
-            fetch(res.appsMetadataServerUrl + '/authentication.json')
-        )
-        .then((res) => res.json())
-        .then((res) => {
-            console.log(
-                `Authorization code flow is ${
-                    res.authorizationCodeFlowFeatureFlag
-                        ? 'enabled'
-                        : 'disabled'
-                }`
-            );
-            return res.authorizationCodeFlowFeatureFlag;
-        })
-        .catch((error) => {
-            console.error(error);
-            console.warn(
-                `Something wrong happened when retrieving authentication.json: authorization code flow will be disabled`
-            );
-            return false;
-        });
+export function fetchIdpSettings() {
+    return fetch('idpSettings.json').then((res) => res.json());
 }
 
 export function fetchVersion() {