Merge remote-tracking branch 'origin/main' into migrate_ts

gridsuite · Feb 23, 2024 · a46f987 · a46f987
2 parents 7b7863c + 0a5da76
commit a46f987
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -11,7 +11,7 @@
     "dependencies": {
         "@emotion/react": "^11.8.2",
         "@emotion/styled": "^11.8.1",
-        "@gridsuite/commons-ui": "^0.43.0",
+        "@gridsuite/commons-ui": "^0.44.0",
         "@hookform/resolvers": "^3.3.1",
         "@mui/icons-material": "^5.5.1",
         "@mui/lab": "^5.0.0-alpha.75",

diff --git a/src/components/app.tsx b/src/components/app.tsx
@@ -134,6 +134,12 @@ const App: FunctionComponent = () => {
         })
     );
 
+    const [initialMatchSigninCallbackUrl] = useState(
+        useMatch({
+            path: '/sign-in-callback',
+        })
+    );
+
     const initialize = useCallback((): Promise<UserManager | undefined> => {
         if (process.env.REACT_APP_USE_AUTHENTICATION === 'true') {
             return fetchAuthorizationCodeFlowFeatureFlag().then(
@@ -143,7 +149,8 @@ const App: FunctionComponent = () => {
                         initialMatchSilentRenewCallbackUrl != null,
                         fetch('idpSettings.json'),
                         fetchValidateUser,
-                        authorizationCodeFlowEnabled
+                        authorizationCodeFlowEnabled,
+                        initialMatchSigninCallbackUrl != null
                     )
             );
         } else {
@@ -153,11 +160,16 @@ const App: FunctionComponent = () => {
                 () =>
                     new Promise((resolve) =>
                         window.setTimeout(() => resolve(true), 500)
-                    )
+                    ),
+                initialMatchSigninCallbackUrl != null
             );
         }
         // Note: initialMatchSilentRenewCallbackUrl and dispatch don't change
-    }, [initialMatchSilentRenewCallbackUrl, dispatch]);
+    }, [
+        initialMatchSilentRenewCallbackUrl,
+        dispatch,
+        initialMatchSigninCallbackUrl,
+    ]);
 
     useEffect(() => {
         initialize()