@frontegg/rest-api 3.1.31 → 3.1.33

package/auth/constants.d.ts

@@ -3,3 +3,7 @@ export declare const FRONTEGG_SEPARATE_TABS_BY_TENANT = "FRONTEGG_SEPARATE_TABS_
  * use current user tenant v1 feature flag
  */
 export declare const USE_CURRENT_USER_TENANTS_V1_ENDPOINT_FF = "admin_portal_use_current_user_tenants_v1_endpoint";
+/**
+ * use entitlements v2 feature flag
+ */
+export declare const USE_ENTITLEMENTS_V2_ENDPOINT_FF = "admin_portal_use_entitlements_v2_endpoint";

package/auth/constants.js

@@ -1,2 +1,3 @@
 export const FRONTEGG_SEPARATE_TABS_BY_TENANT = 'FRONTEGG_SEPARATE_TABS_BY_TENANT';
-export const USE_CURRENT_USER_TENANTS_V1_ENDPOINT_FF = 'admin_portal_use_current_user_tenants_v1_endpoint';
+export const USE_CURRENT_USER_TENANTS_V1_ENDPOINT_FF = 'admin_portal_use_current_user_tenants_v1_endpoint';
+export const USE_ENTITLEMENTS_V2_ENDPOINT_FF = 'admin_portal_use_entitlements_v2_endpoint';

package/auth/index.js

@@ -12,10 +12,11 @@ import { ContextHolder } from "../ContextHolder";
 import { Delete, Get, Patch, Post, Put } from "../fetch";
 import { jwtDecode } from "../jwt";
 import { LOAD_AUTHORIZATION_FF } from './interfaces';
-import { loadEntitlements } from '../entitlements';
+import { loadEntitlements, loadEntitlementsV2 } from '../entitlements';
 import { ADMIN_PORTAL_ENTITLEMENTS_FF } from '../entitlements/interfaces';
 import { FeatureFlags } from "../feature-flags";
 import { executeConditionalPromise, getCurrentUserTenantsFunction, getTabTenantFromSessionStorage, setTabTenantInSessionStorage } from "./utils";
