@gridsuite/commons-ui 0.22.0 → 0.22.1

package/lib/components/TopBar/TopBar.js

@@ -87,7 +87,8 @@ var useStyles = (0, _makeStyles["default"])(function (theme) {
   return {
     grow: {
       flexGrow: 1,
-      display: 'flex'
+      display: 'flex',
+      overflow: 'hidden'
     },
     logo: {
       flexShrink: 0,

package/lib/utils/AuthService.js

@@ -41,6 +41,8 @@ function initializeAuthenticationDev(dispatch, isSilentRenew) {
   return Promise.resolve(userManager);
 }
 
+var accessTokenExpiringNotificationTime = 60; // seconds
+
 function initializeAuthenticationProd(dispatch, isSilentRenew, idpSettings) {
   return idpSettings.then(function (r) {
     return r.json();
@@ -109,9 +111,10 @@ function initializeAuthenticationProd(dispatch, isSilentRenew, idpSettings) {
       response_type: 'id_token token',
       scope: idpSettings.scope,
       automaticSilentRenew: !isSilentRenew,
-      accessTokenExpiringNotificationTime: 60
+      accessTokenExpiringNotificationTime: accessTokenExpiringNotificationTime
     };
     var userManager = new _oidcClient.UserManager(settings);
+    userManager.idpSettings = idpSettings; //store our settings in there as well to use it later
 
     if (!isSilentRenew) {
       handleUser(dispatch, userManager);
@@ -177,8 +180,40 @@ function handleUser(dispatch, userManager) {
     dispatchUser(dispatch, userManager);
   });
   userManager.events.addSilentRenewError(function (error) {
-    console.debug(error);
-    logout(dispatch, userManager);
+    console.debug(error); // wait for accessTokenExpiringNotificationTime so that the user is expired
+    // otherwise the library tries to signin immediately when we do getUser()
+
+    window.setTimeout(function () {
+      userManager.getUser().then(function (user) {
+        var now = parseInt(Date.now() / 1000);
+        var exp = (0, _jwtDecode["default"])(user.id_token).exp;
+        var idTokenExpiresIn = exp - now;
+
+        if (idTokenExpiresIn < 0) {
+          console.log('Error in silent renew, idtoken expired: ' + idTokenExpiresIn + ' => Logging out.', error); // TODO here allow to continue to use the app but in some kind of frozen state because we can't make API calls anymore
+
+          return logout(dispatch, userManager);
+        } else if (userManager.idpSettings.maxExpiresIn) {
+          if (idTokenExpiresIn < userManager.idpSettings.maxExpiresIn) {
+            // TODO here attempt last chance login ? snackbar to notify the user ? Popup ?
+            // for now we do the same thing as in the else block
+            console.log('Error in silent renew, but idtoken ALMOST expiring (expiring in' + idTokenExpiresIn + ') => last chance' + userManager.idpSettings.maxExpiresIn, error);
+            user.expires_in = userManager.idpSettings.maxExpiresIn;
+            userManager.storeUser(user).then(function () {
+              userManager.getUser();
+            });
+          } else {
+            console.log('Error in silent renew, but idtoken NOT expiring (expiring in' + idTokenExpiresIn + ') => postponing expiration to' + userManager.idpSettings.maxExpiresIn, error);
+            user.expires_in = userManager.idpSettings.maxExpiresIn;
+            userManager.storeUser(user).then(function () {
+              userManager.getUser();
+            });
+          }
+        } else {
+          console.log('Error in silent renew, unsupported configuration: token still valid for ' + idTokenExpiresIn + ' but maxExpiresIn is not configured:' + userManager.idpSettings.maxExpiresIn, error);
+        }
+      });
+    }, accessTokenExpiringNotificationTime * 1000);
   });
   console.debug('dispatch user');
   dispatchUser(dispatch, userManager);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gridsuite/commons-ui",
-    "version": "0.22.0",
+    "version": "0.22.1",
     "description": "common react components for gridsuite applications",
     "engines": {
         "npm": "<=6",