fix last problems

Author: Tristan-WorkGH

src/components/App/app-top-bar.tsx

@@ -111,7 +111,7 @@ const AppTopBar: FunctionComponent = () => {
             appLicense={AppPackage.license}
             onLogoutClick={() => logout(dispatch, userManagerInstance)}
             onLogoClick={() => navigate('/', { replace: true })}
-            user={user}
+            user={user ?? undefined}
             appsAndUrls={appsAndUrls}
             globalVersionPromise={() =>
                 AppsMetadataSrv.fetchVersion().then(

src/redux/actions.ts

@@ -5,11 +5,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-import { GsTheme } from '@gridsuite/commons-ui';
+import { GsTheme, UserManagerState } from '@gridsuite/commons-ui';
 import { PARAM_LANGUAGE } from '../utils/config-params';
 import { Action } from 'redux';
 import { AppState } from './reducer';
-import { UserManagerState } from '../routes';
 
 export const UPDATE_USER_MANAGER_STATE = 'UPDATE_USER_MANAGER_STATE';
 export type UserManagerAction = Readonly<

src/redux/reducer.ts

@@ -28,6 +28,7 @@ import {
 } from './actions';
 import {
     AuthenticationRouterErrorAction,
+    AuthenticationRouterErrorState,
     CommonActions,
     CommonStoreState,
     GsLang,
@@ -45,20 +46,20 @@ import {
     USER,
     USER_VALIDATION_ERROR,
     UserAction,
+    UserManagerState,
     UserValidationErrorAction,
 } from '@gridsuite/commons-ui';
 import { PARAM_LANGUAGE, PARAM_THEME } from '../utils/config-params';
 import { ReducerWithInitialState } from '@reduxjs/toolkit/dist/createReducer';
-import { UserManagerState } from '../routes';
 
 export type AppState = CommonStoreState & {
     computedLanguage: GsLangUser;
     [PARAM_THEME]: GsTheme;
     [PARAM_LANGUAGE]: GsLang;
 
     userManager: UserManagerState;
-    signInCallbackError: unknown;
-    authenticationRouterError: unknown;
+    signInCallbackError: string | null;
+    authenticationRouterError: AuthenticationRouterErrorState | null;
     showAuthenticationRouterLogin: boolean;
 };
 

src/routes/index.ts

@@ -5,11 +5,4 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-import { UserManager } from 'oidc-client';
-
 export * from './router';
-
-export type UserManagerState = {
-    instance: UserManager | null;
-    error: string | null;
-};

src/utils/api.ts

@@ -15,12 +15,12 @@ export function getToken(user?: User): Token | null {
     return (user ?? getUser())?.id_token ?? null;
 }
 
-export function getUser(): User {
+export function getUser(): User | null {
     const state: AppState = store.getState();
     return state.user;
 }
 
-export function extractUserSub(user: User): Promise<unknown> {
+export function extractUserSub(user: User | null): Promise<unknown> {
     return new Promise((resolve, reject) => {
         const sub = user?.profile?.sub;
         if (!sub) {