@gridsuite/commons-ui 0.21.0 → 0.22.0

package/lib/components/TopBar/TopBar.js

@@ -227,6 +227,7 @@ var TopBar = function TopBar(_ref) {
       onEquipmentLabellingClick = _ref.onEquipmentLabellingClick,
       equipmentLabelling = _ref.equipmentLabelling,
       withElementsSearch = _ref.withElementsSearch,
+      searchDisabled = _ref.searchDisabled,
       searchingLabel = _ref.searchingLabel,
       onSearchTermChange = _ref.onSearchTermChange,
       _onSelectionChange = _ref.onSelectionChange,
@@ -331,15 +332,20 @@ var TopBar = function TopBar(_ref) {
   };
 
   (0, _react.useEffect)(function () {
-    if (user && withElementsSearch) {
-      document.addEventListener('keydown', function (e) {
+    if (user && withElementsSearch && !searchDisabled) {
+      var openSearch = function openSearch(e) {
         if (e.ctrlKey && e.key === 'f') {
           e.preventDefault();
           setDialogSearchOpen(true);
         }
-      });
+      };
+
+      document.addEventListener('keydown', openSearch);
+      return function () {
+        return document.removeEventListener('keydown', openSearch);
+      };
     }
-  }, [user, withElementsSearch]);
+  }, [user, withElementsSearch, searchDisabled]);
   return /*#__PURE__*/_react["default"].createElement(_AppBar["default"], {
     position: "static",
     color: "default",
@@ -383,7 +389,8 @@ var TopBar = function TopBar(_ref) {
     renderElement: renderElement
   }), /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_Button["default"], {
     color: "inherit",
-    onClick: handleClickElementSearch
+    onClick: handleClickElementSearch,
+    disabled: searchDisabled
   }, /*#__PURE__*/_react["default"].createElement(_Search["default"], null)))), user && /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_Button["default"], {
     "aria-controls": "apps-menu",
     "aria-haspopup": "true",
@@ -616,6 +623,7 @@ TopBar.propTypes = process.env.NODE_ENV !== "production" ? {
   onEquipmentLabellingClick: _propTypes["default"].func,
   equipmentLabelling: _propTypes["default"].bool,
   withElementsSearch: _propTypes["default"].bool,
+  searchDisabled: _propTypes["default"].bool,
   searchingLabel: _propTypes["default"].string,
   onSearchTermChange: _propTypes["default"].func,
   onSelectionChange: _propTypes["default"].func,

package/lib/utils/AuthService.js

@@ -74,10 +74,23 @@ function initializeAuthenticationProd(dispatch, isSilentRenew, idpSettings) {
             var expires_in = parseInt(matched_expires[0].split('=')[1]);
             var now = parseInt(Date.now() / 1000);
             var exp = decoded.exp;
+            var idTokenExpiresIn = exp - now;
+            var minAccesstokenOrIdtokenOrIdpSettingsExpiresIn = expires_in;
+            var newExpireReplaceReason;
 
-            if (exp < now + expires_in) {
-              var newhash = window.location.hash.replace(matched_expires[0], 'expires_in=' + (exp - now));
-              console.debug('Replacing expires_in in window.location.hash because idtoken.exp is earlier. Before: ', window.location.hash, 'after: ', newhash);
+            if (idTokenExpiresIn < minAccesstokenOrIdtokenOrIdpSettingsExpiresIn) {
+              minAccesstokenOrIdtokenOrIdpSettingsExpiresIn = idTokenExpiresIn;
+              newExpireReplaceReason = 'idtoken.exp is earlier';
+            }
+
+            if (idpSettings.maxExpiresIn && idpSettings.maxExpiresIn < minAccesstokenOrIdtokenOrIdpSettingsExpiresIn) {
+              minAccesstokenOrIdtokenOrIdpSettingsExpiresIn = idpSettings.maxExpiresIn;
+              newExpireReplaceReason = 'idpSettings.maxExpiresIn is smaller';
+            }
+
+            if (newExpireReplaceReason) {
+              var newhash = window.location.hash.replace(matched_expires[0], 'expires_in=' + minAccesstokenOrIdtokenOrIdpSettingsExpiresIn);
+              console.debug('Replacing expires_in in window.location.hash to ' + minAccesstokenOrIdtokenOrIdpSettingsExpiresIn + ' because ' + newExpireReplaceReason + '. ', 'debug:', 'original expires_in: ' + expires_in + ', ', 'idTokenExpiresIn: ' + idTokenExpiresIn + '(idtoken exp: ' + exp + '), ', 'idpSettings maxExpiresIn: ' + idpSettings.maxExpiresIn);
               window.location.hash = newhash;
             }
           }
@@ -119,7 +132,11 @@ function logout(dispatch, userManagerInstance) {
   dispatch((0, _actions.setLoggedUser)(null));
   sessionStorage.removeItem(hackauthoritykey); //To remove when hack is removed
 
-  return userManagerInstance.signoutRedirect().then(function () {
+  return userManagerInstance.signoutRedirect({
+    extraQueryParams: {
+      TargetResource: userManagerInstance.settings.post_logout_redirect_uri
+    }
+  }).then(function () {
     return console.debug('logged out');
   });
 }

package/package.json

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