@gridsuite/commons-ui 0.100.0 → 0.101.0

package/dist/components/authentication/utils/authService.d.ts

@@ -1,8 +1,7 @@
 import { Dispatch } from 'react';
 import { Location, NavigateFunction } from 'react-router';
-import { Log, User, UserManager } from 'oidc-client';
+import { Log, UserManager } from 'oidc-client';
 import { AuthenticationActions } from '../../../redux/actions/authActions';
-type UserValidationFunc = (user: User) => Promise<boolean>;
 type IdpSettingsGetter = () => Promise<IdpSettings>;
 export type IdpSettings = {
     authority: string;
@@ -25,10 +24,10 @@ declare global {
 }
 export declare function login(location: Location, userManagerInstance: UserManager | null): Promise<void> | undefined;
 export declare function logout(dispatch: Dispatch<AuthenticationActions>, userManagerInstance: UserManager | null): Promise<void> | undefined;
-export declare function dispatchUser(dispatch: Dispatch<AuthenticationActions>, userManagerInstance: CustomUserManager, validateUser: UserValidationFunc): Promise<void>;
+export declare function dispatchUser(dispatch: Dispatch<AuthenticationActions>, userManagerInstance: CustomUserManager): Promise<void>;
 export declare function getPreLoginPath(): string | null;
 export declare function handleSigninCallback(dispatch: Dispatch<AuthenticationActions>, navigate: NavigateFunction, userManagerInstance: UserManager): void;
 export declare function handleSilentRenewCallback(userManagerInstance: UserManager): void;
-export declare function initializeAuthenticationDev(dispatch: Dispatch<AuthenticationActions>, isSilentRenew: boolean, validateUser: UserValidationFunc, isSigninCallback: boolean): Promise<UserManager>;
-export declare function initializeAuthenticationProd(dispatch: Dispatch<AuthenticationActions>, isSilentRenew: boolean, idpSettingsGetter: IdpSettingsGetter, validateUser: UserValidationFunc, isSigninCallback: boolean): Promise<CustomUserManager>;
+export declare function initializeAuthenticationDev(dispatch: Dispatch<AuthenticationActions>, isSilentRenew: boolean, isSigninCallback: boolean): Promise<UserManager>;
+export declare function initializeAuthenticationProd(dispatch: Dispatch<AuthenticationActions>, isSilentRenew: boolean, idpSettingsGetter: IdpSettingsGetter, isSigninCallback: boolean): Promise<CustomUserManager>;
 export {};

package/dist/components/authentication/utils/authService.js

@@ -1,7 +1,7 @@
 import { jwtDecode } from "jwt-decode";
 import { Log, UserManager } from "oidc-client";
 import { UserManagerMock } from "./userManagerMock.js";
-import { setLoggedUser, setLogoutError, setUnauthorizedUserInfo, setUserValidationError, setSignInCallbackError, setShowAuthenticationRouterLogin, resetAuthenticationRouterError } from "../../../redux/actions/authActions.js";
+import { setLoggedUser, setLogoutError, setSignInCallbackError, setShowAuthenticationRouterLogin, resetAuthenticationRouterError } from "../../../redux/actions/authActions.js";
 window.OIDCLog = Log;
 const hackAuthorityKey = "oidc.hack.authority";
 const oidcHackReloadedKey = "gridsuite-oidc-hack-reloaded";
@@ -104,40 +104,21 @@ function logout(dispatch, userManagerInstance) {
     return Promise.resolve();
   });
 }
