asab_webui_shell 25.2.6 → 25.2.7

package/dist/modules/auth/api.js

@@ -105,6 +105,16 @@ class SeaCatAuthApi {
     });
     return this.OidcAPI.post('/token', qs.toString());
   }
+
+  // Method for token refresh
+  token_refresh(refresh_token) {
+    var qs = new URLSearchParams({
+      grant_type: "refresh_token",
+      refresh_token: refresh_token,
+      client_id: this.ClientId
+    });
+    return this.OidcAPI.post('/token', qs.toString());
+  }
 }
 exports.SeaCatAuthApi = SeaCatAuthApi;
 ;

package/dist/modules/auth/index.js

@@ -21,7 +21,7 @@ var InvitationScreen = /*#__PURE__*/(0, _react.lazy)(() => Promise.resolve().the
 class AuthModule extends _asab_webui_components.Module {
   constructor(app, name) {
     super(app, "AuthModule");
-    this.OAuthToken = JSON.parse(sessionStorage.getItem('SeaCatOAuth2Token'));
+    this.OAuthTokens = JSON.parse(sessionStorage.getItem('SeaCatOAuth2Tokens'));
     this.UserInfo = null;
     this.Api = new _api.SeaCatAuthApi(app);
     this.RedirectURL = window.location.href;
@@ -89,7 +89,7 @@ class AuthModule extends _asab_webui_components.Module {
           return;
         }
         if (authorization_code !== null) {
-          yield _this._updateToken(authorization_code);
+          yield _this._exchangeCodeForTokens(authorization_code);
           // Remove 'code' from a query string
           qs.delete('code');
           var stateIndex = qs.get("state");
@@ -121,12 +121,12 @@ class AuthModule extends _asab_webui_components.Module {
         }
 
         // Do we have an oauth token (we are authorized to use the app)
-        if (_this.OAuthToken != null) {
+        if (_this.OAuthTokens != null) {
           // Update the user info
           var result = yield _this.updateUserInfo();
           if (!result) {
             // User info not found - go to login
-            sessionStorage.removeItem('SeaCatOAuth2Token');
+            sessionStorage.removeItem('SeaCatOAuth2Tokens');
             var force_login_prompt = true;
             yield _this.Api.login(_this.RedirectURL, force_login_prompt);
             return;
@@ -188,13 +188,13 @@ class AuthModule extends _asab_webui_components.Module {
   }
   authInterceptor() {
     var interceptor = config => {
-      config.headers['Authorization'] = 'Bearer ' + this.OAuthToken['access_token'];
+      config.headers['Authorization'] = 'Bearer ' + this.OAuthTokens['access_token'];
       return config;
     };
     return interceptor;
   }
   webSocketAuthInterceptor() {
-    return "access_token_".concat(this.OAuthToken['access_token']);
+    return "access_token_".concat(this.OAuthTokens['access_token']);
   }
   simulateUserinfo(mock_userinfo) {
     var _this2 = this;
@@ -250,8 +250,8 @@ class AuthModule extends _asab_webui_components.Module {
     this.App.addSplashScreenRequestor(this);
     this._stopSessionExpirationValidation(); // Stop session validation and clear the timeout
 
-    sessionStorage.removeItem('SeaCatOAuth2Token');
-    var promise = this.Api.logout(this.OAuthToken['access_token']);
+    sessionStorage.removeItem('SeaCatOAuth2Tokens');
+    var promise = this.Api.logout(this.OAuthTokens['access_token']);
     if (promise == null) {
       window.location.reload();
     }
@@ -362,7 +362,7 @@ class AuthModule extends _asab_webui_components.Module {
       var _response$data;
       var response;
       try {
-        response = yield _this5.Api.userinfo(_this5.OAuthToken.access_token);
+        response = yield _this5.Api.userinfo(_this5.OAuthTokens.access_token);
       } catch (err) {
         console.error("Failed to update user info", err);
         _this5.UserInfo = null;
@@ -391,19 +391,41 @@ class AuthModule extends _asab_webui_components.Module {
       return true;
     })();
   }
-  _updateToken(authorization_code) {
+
+  // Method for obtaining and storing the OAuth tokens based on authorization code
+  _exchangeCodeForTokens(authorization_code) {
     var _this6 = this;
     return (0, _asyncToGenerator2.default)(function* () {
-      var response;
       try {
-        response = yield _this6.Api.token_authorization_code(authorization_code, _this6.RedirectURL);
+        var response = yield _this6.Api.token_authorization_code(authorization_code, _this6.RedirectURL);
+        _this6.OAuthTokens = response.data;
+        sessionStorage.setItem('SeaCatOAuth2Tokens', JSON.stringify(response.data));
+        return true;
       } catch (err) {
         console.error("Failed to update token", err);
         return false;
       }
-      _this6.OAuthToken = response.data;
-      sessionStorage.setItem('SeaCatOAuth2Token', JSON.stringify(response.data));
-      return true;
+    })();
+  }
+
+  // Method for refreshing OAuth tokens
+  _refreshTokens() {
+    var _this7 = this;
+    return (0, _asyncToGenerator2.default)(function* () {
+      var _this7$OAuthTokens;
+      // If no refresh_token found, return false
+      if (!((_this7$OAuthTokens = _this7.OAuthTokens) !== null && _this7$OAuthTokens !== void 0 && _this7$OAuthTokens.refresh_token)) {
+        return false;
+      }
+      try {
+        var response = yield _this7.Api.token_refresh(_this7.OAuthTokens.refresh_token);
+        _this7.OAuthTokens = response.data;
+        sessionStorage.setItem('SeaCatOAuth2Tokens', JSON.stringify(response.data));
+        return true;
+      } catch (err) {
+        console.error("Failed to refresh token", err);
+        return false;
+      }
     })();
   }
   _getAuthorizedTenant(userInfo) {
@@ -424,48 +446,89 @@ class AuthModule extends _asab_webui_components.Module {
 
   // Loop validating session expiration
   _startSessionExpirationValidation() {
-    var _this7 = this;
+    var _this8 = this;
     return (0, _asyncToGenerator2.default)(function* () {
-      if (!_this7.SessionExpiration) {
+      if (!_this8.SessionExpiration) {
         console.warn("Session expiration is not set.");
         return;
       }
+
+      // Max session duration
+      var MAX_SESSION_DURATION = Math.pow(2, 31) - 1;
+
+      // Proactivelly validate session expiration
+      var lastKnownExpiration = _this8.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
+      if (sessionDuration > MAX_SESSION_DURATION) {
+        // Set timeout to maximum allowed value
+        sessionDuration = MAX_SESSION_DURATION;
+      }
+      var sessionMidpoint = sessionStartTime + sessionDuration / 2; // Session midpoint value
+      var refreshSessionDone = false; // Tracks if the session has been proactivelly refreshed
       var warningDisplayed = false; // Tracks if the "about to expire" warning has been shown
 
       var _validateSession = /*#__PURE__*/function () {
         var _ref3 = (0, _asyncToGenerator2.default)(function* () {
           var currentTime = Date.now() / 1000; // Convert milliseconds to seconds
-          var timeRemaining = _this7.SessionExpiration - currentTime; // Time difference for triggering "about to expire" warning
+          var timeRemaining = _this8.SessionExpiration - currentTime; // Time difference for triggering "about to expire" warning
           // Prevent glitches on very large time remaining values
-          if (timeRemaining >= Math.pow(2, 31)) {
+          if (timeRemaining > MAX_SESSION_DURATION) {
             // Set timeout to maximum allowed value
-            timeRemaining = Math.pow(2, 31) - 1;
+            timeRemaining = MAX_SESSION_DURATION;
+          }
+
+          // 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();
+            // Recalculate if session expiration was extended
+            if (tokensRefreshed) {
+              yield _this8.updateUserInfo(); // Update userinfo
+              // If current session expiration differs from last known expiration, recalculate session variables
+              if (_this8.SessionExpiration !== lastKnownExpiration) {
+                lastKnownExpiration = _this8.SessionExpiration;
+                sessionStartTime = currentTime;
+                sessionDuration = lastKnownExpiration - sessionStartTime;
+                // Prevent glitches on very large time remaining values
+                if (sessionDuration > MAX_SESSION_DURATION) {
+                  // Set timeout to maximum allowed value
+                  sessionDuration = MAX_SESSION_DURATION;
+                }
+                sessionMidpoint = sessionStartTime + sessionDuration / 2;
+                refreshSessionDone = false;
+              }
+            }
           }
 
           // If remaining time is between 1 and 60s, repetitivelly ask for userInfo and trigger "about to expire" warning
           if (timeRemaining <= 60 && timeRemaining > 0) {
-            if (!warningDisplayed) {
-              _this7.App.addAlert("info", "General|Your session will expire soon", 30, true);
+            var _tokensRefreshed = yield _this8._refreshTokens(); // Returns true/false if token is refreshed/not refreshed
+            yield _this8.updateUserInfo(); // Continue updating user info
+            if (!_tokensRefreshed && !warningDisplayed) {
+              _this8.App.addAlert("info", "General|Your session will expire soon", 30, true);
               warningDisplayed = true; // Mark the warning as displayed
             }
-            yield _this7.updateUserInfo(); // Continue updating user info
           }
 
           // Validation on expired session
-          if (_this7.SessionExpiration <= currentTime) {
+          if (_this8.SessionExpiration <= currentTime) {
+            // Handle refresh token prior updating user info
+            yield _this8._refreshTokens();
             // Handle session expiration
-            var isUserInfoUpdated = yield _this7.updateUserInfo();
+            var isUserInfoUpdated = yield _this8.updateUserInfo();
             if (!isUserInfoUpdated) {
               // Stop further checks
-              clearTimeout(_this7.sessionValidationInterval);
-              _this7.sessionValidationInterval = null;
-              _this7.App.addAlert("info", "ASABAuthModule|Your session has expired.", 3600 * 1000, true, (alert, store) => /*#__PURE__*/_react.default.createElement(_SessionExpirationAlert.SessionExpirationAlert, {
+              clearTimeout(_this8.sessionValidationInterval);
+              _this8.sessionValidationInterval = null;
+              _this8.App.addAlert("info", "ASABAuthModule|Your session has expired.", 3600 * 1000, true, (alert, store) => /*#__PURE__*/_react.default.createElement(_SessionExpirationAlert.SessionExpirationAlert, {
                 alert: alert,
                 store: store
               }));
               // Disable UI elements
-              if (_this7.App.Store) {
-                _this7.App.Store.dispatch({
+              if (_this8.App.Store) {
+                _this8.App.Store.dispatch({
                   type: _actions.types.AUTH_SESSION_EXPIRATION,
                   sessionExpired: true
                 });
@@ -486,7 +549,7 @@ class AuthModule extends _asab_webui_components.Module {
           }
 
           // Re-trigger validation after 10 seconds
-          _this7.sessionValidationInterval = setTimeout(_validateSession, 10000);
+          _this8.sessionValidationInterval = setTimeout(_validateSession, 10000);
         });
         return function validateSession() {
           return _ref3.apply(this, arguments);

package/package.json

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