@frontegg/rest-api 7.101.0-alpha.2 → 7.102.0-alpha.0

package/auth/index.d.ts

@@ -23,6 +23,7 @@ export declare class AuthenticationApi extends BaseApiClient {
      */
     shouldLoadMeAuthorization(): boolean;
     generateLoginResponseV3: (loginResponse: ILoginResponse) => Promise<ILoginResponseV3>;
+    private resolveSessionTenant;
     generateLoginResponseFromOAuthResponse: (oauthResponse: IOAuthTokenResponse) => Promise<ILoginResponse>;
     generateLoginResponseFromOAuthResponseV2: (oauthResponse: IOAuthTokenResponse) => Promise<ILoginResponseV3>;
     /**

package/auth/index.js

@@ -67,14 +67,12 @@ export class AuthenticationApi extends BaseApiClient {
       const [me, currentUserTenants] = await Promise.all([this.getMeAndEntitlements(), getCurrentUserTenantsFunction(this.appName)()]);
       const decodedContent = accessToken ? jwtDecode(accessToken) : {};
       const user = _extends({}, loginResponse, decodedContent, me);
-      if (contextHolder.isSessionPerTenantEnabled()) {
-        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 => {
@@ -104,14 +102,12 @@ export class AuthenticationApi extends BaseApiClient {
       }, decodedContent, me, {
         expiresIn: oauthResponse.expires_in || 300
       });
-      if (contextHolder.isSessionPerTenantEnabled()) {
-        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 => {
@@ -824,5 +820,25 @@ export class AuthenticationApi extends BaseApiClient {
     const [shouldLoadAuthorization] = FeatureFlags.getFeatureFlags([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) {
+        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;
+  }
 }
 export default new AuthenticationApi('default');

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/auth/index.js

@@ -132,14 +132,12 @@ class AuthenticationApi extends _BaseApiClient.BaseApiClient {
       const [me, currentUserTenants] = await Promise.all([this.getMeAndEntitlements(), (0, _utils.getCurrentUserTenantsFunction)(this.appName)()]);
       const decodedContent = accessToken ? (0, _jwt.jwtDecode)(accessToken) : {};
       const user = (0, _extends2.default)({}, loginResponse, decodedContent, me);
-      if (contextHolder.isSessionPerTenantEnabled()) {
-        (0, _utils.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 => {
@@ -169,14 +167,12 @@ class AuthenticationApi extends _BaseApiClient.BaseApiClient {
       }, decodedContent, me, {
         expiresIn: oauthResponse.expires_in || 300
       });
-      if (contextHolder.isSessionPerTenantEnabled()) {
-        (0, _utils.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 => {
@@ -889,6 +885,26 @@ class AuthenticationApi extends _BaseApiClient.BaseApiClient {
     const [shouldLoadAuthorization] = _featureFlags.FeatureFlags.getFeatureFlags([_interfaces.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.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;
+  }
 }
 exports.AuthenticationApi = AuthenticationApi;
 var _default = new AuthenticationApi('default');

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@frontegg/rest-api",
-  "version": "7.101.0-alpha.2",
+  "version": "7.102.0-alpha.0",
   "main": "./node/index.js",
   "license": "MIT",
   "author": "Frontegg LTD",