-function dispatchUser(dispatch, userManagerInstance, validateUser) {
+function dispatchUser(dispatch, userManagerInstance) {
   return userManagerInstance.getUser().then((user) => {
+    var _a;
     if (user) {
       if (getIdTokenExpiresIn(user) < 0) {
         console.debug("User token is expired and will not be dispatched");
         return Promise.resolve();
       }
-      const validateUserPromise = (validateUser == null ? void 0 : validateUser(user)) || Promise.resolve(true);
-      return validateUserPromise.then((valid) => {
-        var _a, _b;
-        if (!valid) {
-          console.debug("User isn't authorized to log in and will not be dispatched");
-          return dispatch(setUnauthorizedUserInfo((_a = user == null ? void 0 : user.profile) == null ? void 0 : _a.name, ""));
-        }
-        console.debug("User has been successfully loaded from store.");
-        reloadTimerOnExpiresIn(
-          user,
-          userManagerInstance,
-          computeMinExpiresIn(
-            user.expires_in,
-            user.id_token,
-            (_b = userManagerInstance.idpSettings) == null ? void 0 : _b.maxExpiresIn
-          )
-        );
-        return dispatch(setLoggedUser(user));
-      }).catch((e) => {
-        var _a;
-        console.log("Error in dispatchUser", e);
-        return dispatch(
-          setUserValidationError((_a = user == null ? void 0 : user.profile) == null ? void 0 : _a.name, {
-            error: e
-          })
-        );
-      });
+      console.debug("User has been successfully loaded from store.");
+      reloadTimerOnExpiresIn(
+        user,
+        userManagerInstance,
+        computeMinExpiresIn(user.expires_in, user.id_token, (_a = userManagerInstance.idpSettings) == null ? void 0 : _a.maxExpiresIn)
+      );
+      return dispatch(setLoggedUser(user));
     }
     console.debug("You are not logged in.");
     return Promise.resolve();
@@ -175,10 +156,10 @@ function handleSigninCallback(dispatch, navigate, userManagerInstance) {
 function handleSilentRenewCallback(userManagerInstance) {
   userManagerInstance.signinSilentCallback();
 }
-function handleUser(dispatch, userManager, validateUser) {
+function handleUser(dispatch, userManager) {
   userManager.events.addUserLoaded((user) => {
     console.debug("user loaded", user);
-    dispatchUser(dispatch, userManager, validateUser);
+    dispatchUser(dispatch, userManager);
   });
   userManager.events.addSilentRenewError((error) => {
     console.debug(error);
@@ -223,19 +204,19 @@ function handleUser(dispatch, userManager, validateUser) {
     }, accessTokenExpiringNotificationTime * 1e3);
   });
   console.debug("dispatch user");
-  dispatchUser(dispatch, userManager, validateUser);
+  dispatchUser(dispatch, userManager);
 }
-async function initializeAuthenticationDev(dispatch, isSilentRenew, validateUser, isSigninCallback) {
+async function initializeAuthenticationDev(dispatch, isSilentRenew, isSigninCallback) {
   const userManager = new UserManagerMock({});
   if (!isSilentRenew) {
-    handleUser(dispatch, userManager, validateUser);
+    handleUser(dispatch, userManager);
     if (!isSigninCallback) {
       handleSigninSilent(dispatch, userManager);
     }
   }
   return userManager;
 }
-async function initializeAuthenticationProd(dispatch, isSilentRenew, idpSettingsGetter, validateUser, isSigninCallback) {
+async function initializeAuthenticationProd(dispatch, isSilentRenew, idpSettingsGetter, isSigninCallback) {
   const idpSettings = await idpSettingsGetter();
   try {
     const settings = {
@@ -252,7 +233,7 @@ async function initializeAuthenticationProd(dispatch, isSilentRenew, idpSettings
     const userManager = new UserManager(settings);
     userManager.idpSettings = idpSettings;
     if (!isSilentRenew) {
-      handleUser(dispatch, userManager, validateUser);
+      handleUser(dispatch, userManager);
       if (!isSigninCallback) {
         handleSigninSilent(dispatch, userManager);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gridsuite/commons-ui",
-    "version": "0.100.0",
+    "version": "0.101.0",
     "description": "common react components for gridsuite applications",
     "author": "gridsuite team",
     "homepage": "https://github.com/gridsuite",