review

gridsuite · Jul 3, 2024 · 3937068 · 3937068
1 parent aa48c98
commit 3937068
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 26 deletions.
diff --git a/src/components/app.tsx b/src/components/app.tsx
@@ -146,23 +146,23 @@ const App: FunctionComponent = () => {
                 console.debug(
                     `auth dev mode: ${process.env.REACT_APP_USE_AUTHENTICATION}`
                 );
+                const initAuth =
+                    process.env.REACT_APP_USE_AUTHENTICATION === 'true'
+                        ? initializeAuthenticationProd(
+                              dispatch,
+                              initialMatchSilentRenewCallbackUrl != null,
+                              fetchIdpSettings,
+                              fetchValidateUser,
+                              initialMatchSigninCallbackUrl != null
+                          )
+                        : initializeAuthenticationDev(
+                              dispatch,
+                              initialMatchSilentRenewCallbackUrl != null,
+                              validateUserDev,
+                              initialMatchSigninCallbackUrl != null
+                          );
                 setUserManager({
-                    instance:
-                        (await (process.env.REACT_APP_USE_AUTHENTICATION ===
-                        'true'
-                            ? initializeAuthenticationProd(
-                                  dispatch,
-                                  initialMatchSilentRenewCallbackUrl != null,
-                                  fetchIdpSettings,
-                                  fetchValidateUser,
-                                  initialMatchSigninCallbackUrl != null
-                              )
-                            : initializeAuthenticationDev(
-                                  dispatch,
-                                  initialMatchSilentRenewCallbackUrl != null,
-                                  validateUserDev,
-                                  initialMatchSigninCallbackUrl != null
-                              ))) ?? null,
+                    instance: (await initAuth) ?? null,
                     error: null,
                 });
             } catch (error) {

diff --git a/src/utils/rest-api.ts b/src/utils/rest-api.ts
@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+import { Env, IdpSettings } from '@gridsuite/commons-ui';
 import {
     APP_NAME,
     getAppName,
@@ -164,21 +165,13 @@ export function fetchValidateUser(user: User): Promise<boolean> {
         });
 }
 
-export type EnvJson = typeof import('../../public/env.json') & {
-    // https://github.com/gridsuite/deployment/blob/main/docker-compose/env.json
-    // https://github.com/gridsuite/deployment/blob/main/k8s/live/azure-dev/env.json
-    // https://github.com/gridsuite/deployment/blob/main/k8s/live/azure-integ/env.json
-    // https://github.com/gridsuite/deployment/blob/main/k8s/live/local/env.json
-    appsMetadataServerUrl?: Url;
-    mapBoxToken?: string;
-    //[key: string]: string;
-};
+export type EnvJson = Env & typeof import('../../public/env.json');
 
 function fetchEnv(): Promise<EnvJson> {
     return fetch('env.json').then((res: Response) => res.json());
 }
 
-export function fetchIdpSettings() {
+export function fetchIdpSettings(): Promise<IdpSettings> {
     return fetch('idpSettings.json').then((res) => res.json());
 }