+import { USE_ENTITLEMENTS_V2_ENDPOINT_FF } from "./constants";
 export async function generateLoginResponse(loginResponse) {
   if (!loginResponse.accessToken) {
     return loginResponse;
@@ -724,11 +725,12 @@ export async function getMeV2() {
   return Get(`${urls.identity.users.v2}/me`);
 }
 export async function getMeAndEntitlements() {
+  const [useEntitlementsV2] = FeatureFlags.getFeatureFlags([USE_ENTITLEMENTS_V2_ENDPOINT_FF], ContextHolder.getAppName() || '');
   const actions = [{
     action: getMeV2,
     shouldLoad: true
   }, {
-    action: loadEntitlements,
+    action: useEntitlementsV2 ? loadEntitlementsV2 : loadEntitlements,
     shouldLoad: shouldLoadEntitlements()
   }, {
     action: getUserAuthorization,

package/auth/interfaces.d.ts

@@ -1,3 +1,4 @@
+import { UserEntitlementsContext as UserEntitlementsResponseV2 } from "@frontegg/entitlements-javascript-commons";
 import { ITenantsResponse, IUserProfile, UserEntitlementsResponse } from "..";
 import { AuthStrategyEnum, MachineToMachineAuthStrategy, SocialLoginProviders } from "./enums";
 import { ISamlRolesGroup } from "../teams/interfaces";
@@ -45,7 +46,7 @@ export declare type ILoginResponse = IUserProfile & {
     mfaStrategies?: MFAStrategyEnum[];
     mfaDevices?: UserMFADevicesResponse;
     isBreachedPassword?: boolean;
-    entitlements?: UserEntitlementsResponse;
+    entitlements?: UserEntitlementsResponse | UserEntitlementsResponseV2;
 };
 export declare type ILoginResponseV2 = {
     user: ILoginResponse;

package/auth/utils.js

@@ -19,7 +19,7 @@ export function setTabTenantInSessionStorage(tenantId) {
   sessionStorage.setItem(FRONTEGG_SEPARATE_TABS_BY_TENANT, tenantId);
 }
 export function getTabTenantFromSessionStorage() {
-  if (ContextHolder.isSessionPerTenantEnabled()) {
+  if (!ContextHolder.isSessionPerTenantEnabled()) {
     return null;
   }
 

package/constants.d.ts

@@ -249,6 +249,7 @@ export declare const urls: {
     };
     entitlements: {
         v1: string;
+        v2: string;
     };
     securityCenter: {
         recommendations: {

package/constants.js

@@ -248,7 +248,8 @@ export const urls = {
     temp: '/directory/resources/scim/temp'
   },
   entitlements: {
-    v1: '/entitlements/api/v1/user-entitlements'
+    v1: '/entitlements/api/v1/user-entitlements',
+    v2: '/entitlements/api/v2/user-entitlements'
   },
   securityCenter: {
     recommendations: {

package/entitlements/index.d.ts

@@ -1,4 +1,5 @@
 import { UserEntitlementsResponse } from './interfaces';
+import { UserEntitlementsContext as UserEntitlementsResponseV2 } from "@frontegg/entitlements-javascript-commons";
 /**
  * Load user entitlements data.
  * Including all user permissions, features and bundles data.
@@ -7,3 +8,11 @@ import { UserEntitlementsResponse } from './interfaces';
  * ``authorized user``
  */
 export declare function loadEntitlements(): Promise<UserEntitlementsResponse>;
+/**
+ * Load user entitlements data v2.
+ * Including all user permissions and features data.
+ * Now the final isEntitled response is not part of it, but includes the data needed to calculate it.
+ *
+ * ``authorized user``
+ */
+export declare function loadEntitlementsV2(): Promise<UserEntitlementsResponseV2>;

package/entitlements/index.js

@@ -2,4 +2,7 @@ import { urls } from '../constants';
 import { Get } from '../fetch';
 export async function loadEntitlements() {
   return Get(urls.entitlements.v1);
+}
+export async function loadEntitlementsV2() {
+  return Get(urls.entitlements.v2);
 }

package/index.js

@@ -1,4 +1,4 @@
-/** @license Frontegg v3.1.31
+/** @license Frontegg v3.1.33
  *
  * 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/constants.js

@@ -3,8 +3,10 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.USE_CURRENT_USER_TENANTS_V1_ENDPOINT_FF = exports.FRONTEGG_SEPARATE_TABS_BY_TENANT = void 0;
+exports.USE_ENTITLEMENTS_V2_ENDPOINT_FF = exports.USE_CURRENT_USER_TENANTS_V1_ENDPOINT_FF = exports.FRONTEGG_SEPARATE_TABS_BY_TENANT = void 0;
 const FRONTEGG_SEPARATE_TABS_BY_TENANT = 'FRONTEGG_SEPARATE_TABS_BY_TENANT';
 exports.FRONTEGG_SEPARATE_TABS_BY_TENANT = FRONTEGG_SEPARATE_TABS_BY_TENANT;
 const USE_CURRENT_USER_TENANTS_V1_ENDPOINT_FF = 'admin_portal_use_current_user_tenants_v1_endpoint';
-exports.USE_CURRENT_USER_TENANTS_V1_ENDPOINT_FF = USE_CURRENT_USER_TENANTS_V1_ENDPOINT_FF;
+exports.USE_CURRENT_USER_TENANTS_V1_ENDPOINT_FF = USE_CURRENT_USER_TENANTS_V1_ENDPOINT_FF;
+const USE_ENTITLEMENTS_V2_ENDPOINT_FF = 'admin_portal_use_entitlements_v2_endpoint';
+exports.USE_ENTITLEMENTS_V2_ENDPOINT_FF = USE_ENTITLEMENTS_V2_ENDPOINT_FF;

package/node/auth/index.js

@@ -377,6 +377,8 @@ var _interfaces2 = require("../entitlements/interfaces");
 
 var _featureFlags = require("../feature-flags");
 
+var _constants2 = require("./constants");
+
 const _excluded = ["type"],
       _excluded2 = ["type"],
       _excluded3 = ["type"];
@@ -1239,11 +1241,13 @@ async function getMeV2() {
 }
 
 async function getMeAndEntitlements() {
+  const [useEntitlementsV2] = _featureFlags.FeatureFlags.getFeatureFlags([_constants2.USE_ENTITLEMENTS_V2_ENDPOINT_FF], _ContextHolder.ContextHolder.getAppName() || '');
+
   const actions = [{
     action: getMeV2,
     shouldLoad: true
   }, {
-    action: _entitlements.loadEntitlements,
+    action: useEntitlementsV2 ? _entitlements.loadEntitlementsV2 : _entitlements.loadEntitlements,
     shouldLoad: shouldLoadEntitlements()
   }, {
     action: getUserAuthorization,

package/node/auth/utils.js

@@ -35,7 +35,7 @@ function setTabTenantInSessionStorage(tenantId) {
 }
 
 function getTabTenantFromSessionStorage() {
-  if (_ContextHolder.ContextHolder.isSessionPerTenantEnabled()) {
+  if (!_ContextHolder.ContextHolder.isSessionPerTenantEnabled()) {
     return null;
   }
 

package/node/constants.js

@@ -254,7 +254,8 @@ const urls = {
     temp: '/directory/resources/scim/temp'
   },
   entitlements: {
-    v1: '/entitlements/api/v1/user-entitlements'
+    v1: '/entitlements/api/v1/user-entitlements',
+    v2: '/entitlements/api/v2/user-entitlements'
   },
   securityCenter: {
     recommendations: {

package/node/entitlements/index.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.loadEntitlements = loadEntitlements;
+exports.loadEntitlementsV2 = loadEntitlementsV2;
 
 var _constants = require("../constants");
 
@@ -11,4 +12,8 @@ var _fetch = require("../fetch");
 
 async function loadEntitlements() {
   return (0, _fetch.Get)(_constants.urls.entitlements.v1);
+}
+
+async function loadEntitlementsV2() {
+  return (0, _fetch.Get)(_constants.urls.entitlements.v2);
 }

package/node/index.js

@@ -1,4 +1,4 @@
-/** @license Frontegg v3.1.31
+/** @license Frontegg v3.1.33
  *
  * 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,10 +1,11 @@
 {
   "name": "@frontegg/rest-api",
-  "version": "3.1.31",
+  "version": "3.1.33",
   "main": "./node/index.js",
   "license": "MIT",
   "dependencies": {
-    "@babel/runtime": "^7.17.2"
+    "@babel/runtime": "^7.17.2",
+    "@frontegg/entitlements-javascript-commons": "1.0.0-alpha.7"
   },
   "sideEffects": false,
   "private": false,

package/users/interfaces.d.ts

@@ -3,6 +3,7 @@ import { ITenantsResponse } from '../tenants/interfaces';
 import { IRole } from '../roles/interfaces';
 import { ITeamUserPermission, UserManagedByEnum } from '../teams/interfaces';
 import { IGroupResponse } from '../groups/interfaces';
+import { UserEntitlementsContext as UserEntitlementsResponseV2 } from "@frontegg/entitlements-javascript-commons";
 import { UserEntitlementsResponse } from '../entitlements/interfaces';
 export declare enum SortByEnum {
     createdAt = "createdAt",
@@ -75,7 +76,7 @@ export interface IBaseGetUserResponse extends IBaseUserData {
     createdAt?: Date;
     lastLogin?: Date;
     subAccountAccessAllowed?: boolean;
-    entitlements?: UserEntitlementsResponse;
+    entitlements?: UserEntitlementsResponse | UserEntitlementsResponseV2;
 }
 export declare type IUserProfile = IGetUsersV2Response;
 export interface IGetUsersV2Response extends IBaseGetUserResponse {