asab_webui_shell 26.1.2 → 26.1.3

package/dist/containers/Application.js

@@ -82,21 +82,8 @@ class Application extends _react.Component {
   constructor(props) {
     super(props);
 
-    // Global AppStore variables
-    var appStore = {
-      state: null,
-      dispatch: null
-    }; // Create the store object (fields stays writable so the provider can update them)
-    Object.seal(appStore); // Lock the shape, so no adding/removing properties (but existing fields remain writable)
-    Object.defineProperty(this, 'AppStore', {
-      value: appStore,
-      writable: false,
-      // Can't reassign this.AppStore
-      configurable: false,
-      // Can't redefine/delete the property
-      enumerable: true // Makes it show up in Object.keys/console
-    }); // Define a read-only, non-configurable property on the instance
-
+    // Create App store with global AppStore variables
+    this.AppStore = (0, _asab_webui_components.createAppStore)();
     this.Modules = [];
     this.Services = {};
     this.ReduxService = new _ReduxService.default(this, "ReduxService");
@@ -599,7 +586,7 @@ class Application extends _react.Component {
     var _this$AppStore$dispat3, _this$AppStore3;
     if (enabled === 0) {
       var _state$advmode;
-      var state = this.AppStore.state;
+      var state = this.AppStore.getState();
       enabled = !(state !== null && state !== void 0 && (_state$advmode = state.advmode) !== null && _state$advmode !== void 0 && _state$advmode.enabled);
     }
     (_this$AppStore$dispat3 = (_this$AppStore3 = this.AppStore).dispatch) === null || _this$AppStore$dispat3 === void 0 || _this$AppStore$dispat3.call(_this$AppStore3, {
@@ -619,7 +606,7 @@ class Application extends _react.Component {
   */
   setFullScreenMode(status) {
     var _state$fullscreenmode, _this$AppStore$dispat4, _this$AppStore4;
-    var state = this.AppStore.state;
+    var state = this.AppStore.getState();
     if (status === 'on' && (state === null || state === void 0 || (_state$fullscreenmode = state.fullscreenmode) === null || _state$fullscreenmode === void 0 ? void 0 : _state$fullscreenmode.status) === 'on') {
       status = 'off';
     }

package/dist/modules/auth/index.js

@@ -169,7 +169,7 @@ class AuthModule extends _asab_webui_components.Module {
               type: _actions.types.AUTH_RESOURCES,
               resources: resources
             });
-            yield _this.validateNavigation({
+            _this.validateNavigation({
               resources
             });
           }
@@ -263,75 +263,57 @@ class AuthModule extends _asab_webui_components.Module {
       window.location.reload();
     });
   }
-
-  // TODO: reconsider removing async/await with promise
   validateNavigation(_ref) {
-    var _this3 = this;
-    return (0, _asyncToGenerator2.default)(function* () {
-      var _state$navigation, _this3$App$AppStore$d, _this3$App$AppStore;
-      var {
-        resources
-      } = _ref;
-      var state = _this3.App.AppStore.state;
-      var navItems = (_state$navigation = state.navigation) === null || _state$navigation === void 0 ? void 0 : _state$navigation.navItems;
-      var authorizedNavItems = [];
-      navItems && (yield Promise.all(navItems.map(/*#__PURE__*/function () {
-        var _ref2 = (0, _asyncToGenerator2.default)(function* (itm, idx) {
-          if (resources.indexOf('authz:superuser') !== -1) {
-            // If user is superuser, validate every navigation item
+    var _state$navigation, _this$App$AppStore$di, _this$App$AppStore;
+    var {
+      resources
+    } = _ref;
+    var state = this.App.AppStore.getState();
+    var navItems = (_state$navigation = state.navigation) === null || _state$navigation === void 0 ? void 0 : _state$navigation.navItems;
+    var authorizedNavItems = [];
+    navItems && navItems.map((itm, idx) => {
+      if (resources.indexOf('authz:superuser') !== -1) {
+        // If user is superuser, validate every navigation item
+        authorizedNavItems.push(itm);
+      } else {
+        if (itm.resource) {
+          if (itm.children) {
+            itm.children = this._validateChildrenNav(itm, resources);
+          }
+          // Item validation
+          var access_auth = this._validateItemNav(itm.resource, resources);
+          if (access_auth == true) {
             authorizedNavItems.push(itm);
-          } else {
-            if (itm.resource) {
-              if (itm.children) {
-                itm.children = yield _this3._validateChildrenNav(itm, resources);
-              }
-              // Item validation
-              var access_auth = _this3._validateItemNav(itm.resource, resources);
-              if (access_auth == true) {
-                authorizedNavItems.push(itm);
-              }
-            } else {
-              if (itm.children) {
-                itm.children = yield _this3._validateChildrenNav(itm, resources);
-                if (itm.children.length > 0) {
-                  authorizedNavItems.push(itm);
-                }
-              }
+          }
+        } else {
+          if (itm.children) {
+            itm.children = this._validateChildrenNav(itm, resources);
+            if (itm.children.length > 0) {
+              authorizedNavItems.push(itm);
             }
           }
-        });
-        return function (_x, _x2) {
-          return _ref2.apply(this, arguments);
-        };
-      }())));
-      (_this3$App$AppStore$d = (_this3$App$AppStore = _this3.App.AppStore).dispatch) === null || _this3$App$AppStore$d === void 0 || _this3$App$AppStore$d.call(_this3$App$AppStore, {
-        type: _actions2.SET_NAVIGATION_ITEMS,
-        navItems: authorizedNavItems
-      });
-    })();
+        }
+      }
+    });
+    (_this$App$AppStore$di = (_this$App$AppStore = this.App.AppStore).dispatch) === null || _this$App$AppStore$di === void 0 || _this$App$AppStore$di.call(_this$App$AppStore, {
+      type: _actions2.SET_NAVIGATION_ITEMS,
+      navItems: authorizedNavItems
+    });
   }
 
   // Validate sidebar's item children
   _validateChildrenNav(itm, resources) {
-    var _this4 = this;
-    return (0, _asyncToGenerator2.default)(function* () {
-      // Item's children validation
-      var authorizedNavChildren = [];
-      yield Promise.all(itm.children.map(/*#__PURE__*/function () {
-        var _ref3 = (0, _asyncToGenerator2.default)(function* (child, id) {
-          if (child.resource) {
-            var access_auth = _this4._validateItemNav(child.resource, resources);
-            if (access_auth == true) {
-              authorizedNavChildren.push(child);
-            }
-          }
-        });
-        return function (_x3, _x4) {
-          return _ref3.apply(this, arguments);
-        };
-      }()));
-      return authorizedNavChildren;
-    })();
+    // Item's children validation
+    var authorizedNavChildren = [];
+    itm.children.map((child, id) => {
+      if (child.resource) {
+        var access_auth = this._validateItemNav(child.resource, resources);
+        if (access_auth == true) {
+          authorizedNavChildren.push(child);
+        }
+      }
+    });
+    return authorizedNavChildren;
   }
 
   // Validate sidebar items
@@ -361,38 +343,38 @@ class AuthModule extends _asab_webui_components.Module {
     return valid;
   }
   updateUserInfo() {
-    var _this5 = this;
+    var _this3 = this;
     return (0, _asyncToGenerator2.default)(function* () {
       var _response$data;
       var response;
       try {
-        response = yield _this5.Api.userinfo(_this5.OAuthTokens.access_token);
+        response = yield _this3.Api.userinfo(_this3.OAuthTokens.access_token);
       } catch (err) {
         console.error("Failed to update user info", err);
-        _this5.UserInfo = null;
-        if (_this5.App.AppStore) {
-          var _this5$App$AppStore$d, _this5$App$AppStore;
-          (_this5$App$AppStore$d = (_this5$App$AppStore = _this5.App.AppStore).dispatch) === null || _this5$App$AppStore$d === void 0 || _this5$App$AppStore$d.call(_this5$App$AppStore, {
+        _this3.UserInfo = null;
+        if (_this3.App.AppStore) {
+          var _this3$App$AppStore$d, _this3$App$AppStore;
+          (_this3$App$AppStore$d = (_this3$App$AppStore = _this3.App.AppStore).dispatch) === null || _this3$App$AppStore$d === void 0 || _this3$App$AppStore$d.call(_this3$App$AppStore, {
             type: _actions.types.AUTH_USERINFO,
-            payload: _this5.UserInfo
+            payload: _this3.UserInfo
           });
         }
         return false;
       }
-      _this5.UserInfo = response.data;
-      _this5.SessionExpiration = (_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.exp;
-      if (_this5.App.AppStore) {
-        var _this5$App$AppStore$d2, _this5$App$AppStore2;
-        (_this5$App$AppStore$d2 = (_this5$App$AppStore2 = _this5.App.AppStore).dispatch) === null || _this5$App$AppStore$d2 === void 0 || _this5$App$AppStore$d2.call(_this5$App$AppStore2, {
+      _this3.UserInfo = response.data;
+      _this3.SessionExpiration = (_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.exp;
+      if (_this3.App.AppStore) {
+        var _this3$App$AppStore$d2, _this3$App$AppStore2;
+        (_this3$App$AppStore$d2 = (_this3$App$AppStore2 = _this3.App.AppStore).dispatch) === null || _this3$App$AppStore$d2 === void 0 || _this3$App$AppStore$d2.call(_this3$App$AppStore2, {
           type: _actions.types.AUTH_USERINFO,
-          payload: _this5.UserInfo
+          payload: _this3.UserInfo
         });
       }
 
       /** Check for TenantService and pass tenants list obtained from userinfo */
-      var availableTenants = _this5.UserInfo.tenants;
-      if (_this5.App.Services.TenantService) {
-        yield _this5.App.Services.TenantService.setTenants(availableTenants, _this5._getAuthorizedTenant(_this5.UserInfo));
+      var availableTenants = _this3.UserInfo.tenants;
+      if (_this3.App.Services.TenantService) {
+        yield _this3.App.Services.TenantService.setTenants(availableTenants, _this3._getAuthorizedTenant(_this3.UserInfo));
       }
       return true;
     })();
@@ -400,11 +382,11 @@ class AuthModule extends _asab_webui_components.Module {
 
   // Method for obtaining and storing the OAuth tokens based on authorization code
   _exchangeCodeForTokens(authorization_code) {
-    var _this6 = this;
+    var _this4 = this;
     return (0, _asyncToGenerator2.default)(function* () {
       try {
-        var response = yield _this6.Api.token_authorization_code(authorization_code, _this6.RedirectURL);
-        _this6.OAuthTokens = response.data;
+        var response = yield _this4.Api.token_authorization_code(authorization_code, _this4.RedirectURL);
+        _this4.OAuthTokens = response.data;
         sessionStorage.setItem('SeaCatOAuth2Tokens', JSON.stringify(response.data));
         return true;
       } catch (err) {
@@ -416,16 +398,16 @@ class AuthModule extends _asab_webui_components.Module {
 
   // Method for refreshing OAuth tokens
   _refreshTokens() {
-    var _this7 = this;
+    var _this5 = this;
     return (0, _asyncToGenerator2.default)(function* () {
-      var _this7$OAuthTokens;
+      var _this5$OAuthTokens;
       // If no refresh_token found, return false
-      if (!((_this7$OAuthTokens = _this7.OAuthTokens) !== null && _this7$OAuthTokens !== void 0 && _this7$OAuthTokens.refresh_token)) {
+      if (!((_this5$OAuthTokens = _this5.OAuthTokens) !== null && _this5$OAuthTokens !== void 0 && _this5$OAuthTokens.refresh_token)) {
         return false;
       }
       try {
-        var response = yield _this7.Api.token_refresh(_this7.OAuthTokens.refresh_token);
-        _this7.OAuthTokens = response.data;
+        var response = yield _this5.Api.token_refresh(_this5.OAuthTokens.refresh_token);
+        _this5.OAuthTokens = response.data;
         sessionStorage.setItem('SeaCatOAuth2Tokens', JSON.stringify(response.data));
         return true;
       } catch (err) {
@@ -452,9 +434,9 @@ class AuthModule extends _asab_webui_components.Module {
 
   // Loop validating session expiration
   _startSessionExpirationValidation() {
-    var _this8 = this;
+    var _this6 = this;
     return (0, _asyncToGenerator2.default)(function* () {
-      if (!_this8.SessionExpiration) {
+      if (!_this6.SessionExpiration) {
         console.warn("Session expiration is not set.");
         return;
       }
@@ -463,7 +445,7 @@ class AuthModule extends _asab_webui_components.Module {
       var MAX_SESSION_DURATION = Math.pow(2, 31) - 1;
 
       // Proactivelly validate session expiration
-      var lastKnownExpiration = _this8.SessionExpiration; // Last known session expiration
+      var lastKnownExpiration = _this6.SessionExpiration; // Last known session expiration
       var sessionStartTime = Date.now() / 1000; // Session start time
       var sessionDuration = lastKnownExpiration - sessionStartTime; // Session duration
       // Prevent glitches on very large time remaining values
@@ -476,9 +458,9 @@ class AuthModule extends _asab_webui_components.Module {
       var warningDisplayed = false; // Tracks if the "about to expire" warning has been shown
 
       var _validateSession = /*#__PURE__*/function () {
-        var _ref4 = (0, _asyncToGenerator2.default)(function* () {
+        var _ref2 = (0, _asyncToGenerator2.default)(function* () {
           var currentTime = Date.now() / 1000; // Convert milliseconds to seconds
-          var timeRemaining = _this8.SessionExpiration - currentTime; // Time difference for triggering "about to expire" warning
+          var timeRemaining = _this6.SessionExpiration - currentTime; // Time difference for triggering "about to expire" warning
           // Prevent glitches on very large time remaining values
           if (timeRemaining > MAX_SESSION_DURATION) {
             // Set timeout to maximum allowed value
@@ -488,13 +470,13 @@ class AuthModule extends _asab_webui_components.Module {
           // Validate session on half of the session expiration or if the remaining time is <= 5min
           if (!refreshSessionDone && (timeRemaining <= 300 || currentTime >= sessionMidpoint)) {
             refreshSessionDone = true;
-            var tokensRefreshed = yield _this8._refreshTokens();
+            var tokensRefreshed = yield _this6._refreshTokens();
             // Recalculate if session expiration was extended
             if (tokensRefreshed) {
-              yield _this8.updateUserInfo(); // Update userinfo
+              yield _this6.updateUserInfo(); // Update userinfo
               // If current session expiration differs from last known expiration, recalculate session variables
-              if (_this8.SessionExpiration !== lastKnownExpiration) {
-                lastKnownExpiration = _this8.SessionExpiration;
+              if (_this6.SessionExpiration !== lastKnownExpiration) {
+                lastKnownExpiration = _this6.SessionExpiration;
                 sessionStartTime = currentTime;
                 sessionDuration = lastKnownExpiration - sessionStartTime;
                 // Prevent glitches on very large time remaining values
@@ -510,31 +492,31 @@ class AuthModule extends _asab_webui_components.Module {
 
           // If remaining time is between 1 and 60s, repetitivelly ask for userInfo and trigger "about to expire" warning
           if (timeRemaining <= 60 && timeRemaining > 0) {
-            var _tokensRefreshed = yield _this8._refreshTokens(); // Returns true/false if token is refreshed/not refreshed
-            yield _this8.updateUserInfo(); // Continue updating user info
+            var _tokensRefreshed = yield _this6._refreshTokens(); // Returns true/false if token is refreshed/not refreshed
+            yield _this6.updateUserInfo(); // Continue updating user info
             if (!_tokensRefreshed && !warningDisplayed) {
-              _this8.App.addAlert("info", "General|Your session will expire soon", 30, true);
+              _this6.App.addAlert("info", "General|Your session will expire soon", 30, true);
               warningDisplayed = true; // Mark the warning as displayed
             }
           }
 
           // Validation on expired session
-          if (_this8.SessionExpiration <= currentTime) {
+          if (_this6.SessionExpiration <= currentTime) {
             // Handle refresh token prior updating user info
-            yield _this8._refreshTokens();
+            yield _this6._refreshTokens();
             // Handle session expiration
-            var isUserInfoUpdated = yield _this8.updateUserInfo();
+            var isUserInfoUpdated = yield _this6.updateUserInfo();
             if (!isUserInfoUpdated) {
               // Stop further checks
-              clearTimeout(_this8.sessionValidationInterval);
-              _this8.sessionValidationInterval = null;
-              _this8.App.addAlert("info", "ASABAuthModule|Your session has expired.", 3600 * 1000, true, alert => /*#__PURE__*/_react.default.createElement(_SessionExpirationAlert.SessionExpirationAlert, {
+              clearTimeout(_this6.sessionValidationInterval);
+              _this6.sessionValidationInterval = null;
+              _this6.App.addAlert("info", "ASABAuthModule|Your session has expired.", 3600 * 1000, true, alert => /*#__PURE__*/_react.default.createElement(_SessionExpirationAlert.SessionExpirationAlert, {
                 alert: alert
               }));
               // Disable UI elements
-              if (_this8.App.AppStore) {
-                var _this8$App$AppStore$d, _this8$App$AppStore;
-                (_this8$App$AppStore$d = (_this8$App$AppStore = _this8.App.AppStore).dispatch) === null || _this8$App$AppStore$d === void 0 || _this8$App$AppStore$d.call(_this8$App$AppStore, {
+              if (_this6.App.AppStore) {
+                var _this6$App$AppStore$d, _this6$App$AppStore;
+                (_this6$App$AppStore$d = (_this6$App$AppStore = _this6.App.AppStore).dispatch) === null || _this6$App$AppStore$d === void 0 || _this6$App$AppStore$d.call(_this6$App$AppStore, {
                   type: _actions.types.AUTH_SESSION_EXPIRATION,
                   sessionExpired: true
                 });
@@ -555,10 +537,10 @@ class AuthModule extends _asab_webui_components.Module {
           }
 
           // Re-trigger validation after 10 seconds
-          _this8.sessionValidationInterval = setTimeout(_validateSession, 10000);
+          _this6.sessionValidationInterval = setTimeout(_validateSession, 10000);
         });
         return function validateSession() {
-          return _ref4.apply(this, arguments);
+          return _ref2.apply(this, arguments);
         };
       }();
 

package/dist/modules/tenant/service.js

@@ -126,7 +126,7 @@ class TenantService extends _asab_webui_components.Service {
   // getCurrentTenant() method is used for obtaining current tenant
   getCurrentTenant() {
     var _this$App, _state$tenant;
-    var state = (_this$App = this.App) === null || _this$App === void 0 || (_this$App = _this$App.AppStore) === null || _this$App === void 0 ? void 0 : _this$App.state;
+    var state = (_this$App = this.App) === null || _this$App === void 0 || (_this$App = _this$App.AppStore) === null || _this$App === void 0 ? void 0 : _this$App.getState();
     var currentTenant = state === null || state === void 0 || (_state$tenant = state.tenant) === null || _state$tenant === void 0 ? void 0 : _state$tenant.current;
     // If current tenant is not in Application store yet, get it from the URL params
     if (!currentTenant) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "asab_webui_shell",
-  "version": "26.1.2",
+  "version": "26.1.3",
   "license": "BSD-3-Clause",
   "description": "TeskaLabs ASAB WebUI Shell Application",
   "contributors": [