@frontegg/js 7.101.0-alpha.2 → 7.102.0-alpha.0

package/index.js

@@ -1,4 +1,4 @@
-/** @license Frontegg v7.101.0-alpha.2
+/** @license Frontegg v7.102.0-alpha.0
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

package/node/index.js

@@ -1,4 +1,4 @@
-/** @license Frontegg v7.101.0-alpha.2
+/** @license Frontegg v7.102.0-alpha.0
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

package/node/version.js

@@ -5,6 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _default = {
-  cdnVersion: '7.101.0-alpha.2'
+  cdnVersion: '7.102.0-alpha.0'
 };
 exports["default"] = _default;

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@frontegg/js",
-  "version": "7.101.0-alpha.2",
+  "version": "7.102.0-alpha.0",
   "main": "./node/index.js",
   "license": "MIT",
   "author": "Frontegg LTD",
   "dependencies": {
     "@babel/runtime": "^7.18.6",
-    "@frontegg/types": "7.101.0-alpha.2"
+    "@frontegg/types": "7.102.0-alpha.0"
   },
   "browserslist": {
     "production": [

package/umd/frontegg.development.js

@@ -1923,7 +1923,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "default": () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({
-  cdnVersion: '7.101.0-alpha.2'
+  cdnVersion: '7.102.0-alpha.0'
 });
 
 /***/ }),
@@ -19895,7 +19895,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _subscriptions_interfaces__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./subscriptions/interfaces */ "../../dist/@frontegg/redux-store/subscriptions/interfaces.js");
 /* harmony import */ var _vendor__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./vendor */ "../../dist/@frontegg/redux-store/vendor/index.js");
 /* harmony import */ var _audits__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./audits */ "../../dist/@frontegg/redux-store/audits/index.js");
-/** @license Frontegg v7.101.0-alpha.2
+/** @license Frontegg v7.102.0-alpha.0
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -28227,14 +28227,12 @@ class AuthenticationApi extends _BaseApiClient__WEBPACK_IMPORTED_MODULE_6__.Base
       const [me, currentUserTenants] = await Promise.all([this.getMeAndEntitlements(), (0,_utils__WEBPACK_IMPORTED_MODULE_5__.getCurrentUserTenantsFunction)(this.appName)()]);
       const decodedContent = accessToken ? (0,_jwt__WEBPACK_IMPORTED_MODULE_10__.jwtDecode)(accessToken) : {};
       const user = (0,_babel_runtime_helpers_esm_extends__WEBPACK_IMPORTED_MODULE_1__["default"])({}, loginResponse, decodedContent, me);
-      if (contextHolder.isSessionPerTenantEnabled()) {
-        (0,_utils__WEBPACK_IMPORTED_MODULE_5__.setTabTenantInSessionStorage)(user.tenantId);
-      }
+      const activeTenant = this.resolveSessionTenant(contextHolder, user, decodedContent, currentUserTenants);
       contextHolder.setUser(user);
       return {
         user,
         tenants: currentUserTenants.tenants,
-        activeTenant: currentUserTenants.activeTenant
+        activeTenant
       };
     };
     this.generateLoginResponseFromOAuthResponse = async oauthResponse => {
@@ -28264,14 +28262,12 @@ class AuthenticationApi extends _BaseApiClient__WEBPACK_IMPORTED_MODULE_6__.Base
       }, decodedContent, me, {
         expiresIn: oauthResponse.expires_in || 300
       });
-      if (contextHolder.isSessionPerTenantEnabled()) {
-        (0,_utils__WEBPACK_IMPORTED_MODULE_5__.setTabTenantInSessionStorage)(user.tenantId);
-      }
+      const activeTenant = this.resolveSessionTenant(contextHolder, user, decodedContent, currentUserTenants);
       contextHolder.setUser(user);
       return {
         user,
         tenants: currentUserTenants.tenants,
-        activeTenant: currentUserTenants.activeTenant
+        activeTenant
       };
     };
     this.preLogin = async body => {
@@ -28984,6 +28980,26 @@ class AuthenticationApi extends _BaseApiClient__WEBPACK_IMPORTED_MODULE_6__.Base
     const [shouldLoadAuthorization] = _feature_flags__WEBPACK_IMPORTED_MODULE_12__.FeatureFlags.getFeatureFlags([_interfaces__WEBPACK_IMPORTED_MODULE_13__.LOAD_AUTHORIZATION_FF], this.appName);
     return shouldLoadAuthorization;
   }
+  resolveSessionTenant(contextHolder, user, decodedContent, currentUserTenants) {
+    let {
+      activeTenant
+    } = currentUserTenants;
+    if (contextHolder.isSessionPerTenantEnabled()) {
+      if (decodedContent.tenantId) {
+        user.tenantId = decodedContent.tenantId;
+      }
+      if (user.tenantId) {
+        (0,_utils__WEBPACK_IMPORTED_MODULE_5__.setTabTenantInSessionStorage)(user.tenantId);
+        // The server's activeTenant may reflect a different tab's tenant switch.
+        // Correct it to match the JWT's tenant for this tab.
+        const matchingTenant = currentUserTenants.tenants.find(t => t.tenantId === user.tenantId);
+        if (matchingTenant) {
+          activeTenant = matchingTenant;
+        }
+      }
+    }
+    return activeTenant;
+  }
 }
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (new AuthenticationApi('default'));
 
@@ -30222,7 +30238,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _security_center_interfaces__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ./security-center/interfaces */ "../../dist/@frontegg/rest-api/security-center/interfaces.js");
 /* harmony import */ var _applications_interfaces__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ./applications/interfaces */ "../../dist/@frontegg/rest-api/applications/interfaces.js");
 /* harmony import */ var _constants__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ./constants */ "../../dist/@frontegg/rest-api/constants.js");
-/** @license Frontegg v7.101.0-alpha.2
+/** @license Frontegg v7.102.0-alpha.0
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -33017,7 +33033,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ });
 /* harmony import */ var _ThemeOptions__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./ThemeOptions */ "../../dist/@frontegg/types/ThemeOptions/index.js");
 /* harmony import */ var _Metadata__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./Metadata */ "../../dist/@frontegg/types/Metadata/index.js");
-/** @license Frontegg v7.101.0-alpha.2
+/** @license Frontegg v7.102.0-alpha.0
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.