@frontegg/redux-store 6.117.0-alpha.1 → 6.118.0

package/auth/EntitlementsState/index.js

@@ -4,7 +4,8 @@ import { authStoreName } from '../../constants';
 const entitlementsState = {
   entitlements: undefined,
   loading: false,
-  error: undefined
+  error: undefined,
+  options: undefined
 };
 const reducers = {
   setEntitlementsState: typeReducerForKey('entitlementsState')

package/auth/EntitlementsState/interfaces.d.ts

@@ -1,9 +1,20 @@
 import { WithStatus } from '../../interfaces';
-import { EntitlementsResponse } from '@frontegg/rest-api';
+import { UserEntitlementsResponse, NotEntitledReason } from '@frontegg/rest-api';
 export declare type EntitlementsState = WithStatus & {
-    entitlements: EntitlementsResponse | undefined;
+    entitlements: UserEntitlementsResponse | undefined;
+    options?: EntitlementsOptions | undefined;
 };
+export interface EntitlementsOptions {
+    enabled: boolean;
+}
 export interface Entitlement {
     isEntitled: boolean;
+    justification?: NotEntitledReason;
+}
+export declare type EntitledToOptions = EntitledToFeature | EntitledToPermission;
+export interface EntitledToFeature {
+    featureKey: string;
+}
+export interface EntitledToPermission {
+    permissionKey: string;
 }
-export declare type Entitlements = Entitlement[];

package/auth/EntitlementsState/saga.d.ts

@@ -1,9 +1,10 @@
-import { EntitlementsResponse } from '@frontegg/rest-api';
+import { UserEntitlementsResponse } from '@frontegg/rest-api';
 /**
   Load entitlements list
+  Don't update entitlements data in the store when data is equal (deep check)
  */
-export declare function loadEntitlements(): Generator<import("redux-saga/effects").PutEffect<{
+export declare function loadEntitlements(): Generator<import("redux-saga/effects").SelectEffect | import("redux-saga/effects").PutEffect<{
     payload: Partial<import("./interfaces").EntitlementsState>;
     type: string;
-}> | import("redux-saga/effects").CallEffect<EntitlementsResponse>, void, EntitlementsResponse>;
+}> | import("redux-saga/effects").CallEffect<UserEntitlementsResponse>, void, UserEntitlementsResponse>;
 export declare function entitlementsSagas(): Generator<import("redux-saga/effects").ForkEffect<never>, void, unknown>;

package/auth/EntitlementsState/saga.js

@@ -1,9 +1,11 @@
-import { call, put, takeLeading } from 'redux-saga/effects';
+import isEqual from 'fast-deep-equal';
+import { call, put, takeLeading, select } from 'redux-saga/effects';
 import { api } from '@frontegg/rest-api';
 import { actions } from '../reducer';
 
 /**
   Load entitlements list
+  Don't update entitlements data in the store when data is equal (deep check)
  */
 export function* loadEntitlements() {
   yield put(actions.setEntitlementsState({
@@ -11,9 +13,19 @@ export function* loadEntitlements() {
     error: null
   }));
   try {
-    const entitlements = yield call(api.entitlements.loadEntitlements);
+    const newEntitlements = yield call(api.entitlements.loadEntitlements);
+    const oldEntitlements = yield select(state => {
+      var _state$auth$entitleme;
+      return (_state$auth$entitleme = state.auth.entitlementsState) == null ? void 0 : _state$auth$entitleme.entitlements;
+    });
+    if (isEqual(oldEntitlements, newEntitlements)) {
+      yield put(actions.setEntitlementsState({
+        loading: false
+      }));
+      return;
+    }
     yield put(actions.setEntitlementsState({
-      entitlements,
+      entitlements: newEntitlements,
       loading: false
     }));
   } catch (e) {

package/auth/EntitlementsState/utils.d.ts

@@ -1,8 +1,26 @@
-import { EntitlementsResponse } from '@frontegg/rest-api';
-import { Entitlements } from './interfaces';
+import { UserEntitlementsResponse } from '@frontegg/rest-api';
+import { EntitlementsOptions, EntitledToOptions, Entitlement } from './interfaces';
 /**
-  @param entitlementsByKey
-  @param keys The requested entitlement keys
-  @returns Entitlements contain true/false for every key (state of is key entitled)
+  @param entitlements
+  @param key
+  @param entitlementsVendorConfig entitlements frontegg provider configuration
+  @returns if the user is entitled to the given permission. Attaching the justification if not
+  @throws when entitlement is not enabled via frontegg options
  */
-export declare const getEntitlements: (entitlementsByKey: EntitlementsResponse | undefined, keys: string[]) => Entitlements;
+export declare const getPermissionEntitlements: (entitlements: UserEntitlementsResponse | undefined, key: string, entitlementsVendorConfig: EntitlementsOptions | undefined) => Entitlement;
+/**
+  @param entitlements
+  @param key
+  @param entitlementsVendorConfig entitlements frontegg provider configuration
+  @returns if the user is entitled to the given feature. Attaching the justification if not
+  @throws when entitlement is not enabled via frontegg options
+ */
+export declare const getFeatureEntitlements: (entitlements: UserEntitlementsResponse | undefined, key: string, entitlementsVendorConfig: EntitlementsOptions | undefined) => Entitlement;
+/**
+  @param entitlements
+  @param entitledToOptions including permission or feature
+  @param entitlementsVendorConfig entitlements frontegg provider configuration
+  @returns if the user is entitled to the given feature or permission (check only one). Attaching the justification if not
+  @throws when entitlement is not enabled via frontegg options
+ */
+export declare const getEntitlements: (entitlements: UserEntitlementsResponse | undefined, options: EntitledToOptions, entitlementsVendorConfig: EntitlementsOptions | undefined) => Entitlement;

package/auth/EntitlementsState/utils.js

@@ -1,8 +1,75 @@
+import { NotEntitledReason } from '@frontegg/rest-api';
+const ENTITLEMENTS_NOT_ENABLED_EXCEPTION_TEXT = 'You must first enable entitlements via Frontegg options to use this function';
+
 /**
-  @param entitlementsByKey
-  @param keys The requested entitlement keys
-  @returns Entitlements contain true/false for every key (state of is key entitled)
+ * Guard entitlements feature by checking if it is enabled by the vendor
+ * @throws when entitlement is not enabled via frontegg options
  */
-export const getEntitlements = (entitlementsByKey = {}, keys) => keys.reduce((result, key) => [...result, {
-  isEntitled: entitlementsByKey[key] || false
-}], []);
+const guardEntitlementsUsage = entitlementsOptions => {
+  if (entitlementsOptions != null && entitlementsOptions.enabled) return;
+  throw new Error(ENTITLEMENTS_NOT_ENABLED_EXCEPTION_TEXT);
+};
+
+/**
+  @param keyEntitlements permission or feature data object
+  @param entitlementsVendorConfig entitlements frontegg provider configuration
+  @param missingKeyEnum missing key for scenario that the key does not exist in entitlementsValuePerKeys
+  @returns if the user is entitled to the given key. Attaching the justification if not
+  @throws when entitlement is not enabled via frontegg options
+ */
+const getEntitlementsHelper = (keyEntitlements, entitlementsVendorConfig, missingKeyEnum) => {
+  guardEntitlementsUsage(entitlementsVendorConfig);
+  if (!keyEntitlements) {
+    return {
+      isEntitled: false,
+      justification: missingKeyEnum
+    };
+  }
+  if (keyEntitlements.isEntitled) {
+    return {
+      isEntitled: true
+    };
+  }
+  return {
+    isEntitled: false,
+    justification: keyEntitlements.notEntitledReason
+  };
+};
+
+/**
+  @param entitlements
+  @param key
+  @param entitlementsVendorConfig entitlements frontegg provider configuration
+  @returns if the user is entitled to the given permission. Attaching the justification if not
+  @throws when entitlement is not enabled via frontegg options
+ */
+export const getPermissionEntitlements = (entitlements, key, entitlementsVendorConfig) => {
+  var _entitlements$permiss;
+  return getEntitlementsHelper(entitlements == null ? void 0 : (_entitlements$permiss = entitlements.permissions) == null ? void 0 : _entitlements$permiss[key], entitlementsVendorConfig, NotEntitledReason.MISSING_PERMISSION);
+};
+
+/**
+  @param entitlements
+  @param key
+  @param entitlementsVendorConfig entitlements frontegg provider configuration
+  @returns if the user is entitled to the given feature. Attaching the justification if not
+  @throws when entitlement is not enabled via frontegg options
+ */
+export const getFeatureEntitlements = (entitlements, key, entitlementsVendorConfig) => {
+  var _entitlements$feature;
+  return getEntitlementsHelper(entitlements == null ? void 0 : (_entitlements$feature = entitlements.features) == null ? void 0 : _entitlements$feature[key], entitlementsVendorConfig, NotEntitledReason.MISSING_FEATURE);
+};
+
+/**
+  @param entitlements
+  @param entitledToOptions including permission or feature
+  @param entitlementsVendorConfig entitlements frontegg provider configuration
+  @returns if the user is entitled to the given feature or permission (check only one). Attaching the justification if not
+  @throws when entitlement is not enabled via frontegg options
+ */
+export const getEntitlements = (entitlements, options, entitlementsVendorConfig) => {
+  if ('permissionKey' in options) {
+    return getPermissionEntitlements(entitlements, options.permissionKey, entitlementsVendorConfig);
+  }
+  return getFeatureEntitlements(entitlements, options.featureKey, entitlementsVendorConfig);
+};

package/auth/GroupsState/index.d.ts

@@ -154,7 +154,7 @@ declare const actions: {
     }], import("@frontegg/rest-api").IUpdateGroupConfig & {
         groupId: string;
     }, string, never, never>;
-    getTeamUsers: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[import("@frontegg/rest-api").ILoadUsers], import("@frontegg/rest-api").ILoadUsers, string, never, never>;
+    getTeamUsers: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[import("..").IGetUsersV2Payload], import("..").IGetUsersV2Payload, string, never, never>;
 };
 declare type DispatchedActions = {
     setUsersGroupsLoader: (payload: GroupsStateIndicator) => void;

package/auth/GroupsState/interfaces.d.ts

@@ -1,6 +1,7 @@
 import { LoaderIndicatorState, WithCallback } from '../../interfaces';
 import { IGroupConfigResponse, IGroupResponse, IGetGroup, ICreateGroup, IUpdateGroup, IUpdateGroupRoles, IUpdateGroupUsers, IUpdateGroupConfig, IGroupUser } from '@frontegg/rest-api';
-import { ILoadUsers, ITeamUser } from '@frontegg/rest-api';
+import { ITeamUser } from '@frontegg/rest-api';
+import { IGetUsersV2Payload } from '../TeamState/interfaces';
 export declare enum GroupsStateKeys {
     CREATE_GROUP = "CREATE_GROUP",
     GET_GROUP = "GET_GROUP",
@@ -54,7 +55,7 @@ export interface IGroupsStateActionsPayloads {
     updateGroupConfiguration: IUpdateGroupConfig & {
         groupId: string;
     };
-    getTeamUsers: ILoadUsers;
+    getTeamUsers: IGetUsersV2Payload;
 }
 export interface IGroupsStateActions {
     loadGroups: () => void;

package/auth/GroupsState/saga.js

@@ -20,10 +20,11 @@ function* getTeamUsers({
   try {
     const {
       items: users
-    } = yield call(api.teams.loadUsers, {
-      filter: payload.filter,
-      pageOffset: payload.pageOffset,
-      pageSize: payload.pageSize
+    } = yield call(api.users.getUsersV2, {
+      _filter: payload.filter,
+      _offset: payload.pageOffset,
+      _limit: payload.pageSize,
+      _includeSubTenants: false
     });
     yield put(actions.setGroupsState({
       teamUsers: users

package/auth/LoginState/interfaces.d.ts

@@ -94,3 +94,4 @@ export declare type IVerifyMFAWebAuthnPayload = WithCallback<WithDeviceId<Omit<I
 export interface IRecoverMFATokenPayload extends WithCallback<IRecoverMFAToken> {
     recaptchaToken?: string;
 }
+export declare const ADMIN_PORTAL_ENTITLEMENTS_FF = "admin_portal_entitlements";

package/auth/LoginState/interfaces.js

@@ -29,4 +29,5 @@ export let QuickLoginStrategy;
   QuickLoginStrategy["Android"] = "android";
   QuickLoginStrategy["Sms"] = "sms";
 })(QuickLoginStrategy || (QuickLoginStrategy = {}));
-export { AuthStrategyEnum };
+export { AuthStrategyEnum };
+export const ADMIN_PORTAL_ENTITLEMENTS_FF = 'admin_portal_entitlements';

package/auth/LoginState/saga.d.ts

@@ -51,8 +51,8 @@ export declare function getMfaRequiredState(user: any): Generator<import("redux-
     isAllowedToRemember: any;
     mfaDeviceExpiration: any;
 }>;
-export declare function refreshToken(): Generator<import("redux-saga/effects").SelectEffect | Generator<import("redux-saga/effects").SelectEffect | CallEffect<boolean[]> | CallEffect<void>, void, AuthState & boolean[]> | CallEffect<any>, void, AuthState>;
-export declare function refreshTokenForSocialLogins(): Generator<import("redux-saga/effects").SelectEffect | Generator<import("redux-saga/effects").SelectEffect | CallEffect<boolean[]> | CallEffect<void>, void, AuthState & boolean[]> | CallEffect<any>, void, AuthState>;
+export declare function refreshToken(): Generator<import("redux-saga/effects").SelectEffect | Generator<import("redux-saga/effects").SelectEffect | CallEffect<boolean[]> | CallEffect<void>, void, (false & boolean[]) | (true & boolean[])> | CallEffect<any>, void, AuthState>;
+export declare function refreshTokenForSocialLogins(): Generator<import("redux-saga/effects").SelectEffect | Generator<import("redux-saga/effects").SelectEffect | CallEffect<boolean[]> | CallEffect<void>, void, (false & boolean[]) | (true & boolean[])> | CallEffect<any>, void, AuthState>;
 export declare function shouldShowPromptPasskeys(): Generator<import("redux-saga/effects").SelectEffect | CallEffect<boolean[]> | CallEffect<IWebAuthnDevices> | import("redux-saga/effects").PutEffect<{
     payload: Partial<import("../..").PasskeysState>;
     type: string;

package/auth/LoginState/saga.js

@@ -25,7 +25,7 @@ import { api, AuthStrategyEnum, ContextHolder, fetch, MFAStrategyEnum, WebAuthnD
 import { actions } from '../reducer';
 import { FRONTEGG_AFTER_AUTH_REDIRECT_URL, HOSTED_LOGIN_VERIFIER_KEY } from '../../constants';
 import { UserVeirifedOriginTypes } from '../interfaces';
-import { LoginFlow, LoginStep } from './interfaces';
+import { LoginFlow, LoginStep, ADMIN_PORTAL_ENTITLEMENTS_FF } from './interfaces';
 import { loadAllowSignUps } from '../SignUp/saga';
 import { MFAStep } from '../MfaState/interfaces';
 import { dummyIps, userDemo } from '../dummy';
@@ -46,7 +46,6 @@ const authStrategyLoginStepMap = {
   [AuthStrategyEnum.MagicLink]: LoginStep.magicLinkPreLoginSuccess,
   [AuthStrategyEnum.SmsCode]: LoginStep.loginWithSmsOtc
 };
-const ADMIN_PORTAL_ENTITLEMENTS_FF = 'admin_portal_entitlements';
 export function* afterAuthNavigation() {
   const onRedirectTo = ContextHolder.onRedirectTo;
   const {
@@ -232,10 +231,15 @@ function* shouldNevigateToRegisterQuickLogin(user) {
   return quickLoginToRegister && localStorage.getItem(`${user.id}-${quickLoginToRegister}`) !== 'true' && !window.location.pathname.endsWith(routes.logoutUrl);
 }
 function* handleLoadEntitlements() {
-  const {
-    user
-  } = yield select(state => state.auth);
-  if (!user) {
+  const isAuthenticated = yield select(state => {
+    var _state$auth;
+    return (_state$auth = state.auth) == null ? void 0 : _state$auth.isAuthenticated;
+  });
+  const isEntitlementsEnabledByUser = yield select(state => {
+    var _state$auth2, _state$auth2$entitlem, _state$auth2$entitlem2;
+    return (_state$auth2 = state.auth) == null ? void 0 : (_state$auth2$entitlem = _state$auth2.entitlementsState) == null ? void 0 : (_state$auth2$entitlem2 = _state$auth2$entitlem.options) == null ? void 0 : _state$auth2$entitlem2.enabled;
+  });
+  if (!isAuthenticated || !isEntitlementsEnabledByUser) {
     return;
   }
   const [isEntitlementsFFOn] = yield call(getFeatureFlags, [ADMIN_PORTAL_ENTITLEMENTS_FF]);

package/auth/MSP/AllAccountsState/index.js

@@ -36,8 +36,7 @@ export const allAccountsInitialState = {
     },
     usersPageOffset: 0,
     accountSettings: {}
-  },
-  teamUsers: []
+  }
 };
 const reducers = {
   setAllAccountsLoader: loadersReducerForKey('allAccountsState'),

package/auth/MSP/AllAccountsState/saga.js

@@ -12,37 +12,6 @@ import { getAccountsWithUsersCount } from './utils/getAccountsWithUsersCount';
 export const selectUserState = () => sagaSelect(_ => _[authStoreName].user);
 export const selectTenantsState = () => sagaSelect(_ => _[authStoreName].tenantsState);
 export const selectAllAccountsState = () => sagaSelect(_ => _[authStoreName].allAccountsState);
-function* getTeamUsers({
-  payload
-}) {
-  const key = AllAccountsStateKeys.GET_TEAM_USERS;
-  yield put(actions.setAllAccountsLoader({
-    key,
-    value: true
-  }));
-  try {
-    const {
-      items: users
-    } = yield call(api.teams.loadUsers, {
-      filter: payload.filter,
-      pageOffset: payload.pageOffset,
-      pageSize: payload.pageSize
-    });
-    yield put(actions.setAllAccountsState({
-      teamUsers: users
-    }));
-  } catch (e) {
-    yield put(actions.setAllAccountsError({
-      key,
-      value: errorHandler(e)
-    }));
-  } finally {
-    yield put(actions.setAllAccountsLoader({
-      key,
-      value: false
-    }));
-  }
-}
 function* loadAccounts({
   payload
 }) {
@@ -773,7 +742,6 @@ export function* allAccountsSagas() {
   yield takeLatest(actions.addUsersToAccount, addUsersToAccount);
   yield takeLatest(actions.deleteUsersFromAccount, deleteUserFromAccount);
   yield takeLatest(actions.setUserRolesForSubAccount, setUserRolesForSubAccount);
-  yield takeLatest(actions.getTeamUsers, getTeamUsers);
   yield takeLatest(actions.getAccountUsers, getAccountUsers);
   yield takeLatest(actions.setSelectedSubAccountData, setSelectedSubAccountData);
 }

package/auth/TeamState/index.d.ts

@@ -1,4 +1,4 @@
-import { IAddUser, IDeleteUser, IResendActivationLink, IResendInvitationLink, IResendInvitationEmail, ITeamUser, IUpdateUser, ICreateOrUpdateInviteUserLink, ILoadAllUsers, ISubTenantUser, AddUserToSubTenantsRequest, RemoveUserFromSubTenantsRequest, UpdateUserRolesForSubTenantsRequestDto } from '@frontegg/rest-api';
+import { IAddUser, IDeleteUser, IResendActivationLink, IResendInvitationLink, IResendInvitationEmail, ITeamUser, IUpdateUser, ICreateOrUpdateInviteUserLink, ILoadAllUsers, ISubTenantUser, AddUserToSubTenantsRequest, RemoveUserFromSubTenantsRequest, UpdateUserRolesForSubTenantsRequestDto, ILoadUsers } from '@frontegg/rest-api';
 import { ISetAddUserDialog, ISetDeleteUserDialog, TeamState, TeamStateIndicator, LoadRolesAndPermissionsPayload, IAddUsers, BulkInvintationData, IGetUsersV2Payload } from './interfaces';
 import { WithCallback, WithSilentLoad } from '../../interfaces';
 declare const teamState: TeamState;
@@ -121,7 +121,8 @@ declare const reducers: {
     };
 };
 declare const actions: {
-    loadUsers: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[WithCallback<WithSilentLoad<IGetUsersV2Payload>, ITeamUser[]>], WithCallback<WithSilentLoad<IGetUsersV2Payload>, ITeamUser[]>, string, never, never>;
+    loadUsersV2: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[WithCallback<WithSilentLoad<IGetUsersV2Payload>, ITeamUser[]>], WithCallback<WithSilentLoad<IGetUsersV2Payload>, ITeamUser[]>, string, never, never>;
+    loadUsers: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[WithCallback<WithSilentLoad<ILoadUsers>, ITeamUser[]>], WithCallback<WithSilentLoad<ILoadUsers>, ITeamUser[]>, string, never, never>;
     loadAllSubTenantsUsers: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[WithCallback<WithSilentLoad<Partial<ILoadAllUsers>>, ISubTenantUser[]>], WithCallback<WithSilentLoad<Partial<ILoadAllUsers>>, ISubTenantUser[]>, string, never, never>;
     loadRoles: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[({
         callback?: import("../../interfaces").CallbackMethod<{
@@ -174,7 +175,11 @@ declare type DispatchedActions = {
     setTeamError: (payload: TeamStateIndicator) => void;
     setTeamState: (payload: Partial<TeamState>) => void;
     resetTeamState: () => void;
-    loadUsers: (payload: WithCallback<WithSilentLoad<IGetUsersV2Payload>, ITeamUser[]>) => void;
+    loadUsersV2: (payload: WithCallback<WithSilentLoad<IGetUsersV2Payload>, ITeamUser[]>) => void;
+    /**
+     * @deprecated loadUsers is deprecated, use loadUsersV2 instead
+     */
+    loadUsers: (payload: WithCallback<WithSilentLoad<ILoadUsers>, ITeamUser[]>) => void;
     loadAllSubTenantsUsers: (payload: WithCallback<WithSilentLoad<Partial<ILoadAllUsers>>, ISubTenantUser[]>) => void;
     loadRoles: (payload?: LoadRolesAndPermissionsPayload) => void;
     addUsersBulk: (payload: WithCallback<IAddUsers, BulkInvintationData>) => void;

package/auth/TeamState/index.js

@@ -41,6 +41,9 @@ const reducers = {
   })
 };
 const actions = {
+  loadUsersV2: createAction(`${authStoreName}/loadUsersV2`, payload => ({
+    payload
+  })),
   loadUsers: createAction(`${authStoreName}/loadUsers`, payload => ({
     payload
   })),

package/auth/TeamState/interfaces.d.ts

@@ -1,4 +1,4 @@
-import { ITeamUserRole, ITeamUser, ITeamUserPermission, ISubTenantUser, SortByEnum, ISearchUserQueryParamsV2 } from '@frontegg/rest-api';
+import { ITeamUserRole, ITeamUser, ITeamUserPermission, ISubTenantUser, SortByEnum, ISearchUserQueryParamsV2, QueryFilter, QuerySort } from '@frontegg/rest-api';
 import { GroupsState } from '../GroupsState/interfaces';
 import { LoaderIndicatorState, WithCallback } from '../../interfaces';
 export declare enum TeamStateKeys {
@@ -59,8 +59,10 @@ export interface TeamState {
     totalPages: number;
     roles: ITeamUserRole[];
     permissions: ITeamUserPermission[];
-    filter?: string;
-    sort?: SortByEnum;
+    filter?: QueryFilter[];
+    sort?: QuerySort[];
+    filterV2?: string;
+    sortV2?: SortByEnum;
     totalItems?: number;
     addedThisWeek?: number;
     shouldShowSubTenantUsersIfReseller?: boolean;

package/auth/TeamState/saga.js

@@ -45,7 +45,7 @@ function* getGroupsForUsers() {
 }
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-function* loadUsers({
+function* loadUsersV2({
   payload
 }) {
   var _payload$pageSize, _payload$pageOffset, _payload$filter, _payload$sort, _payload$shouldShowSu;
@@ -56,8 +56,8 @@ function* loadUsers({
   const teamState = yield selectTeamState();
   const pageSize = (_payload$pageSize = payload.pageSize) != null ? _payload$pageSize : teamState.pageSize;
   const pageOffset = (_payload$pageOffset = payload.pageOffset) != null ? _payload$pageOffset : teamState.pageOffset;
-  const filter = (_payload$filter = payload.filter) != null ? _payload$filter : teamState.filter;
-  const sort = (_payload$sort = payload.sort) != null ? _payload$sort : teamState.sort;
+  const filter = (_payload$filter = payload.filter) != null ? _payload$filter : teamState.filterV2;
+  const sort = (_payload$sort = payload.sort) != null ? _payload$sort : teamState.sortV2;
   const shouldIncludeSubTenants = (_payload$shouldShowSu = payload == null ? void 0 : payload.shouldShowSubTenantUsersIfReseller) != null ? _payload$shouldShowSu : teamState == null ? void 0 : teamState.shouldShowSubTenantUsersIfReseller;
   yield put(actions.setTeamLoader({
     key: TeamStateKeys.USERS,
@@ -66,8 +66,8 @@ function* loadUsers({
   yield put(actions.setTeamState({
     pageSize,
     pageOffset,
-    filter,
-    sort
+    filterV2: filter,
+    sortV2: sort
   }));
   try {
     const [{
@@ -127,6 +127,70 @@ function* loadUsers({
   }));
 }
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function* loadUsers({
+  payload
+}) {
+  var _payload$pageSize2, _payload$pageOffset2, _payload$filter2, _payload$sort2;
+  const {
+    silentLoading,
+    callback
+  } = payload;
+  const teamState = yield selectTeamState();
+  const pageSize = (_payload$pageSize2 = payload.pageSize) != null ? _payload$pageSize2 : teamState.pageSize;
+  const pageOffset = (_payload$pageOffset2 = payload.pageOffset) != null ? _payload$pageOffset2 : teamState.pageOffset;
+  const filter = (_payload$filter2 = payload.filter) != null ? _payload$filter2 : teamState.filter;
+  const sort = (_payload$sort2 = payload.sort) != null ? _payload$sort2 : teamState.sort;
+  yield put(actions.setTeamLoader({
+    key: TeamStateKeys.USERS,
+    value: !silentLoading
+  }));
+  yield put(actions.setTeamState({
+    pageSize,
+    pageOffset,
+    filter: filter,
+    sort: sort
+  }));
+  try {
+    const [{
+      items: users,
+      totalPages,
+      totalItems
+    }, {
+      items: roles
+    }, {
+      items: permissions
+    }] = yield all([call(api.teams.loadUsers, {
+      pageSize,
+      pageOffset,
+      filter,
+      sort
+    }), call(api.teams.loadAvailableRoles), call(api.teams.loadAvailablePermissions)]);
+    yield put(actions.setTeamState({
+      users,
+      totalPages,
+      totalItems,
+      roles,
+      permissions
+    }));
+    callback == null ? void 0 : callback(users);
+  } catch (e) {
+    yield put(actions.setTeamError({
+      key: TeamStateKeys.USERS,
+      value: e.message
+    }));
+    yield put(actions.setTeamState({
+      totalPages: 0,
+      users: []
+    }));
+    callback == null ? void 0 : callback(null, e);
+  }
+  yield put(actions.setTeamLoader({
+    key: TeamStateKeys.USERS,
+    value: false
+  }));
+}
+
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function* loadAllSubTenantsUsers({
   payload
@@ -308,7 +372,7 @@ function* addUsersBulk({
     filter: '',
     silentLoading: payload.emails.length > 0
   };
-  yield put(actions.loadUsers(queryObject));
+  yield put(actions.loadUsersV2(queryObject));
   yield put(actions.setTeamState({
     addUserDialogState: {
       loading: false
@@ -839,6 +903,7 @@ function* closeDeleteUserDialog({
 }
 export function* teamSagas() {
   yield takeLatest(actions.loadUsers, loadUsers);
+  yield takeLatest(actions.loadUsersV2, loadUsersV2);
   yield takeLatest(actions.loadAllSubTenantsUsers, loadAllSubTenantsUsers);
   yield takeLatest(actions.loadRoles, loadRoles);
   yield takeEvery(actions.addUser, addUser);
@@ -869,16 +934,16 @@ export function* teamSagas() {
 function* loadUsersMock({
   payload
 }) {
-  var _payload$pageSize2, _payload$pageOffset2, _payload$filter2, _payload$sort2;
+  var _payload$pageSize3, _payload$pageOffset3, _payload$filter3, _payload$sort3;
   const {
     silentLoading,
     callback
   } = payload;
   const teamState = yield selectTeamState();
-  const pageSize = (_payload$pageSize2 = payload.pageSize) != null ? _payload$pageSize2 : teamState.pageSize;
-  const pageOffset = (_payload$pageOffset2 = payload.pageOffset) != null ? _payload$pageOffset2 : teamState.pageOffset;
-  const filter = (_payload$filter2 = payload.filter) != null ? _payload$filter2 : teamState.filter;
-  const sort = (_payload$sort2 = payload.sort) != null ? _payload$sort2 : teamState.sort;
+  const pageSize = (_payload$pageSize3 = payload.pageSize) != null ? _payload$pageSize3 : teamState.pageSize;
+  const pageOffset = (_payload$pageOffset3 = payload.pageOffset) != null ? _payload$pageOffset3 : teamState.pageOffset;
+  const filter = (_payload$filter3 = payload.filter) != null ? _payload$filter3 : teamState.filterV2;
+  const sort = (_payload$sort3 = payload.sort) != null ? _payload$sort3 : teamState.sortV2;
   yield put(actions.setTeamLoader({
     key: TeamStateKeys.USERS,
     value: !silentLoading
@@ -886,8 +951,8 @@ function* loadUsersMock({
   yield put(actions.setTeamState({
     pageSize,
     pageOffset,
-    filter,
-    sort
+    filterV2: filter,
+    sortV2: sort
   }));
   const totalPages = 2;
   const totalItems = 10;
@@ -1194,7 +1259,7 @@ function* resendInvitationLinkToAllSubTenantsMock({
   }));
 }
 export function* teamSagasMock() {
-  yield takeLatest(actions.loadUsers, loadUsersMock);
+  yield takeLatest(actions.loadUsersV2, loadUsersMock);
   yield takeLatest(actions.loadAllSubTenantsUsers, loadAllSubTenantsUsersMock);
   yield takeLatest(actions.loadRoles, loadRolesMock);
   yield takeEvery(actions.addUser, addUserMock);

package/auth/index.d.ts

@@ -250,8 +250,9 @@ declare const _default: {
         }], import("@frontegg/rest-api").IUpdateGroupConfig & {
             groupId: string;
         }, string, never, never>;
-        getTeamUsers: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[import("@frontegg/rest-api").ILoadUsers], import("@frontegg/rest-api").ILoadUsers, string, never, never>;
-        loadUsers: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[import("..").WithCallback<import("..").WithSilentLoad<import("./TeamState/interfaces").IGetUsersV2Payload>, import("@frontegg/rest-api").ITeamUser[]>], import("..").WithCallback<import("..").WithSilentLoad<import("./TeamState/interfaces").IGetUsersV2Payload>, import("@frontegg/rest-api").ITeamUser[]>, string, never, never>;
+        getTeamUsers: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[import("./TeamState/interfaces").IGetUsersV2Payload], import("./TeamState/interfaces").IGetUsersV2Payload, string, never, never>;
+        loadUsersV2: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[import("..").WithCallback<import("..").WithSilentLoad<import("./TeamState/interfaces").IGetUsersV2Payload>, import("@frontegg/rest-api").ITeamUser[]>], import("..").WithCallback<import("..").WithSilentLoad<import("./TeamState/interfaces").IGetUsersV2Payload>, import("@frontegg/rest-api").ITeamUser[]>, string, never, never>;
+        loadUsers: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[import("..").WithCallback<import("..").WithSilentLoad<import("@frontegg/rest-api").ILoadUsers>, import("@frontegg/rest-api").ITeamUser[]>], import("..").WithCallback<import("..").WithSilentLoad<import("@frontegg/rest-api").ILoadUsers>, import("@frontegg/rest-api").ITeamUser[]>, string, never, never>;
         loadAllSubTenantsUsers: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[import("..").WithCallback<import("..").WithSilentLoad<Partial<import("@frontegg/rest-api").ILoadAllUsers>>, import("@frontegg/rest-api").ISubTenantUser[]>], import("..").WithCallback<import("..").WithSilentLoad<Partial<import("@frontegg/rest-api").ILoadAllUsers>>, import("@frontegg/rest-api").ISubTenantUser[]>, string, never, never>;
         loadRoles: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[({
             callback?: import("..").CallbackMethod<{

package/auth/reducer.d.ts

@@ -211,8 +211,9 @@ declare const actions: {
     }], import("@frontegg/rest-api").IUpdateGroupConfig & {
         groupId: string;
     }, string, never, never>;
-    getTeamUsers: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[import("@frontegg/rest-api").ILoadUsers], import("@frontegg/rest-api").ILoadUsers, string, never, never>;
-    loadUsers: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[import("..").WithCallback<import("..").WithSilentLoad<import(".").IGetUsersV2Payload>, import("@frontegg/rest-api").ITeamUser[]>], import("..").WithCallback<import("..").WithSilentLoad<import(".").IGetUsersV2Payload>, import("@frontegg/rest-api").ITeamUser[]>, string, never, never>;
+    getTeamUsers: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[import(".").IGetUsersV2Payload], import(".").IGetUsersV2Payload, string, never, never>;
+    loadUsersV2: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[import("..").WithCallback<import("..").WithSilentLoad<import(".").IGetUsersV2Payload>, import("@frontegg/rest-api").ITeamUser[]>], import("..").WithCallback<import("..").WithSilentLoad<import(".").IGetUsersV2Payload>, import("@frontegg/rest-api").ITeamUser[]>, string, never, never>;
+    loadUsers: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[import("..").WithCallback<import("..").WithSilentLoad<import("@frontegg/rest-api").ILoadUsers>, import("@frontegg/rest-api").ITeamUser[]>], import("..").WithCallback<import("..").WithSilentLoad<import("@frontegg/rest-api").ILoadUsers>, import("@frontegg/rest-api").ITeamUser[]>, string, never, never>;
     loadAllSubTenantsUsers: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[import("..").WithCallback<import("..").WithSilentLoad<Partial<import("@frontegg/rest-api").ILoadAllUsers>>, import("@frontegg/rest-api").ISubTenantUser[]>], import("..").WithCallback<import("..").WithSilentLoad<Partial<import("@frontegg/rest-api").ILoadAllUsers>>, import("@frontegg/rest-api").ISubTenantUser[]>, string, never, never>;
     loadRoles: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[({
         callback?: import("..").CallbackMethod<{

package/index.d.ts

@@ -20,6 +20,7 @@ export * from './toolkit';
 export * from './helpers';
 export * from './utils';
 export type { WithCallback, WithSilentLoad, CallbackMethod } from './interfaces';
+export type { NotEntitledReason } from '@frontegg/rest-api';
 export declare type FronteggState = {
     root: RootState;
     auth: AuthState;

package/index.js

@@ -1,4 +1,4 @@
-/** @license Frontegg v6.117.0-alpha.1
+/** @license Frontegg v6.118.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/EntitlementsState/index.js

@@ -27,7 +27,8 @@ Object.keys(_utils2).forEach(function (key) {
 const entitlementsState = {
   entitlements: undefined,
   loading: false,
-  error: undefined
+  error: undefined,
+  options: undefined
 };
 exports.entitlementsState = entitlementsState;
 const reducers = {

package/node/auth/EntitlementsState/saga.js

@@ -1,15 +1,18 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.entitlementsSagas = entitlementsSagas;
 exports.loadEntitlements = loadEntitlements;
+var _fastDeepEqual = _interopRequireDefault(require("fast-deep-equal"));
 var _effects = require("redux-saga/effects");
 var _restApi = require("@frontegg/rest-api");
 var _reducer = require("../reducer");
 /**
   Load entitlements list
+  Don't update entitlements data in the store when data is equal (deep check)
  */
 function* loadEntitlements() {
   yield (0, _effects.put)(_reducer.actions.setEntitlementsState({
@@ -17,9 +20,19 @@ function* loadEntitlements() {
     error: null
   }));
   try {
-    const entitlements = yield (0, _effects.call)(_restApi.api.entitlements.loadEntitlements);
+    const newEntitlements = yield (0, _effects.call)(_restApi.api.entitlements.loadEntitlements);
+    const oldEntitlements = yield (0, _effects.select)(state => {
+      var _state$auth$entitleme;
+      return (_state$auth$entitleme = state.auth.entitlementsState) == null ? void 0 : _state$auth$entitleme.entitlements;
+    });
+    if ((0, _fastDeepEqual.default)(oldEntitlements, newEntitlements)) {
+      yield (0, _effects.put)(_reducer.actions.setEntitlementsState({
+        loading: false
+      }));
+      return;
+    }
     yield (0, _effects.put)(_reducer.actions.setEntitlementsState({
-      entitlements,
+      entitlements: newEntitlements,
       loading: false
     }));
   } catch (e) {

package/node/auth/EntitlementsState/utils.js

@@ -3,13 +3,82 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getEntitlements = void 0;
+exports.getPermissionEntitlements = exports.getFeatureEntitlements = exports.getEntitlements = void 0;
+var _restApi = require("@frontegg/rest-api");
+const ENTITLEMENTS_NOT_ENABLED_EXCEPTION_TEXT = 'You must first enable entitlements via Frontegg options to use this function';
+
+/**
+ * Guard entitlements feature by checking if it is enabled by the vendor
+ * @throws when entitlement is not enabled via frontegg options
+ */
+const guardEntitlementsUsage = entitlementsOptions => {
+  if (entitlementsOptions != null && entitlementsOptions.enabled) return;
+  throw new Error(ENTITLEMENTS_NOT_ENABLED_EXCEPTION_TEXT);
+};
+
+/**
+  @param keyEntitlements permission or feature data object
+  @param entitlementsVendorConfig entitlements frontegg provider configuration
+  @param missingKeyEnum missing key for scenario that the key does not exist in entitlementsValuePerKeys
+  @returns if the user is entitled to the given key. Attaching the justification if not
+  @throws when entitlement is not enabled via frontegg options
+ */
+const getEntitlementsHelper = (keyEntitlements, entitlementsVendorConfig, missingKeyEnum) => {
+  guardEntitlementsUsage(entitlementsVendorConfig);
+  if (!keyEntitlements) {
+    return {
+      isEntitled: false,
+      justification: missingKeyEnum
+    };
+  }
+  if (keyEntitlements.isEntitled) {
+    return {
+      isEntitled: true
+    };
+  }
+  return {
+    isEntitled: false,
+    justification: keyEntitlements.notEntitledReason
+  };
+};
+
+/**
+  @param entitlements
+  @param key
+  @param entitlementsVendorConfig entitlements frontegg provider configuration
+  @returns if the user is entitled to the given permission. Attaching the justification if not
+  @throws when entitlement is not enabled via frontegg options
+ */
+const getPermissionEntitlements = (entitlements, key, entitlementsVendorConfig) => {
+  var _entitlements$permiss;
+  return getEntitlementsHelper(entitlements == null ? void 0 : (_entitlements$permiss = entitlements.permissions) == null ? void 0 : _entitlements$permiss[key], entitlementsVendorConfig, _restApi.NotEntitledReason.MISSING_PERMISSION);
+};
+
+/**
+  @param entitlements
+  @param key
+  @param entitlementsVendorConfig entitlements frontegg provider configuration
+  @returns if the user is entitled to the given feature. Attaching the justification if not
+  @throws when entitlement is not enabled via frontegg options
+ */
+exports.getPermissionEntitlements = getPermissionEntitlements;
+const getFeatureEntitlements = (entitlements, key, entitlementsVendorConfig) => {
+  var _entitlements$feature;
+  return getEntitlementsHelper(entitlements == null ? void 0 : (_entitlements$feature = entitlements.features) == null ? void 0 : _entitlements$feature[key], entitlementsVendorConfig, _restApi.NotEntitledReason.MISSING_FEATURE);
+};
+
 /**
-  @param entitlementsByKey
-  @param keys The requested entitlement keys
-  @returns Entitlements contain true/false for every key (state of is key entitled)
+  @param entitlements
+  @param entitledToOptions including permission or feature
+  @param entitlementsVendorConfig entitlements frontegg provider configuration
+  @returns if the user is entitled to the given feature or permission (check only one). Attaching the justification if not
+  @throws when entitlement is not enabled via frontegg options
  */
-const getEntitlements = (entitlementsByKey = {}, keys) => keys.reduce((result, key) => [...result, {
-  isEntitled: entitlementsByKey[key] || false
-}], []);
+exports.getFeatureEntitlements = getFeatureEntitlements;
+const getEntitlements = (entitlements, options, entitlementsVendorConfig) => {
+  if ('permissionKey' in options) {
+    return getPermissionEntitlements(entitlements, options.permissionKey, entitlementsVendorConfig);
+  }
+  return getFeatureEntitlements(entitlements, options.featureKey, entitlementsVendorConfig);
+};
 exports.getEntitlements = getEntitlements;

package/node/auth/GroupsState/saga.js

@@ -28,10 +28,11 @@ function* getTeamUsers({
   try {
     const {
       items: users
-    } = yield (0, _effects.call)(_restApi.api.teams.loadUsers, {
-      filter: payload.filter,
-      pageOffset: payload.pageOffset,
-      pageSize: payload.pageSize
+    } = yield (0, _effects.call)(_restApi.api.users.getUsersV2, {
+      _filter: payload.filter,
+      _offset: payload.pageOffset,
+      _limit: payload.pageSize,
+      _includeSubTenants: false
     });
     yield (0, _effects.put)(_reducer.actions.setGroupsState({
       teamUsers: users

package/node/auth/LoginState/interfaces.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.ADMIN_PORTAL_ENTITLEMENTS_FF = void 0;
 Object.defineProperty(exports, "AuthStrategyEnum", {
   enumerable: true,
   get: function () {
@@ -43,4 +44,6 @@ exports.QuickLoginStrategy = QuickLoginStrategy;
   QuickLoginStrategy["UsbKey"] = "usb-key";
   QuickLoginStrategy["Android"] = "android";
   QuickLoginStrategy["Sms"] = "sms";
-})(QuickLoginStrategy || (exports.QuickLoginStrategy = QuickLoginStrategy = {}));
+})(QuickLoginStrategy || (exports.QuickLoginStrategy = QuickLoginStrategy = {}));
+const ADMIN_PORTAL_ENTITLEMENTS_FF = 'admin_portal_entitlements';
+exports.ADMIN_PORTAL_ENTITLEMENTS_FF = ADMIN_PORTAL_ENTITLEMENTS_FF;

package/node/auth/LoginState/saga.js

@@ -62,7 +62,6 @@ const authStrategyLoginStepMap = {
   [_restApi.AuthStrategyEnum.MagicLink]: _interfaces2.LoginStep.magicLinkPreLoginSuccess,
   [_restApi.AuthStrategyEnum.SmsCode]: _interfaces2.LoginStep.loginWithSmsOtc
 };
-const ADMIN_PORTAL_ENTITLEMENTS_FF = 'admin_portal_entitlements';
 function* afterAuthNavigation() {
   const onRedirectTo = _restApi.ContextHolder.onRedirectTo;
   const {
@@ -249,13 +248,18 @@ function* shouldNevigateToRegisterQuickLogin(user) {
   return quickLoginToRegister && localStorage.getItem(`${user.id}-${quickLoginToRegister}`) !== 'true' && !window.location.pathname.endsWith(routes.logoutUrl);
 }
 function* handleLoadEntitlements() {
-  const {
-    user
-  } = yield (0, _effects.select)(state => state.auth);
-  if (!user) {
+  const isAuthenticated = yield (0, _effects.select)(state => {
+    var _state$auth;
+    return (_state$auth = state.auth) == null ? void 0 : _state$auth.isAuthenticated;
+  });
+  const isEntitlementsEnabledByUser = yield (0, _effects.select)(state => {
+    var _state$auth2, _state$auth2$entitlem, _state$auth2$entitlem2;
+    return (_state$auth2 = state.auth) == null ? void 0 : (_state$auth2$entitlem = _state$auth2.entitlementsState) == null ? void 0 : (_state$auth2$entitlem2 = _state$auth2$entitlem.options) == null ? void 0 : _state$auth2$entitlem2.enabled;
+  });
+  if (!isAuthenticated || !isEntitlementsEnabledByUser) {
     return;
   }
-  const [isEntitlementsFFOn] = yield (0, _effects.call)(_helpers.getFeatureFlags, [ADMIN_PORTAL_ENTITLEMENTS_FF]);
+  const [isEntitlementsFFOn] = yield (0, _effects.call)(_helpers.getFeatureFlags, [_interfaces2.ADMIN_PORTAL_ENTITLEMENTS_FF]);
   if (isEntitlementsFFOn) {
     yield (0, _effects.call)(_saga4.loadEntitlements);
   }

package/node/auth/MSP/AllAccountsState/index.js

@@ -59,8 +59,7 @@ const allAccountsInitialState = {
     },
     usersPageOffset: 0,
     accountSettings: {}
-  },
-  teamUsers: []
+  }
 };
 exports.allAccountsState = exports.allAccountsInitialState = allAccountsInitialState;
 const reducers = {

package/node/auth/MSP/AllAccountsState/saga.js

@@ -23,37 +23,6 @@ const selectTenantsState = () => (0, _effects.select)(_ => _[_constants.authStor
 exports.selectTenantsState = selectTenantsState;
 const selectAllAccountsState = () => (0, _effects.select)(_ => _[_constants.authStoreName].allAccountsState);
 exports.selectAllAccountsState = selectAllAccountsState;
-function* getTeamUsers({
-  payload
-}) {
-  const key = _stateTypes.AllAccountsStateKeys.GET_TEAM_USERS;
-  yield (0, _effects.put)(_reducer.actions.setAllAccountsLoader({
-    key,
-    value: true
-  }));
-  try {
-    const {
-      items: users
-    } = yield (0, _effects.call)(_restApi.api.teams.loadUsers, {
-      filter: payload.filter,
-      pageOffset: payload.pageOffset,
-      pageSize: payload.pageSize
-    });
-    yield (0, _effects.put)(_reducer.actions.setAllAccountsState({
-      teamUsers: users
-    }));
-  } catch (e) {
-    yield (0, _effects.put)(_reducer.actions.setAllAccountsError({
-      key,
-      value: (0, _utils.errorHandler)(e)
-    }));
-  } finally {
-    yield (0, _effects.put)(_reducer.actions.setAllAccountsLoader({
-      key,
-      value: false
-    }));
-  }
-}
 function* loadAccounts({
   payload
 }) {
@@ -784,7 +753,6 @@ function* allAccountsSagas() {
   yield (0, _effects.takeLatest)(_reducer.actions.addUsersToAccount, addUsersToAccount);
   yield (0, _effects.takeLatest)(_reducer.actions.deleteUsersFromAccount, deleteUserFromAccount);
   yield (0, _effects.takeLatest)(_reducer.actions.setUserRolesForSubAccount, setUserRolesForSubAccount);
-  yield (0, _effects.takeLatest)(_reducer.actions.getTeamUsers, getTeamUsers);
   yield (0, _effects.takeLatest)(_reducer.actions.getAccountUsers, getAccountUsers);
   yield (0, _effects.takeLatest)(_reducer.actions.setSelectedSubAccountData, setSelectedSubAccountData);
 }

package/node/auth/TeamState/index.js

@@ -49,6 +49,9 @@ const reducers = {
 };
 exports.teamReducers = reducers;
 const actions = {
+  loadUsersV2: (0, _toolkit.createAction)(`${_constants.authStoreName}/loadUsersV2`, payload => ({
+    payload
+  })),
   loadUsers: (0, _toolkit.createAction)(`${_constants.authStoreName}/loadUsers`, payload => ({
     payload
   })),

package/node/auth/TeamState/saga.js

@@ -53,7 +53,7 @@ function* getGroupsForUsers() {
 }
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-function* loadUsers({
+function* loadUsersV2({
   payload
 }) {
   var _payload$pageSize, _payload$pageOffset, _payload$filter, _payload$sort, _payload$shouldShowSu;
@@ -64,8 +64,8 @@ function* loadUsers({
   const teamState = yield selectTeamState();
   const pageSize = (_payload$pageSize = payload.pageSize) != null ? _payload$pageSize : teamState.pageSize;
   const pageOffset = (_payload$pageOffset = payload.pageOffset) != null ? _payload$pageOffset : teamState.pageOffset;
-  const filter = (_payload$filter = payload.filter) != null ? _payload$filter : teamState.filter;
-  const sort = (_payload$sort = payload.sort) != null ? _payload$sort : teamState.sort;
+  const filter = (_payload$filter = payload.filter) != null ? _payload$filter : teamState.filterV2;
+  const sort = (_payload$sort = payload.sort) != null ? _payload$sort : teamState.sortV2;
   const shouldIncludeSubTenants = (_payload$shouldShowSu = payload == null ? void 0 : payload.shouldShowSubTenantUsersIfReseller) != null ? _payload$shouldShowSu : teamState == null ? void 0 : teamState.shouldShowSubTenantUsersIfReseller;
   yield (0, _effects.put)(_reducer.actions.setTeamLoader({
     key: _interfaces.TeamStateKeys.USERS,
@@ -74,8 +74,8 @@ function* loadUsers({
   yield (0, _effects.put)(_reducer.actions.setTeamState({
     pageSize,
     pageOffset,
-    filter,
-    sort
+    filterV2: filter,
+    sortV2: sort
   }));
   try {
     const [{
@@ -135,6 +135,70 @@ function* loadUsers({
   }));
 }
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function* loadUsers({
+  payload
+}) {
+  var _payload$pageSize2, _payload$pageOffset2, _payload$filter2, _payload$sort2;
+  const {
+    silentLoading,
+    callback
+  } = payload;
+  const teamState = yield selectTeamState();
+  const pageSize = (_payload$pageSize2 = payload.pageSize) != null ? _payload$pageSize2 : teamState.pageSize;
+  const pageOffset = (_payload$pageOffset2 = payload.pageOffset) != null ? _payload$pageOffset2 : teamState.pageOffset;
+  const filter = (_payload$filter2 = payload.filter) != null ? _payload$filter2 : teamState.filter;
+  const sort = (_payload$sort2 = payload.sort) != null ? _payload$sort2 : teamState.sort;
+  yield (0, _effects.put)(_reducer.actions.setTeamLoader({
+    key: _interfaces.TeamStateKeys.USERS,
+    value: !silentLoading
+  }));
+  yield (0, _effects.put)(_reducer.actions.setTeamState({
+    pageSize,
+    pageOffset,
+    filter: filter,
+    sort: sort
+  }));
+  try {
+    const [{
+      items: users,
+      totalPages,
+      totalItems
+    }, {
+      items: roles
+    }, {
+      items: permissions
+    }] = yield (0, _effects.all)([(0, _effects.call)(_restApi.api.teams.loadUsers, {
+      pageSize,
+      pageOffset,
+      filter,
+      sort
+    }), (0, _effects.call)(_restApi.api.teams.loadAvailableRoles), (0, _effects.call)(_restApi.api.teams.loadAvailablePermissions)]);
+    yield (0, _effects.put)(_reducer.actions.setTeamState({
+      users,
+      totalPages,
+      totalItems,
+      roles,
+      permissions
+    }));
+    callback == null ? void 0 : callback(users);
+  } catch (e) {
+    yield (0, _effects.put)(_reducer.actions.setTeamError({
+      key: _interfaces.TeamStateKeys.USERS,
+      value: e.message
+    }));
+    yield (0, _effects.put)(_reducer.actions.setTeamState({
+      totalPages: 0,
+      users: []
+    }));
+    callback == null ? void 0 : callback(null, e);
+  }
+  yield (0, _effects.put)(_reducer.actions.setTeamLoader({
+    key: _interfaces.TeamStateKeys.USERS,
+    value: false
+  }));
+}
+
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function* loadAllSubTenantsUsers({
   payload
@@ -316,7 +380,7 @@ function* addUsersBulk({
     filter: '',
     silentLoading: payload.emails.length > 0
   };
-  yield (0, _effects.put)(_reducer.actions.loadUsers(queryObject));
+  yield (0, _effects.put)(_reducer.actions.loadUsersV2(queryObject));
   yield (0, _effects.put)(_reducer.actions.setTeamState({
     addUserDialogState: {
       loading: false
@@ -847,6 +911,7 @@ function* closeDeleteUserDialog({
 }
 function* teamSagas() {
   yield (0, _effects.takeLatest)(_reducer.actions.loadUsers, loadUsers);
+  yield (0, _effects.takeLatest)(_reducer.actions.loadUsersV2, loadUsersV2);
   yield (0, _effects.takeLatest)(_reducer.actions.loadAllSubTenantsUsers, loadAllSubTenantsUsers);
   yield (0, _effects.takeLatest)(_reducer.actions.loadRoles, loadRoles);
   yield (0, _effects.takeEvery)(_reducer.actions.addUser, addUser);
@@ -877,16 +942,16 @@ function* teamSagas() {
 function* loadUsersMock({
   payload
 }) {
-  var _payload$pageSize2, _payload$pageOffset2, _payload$filter2, _payload$sort2;
+  var _payload$pageSize3, _payload$pageOffset3, _payload$filter3, _payload$sort3;
   const {
     silentLoading,
     callback
   } = payload;
   const teamState = yield selectTeamState();
-  const pageSize = (_payload$pageSize2 = payload.pageSize) != null ? _payload$pageSize2 : teamState.pageSize;
-  const pageOffset = (_payload$pageOffset2 = payload.pageOffset) != null ? _payload$pageOffset2 : teamState.pageOffset;
-  const filter = (_payload$filter2 = payload.filter) != null ? _payload$filter2 : teamState.filter;
-  const sort = (_payload$sort2 = payload.sort) != null ? _payload$sort2 : teamState.sort;
+  const pageSize = (_payload$pageSize3 = payload.pageSize) != null ? _payload$pageSize3 : teamState.pageSize;
+  const pageOffset = (_payload$pageOffset3 = payload.pageOffset) != null ? _payload$pageOffset3 : teamState.pageOffset;
+  const filter = (_payload$filter3 = payload.filter) != null ? _payload$filter3 : teamState.filterV2;
+  const sort = (_payload$sort3 = payload.sort) != null ? _payload$sort3 : teamState.sortV2;
   yield (0, _effects.put)(_reducer.actions.setTeamLoader({
     key: _interfaces.TeamStateKeys.USERS,
     value: !silentLoading
@@ -894,8 +959,8 @@ function* loadUsersMock({
   yield (0, _effects.put)(_reducer.actions.setTeamState({
     pageSize,
     pageOffset,
-    filter,
-    sort
+    filterV2: filter,
+    sortV2: sort
   }));
   const totalPages = 2;
   const totalItems = 10;
@@ -1202,7 +1267,7 @@ function* resendInvitationLinkToAllSubTenantsMock({
   }));
 }
 function* teamSagasMock() {
-  yield (0, _effects.takeLatest)(_reducer.actions.loadUsers, loadUsersMock);
+  yield (0, _effects.takeLatest)(_reducer.actions.loadUsersV2, loadUsersMock);
   yield (0, _effects.takeLatest)(_reducer.actions.loadAllSubTenantsUsers, loadAllSubTenantsUsersMock);
   yield (0, _effects.takeLatest)(_reducer.actions.loadRoles, loadRolesMock);
   yield (0, _effects.takeEvery)(_reducer.actions.addUser, addUserMock);

package/node/index.js

@@ -1,4 +1,4 @@
-/** @license Frontegg v6.117.0-alpha.1
+/** @license Frontegg v6.118.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/toolkit/index.js

@@ -89,7 +89,7 @@ const createFronteggStore = (rootInitialState, storeHolder, previewMode = false,
     holder = window;
   }
   if (!holder.store) {
-    var _overrideInitialState, _authInitialState$rou, _overrideInitialState2, _overrideInitialState3, _overrideInitialState4, _overrideInitialState5, _overrideInitialState6, _overrideInitialState7, _overrideInitialState8, _overrideInitialState9;
+    var _overrideInitialState, _authInitialState$rou, _overrideInitialState2, _overrideInitialState3, _authStore$initialSta, _overrideInitialState4, _overrideInitialState5, _overrideInitialState6, _overrideInitialState7, _overrideInitialState8, _overrideInitialState9;
     if (!previewMode && !builderMode) {
       _restApi.ContextHolder.setContext(rootInitialState.context);
     }
@@ -108,7 +108,10 @@ const createFronteggStore = (rootInitialState, storeHolder, previewMode = false,
           urlStrategy: urlStrategy
         }),
         [_auth.default.storeName]: (0, _extends2.default)({}, _auth.default.initialState, authInitialState, (_overrideInitialState = overrideInitialState == null ? void 0 : overrideInitialState.auth) != null ? _overrideInitialState : {}, {
-          routes: (0, _extends2.default)({}, _auth.default.initialState.routes, (_authInitialState$rou = authInitialState == null ? void 0 : authInitialState.routes) != null ? _authInitialState$rou : {}, (_overrideInitialState2 = overrideInitialState == null ? void 0 : (_overrideInitialState3 = overrideInitialState.auth) == null ? void 0 : _overrideInitialState3.routes) != null ? _overrideInitialState2 : {})
+          routes: (0, _extends2.default)({}, _auth.default.initialState.routes, (_authInitialState$rou = authInitialState == null ? void 0 : authInitialState.routes) != null ? _authInitialState$rou : {}, (_overrideInitialState2 = overrideInitialState == null ? void 0 : (_overrideInitialState3 = overrideInitialState.auth) == null ? void 0 : _overrideInitialState3.routes) != null ? _overrideInitialState2 : {}),
+          entitlementsState: (0, _extends2.default)({}, _auth.default.initialState.entitlementsState, {
+            options: (0, _extends2.default)({}, (_authStore$initialSta = _auth.default.initialState.entitlementsState) == null ? void 0 : _authStore$initialSta.options, overrideInitialState == null ? void 0 : overrideInitialState.entitlementsOptions)
+          })
         }),
         [_audits.default.storeName]: (0, _extends2.default)({}, _audits.default.initialState, (_overrideInitialState4 = overrideInitialState == null ? void 0 : overrideInitialState.auditLogs) != null ? _overrideInitialState4 : {}, {
           auditLogsState: (0, _extends2.default)({}, _audits.default.initialState.auditLogsState, (_overrideInitialState5 = overrideInitialState == null ? void 0 : (_overrideInitialState6 = overrideInitialState.auditLogs) == null ? void 0 : _overrideInitialState6.auditLogsState) != null ? _overrideInitialState5 : {}),

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "@frontegg/redux-store",
-  "version": "6.117.0-alpha.1",
+  "version": "6.118.0",
   "main": "./node/index.js",
   "license": "MIT",
   "author": "Frontegg LTD",
   "dependencies": {
     "@babel/runtime": "^7.18.6",
-    "@frontegg/rest-api": "3.0.127",
+    "@frontegg/rest-api": "3.0.136",
     "@reduxjs/toolkit": "1.8.5",
+    "fast-deep-equal": "3.1.3",
     "redux-saga": "^1.2.1",
     "uuid": "^8.3.2"
   },

package/toolkit/index.d.ts

@@ -1,4 +1,4 @@
-import { AuthPageRoutes, AuthState } from '../auth';
+import { AuthPageRoutes, AuthState, EntitlementsOptions } from '../auth';
 import { ContextOptions } from '@frontegg/rest-api';
 import { AuditsState } from '../audits';
 import { OldAuditsState } from '../audits/backward-compatibility';
@@ -25,4 +25,5 @@ export declare const createFronteggStore: (rootInitialState: InitialState, store
     };
     auditLogs: Partial<AuditsState>;
     audits: Partial<OldAuditsState>;
+    entitlementsOptions: Partial<EntitlementsOptions>;
 }> | undefined, builderMode?: boolean, urlStrategy?: 'hash' | 'path') => EnhancedStore;

package/toolkit/index.js

@@ -50,7 +50,7 @@ export const createFronteggStore = (rootInitialState, storeHolder, previewMode =
     holder = window;
   }
   if (!holder.store) {
-    var _overrideInitialState, _authInitialState$rou, _overrideInitialState2, _overrideInitialState3, _overrideInitialState4, _overrideInitialState5, _overrideInitialState6, _overrideInitialState7, _overrideInitialState8, _overrideInitialState9;
+    var _overrideInitialState, _authInitialState$rou, _overrideInitialState2, _overrideInitialState3, _authStore$initialSta, _overrideInitialState4, _overrideInitialState5, _overrideInitialState6, _overrideInitialState7, _overrideInitialState8, _overrideInitialState9;
     if (!previewMode && !builderMode) {
       ContextHolder.setContext(rootInitialState.context);
     }
@@ -69,7 +69,10 @@ export const createFronteggStore = (rootInitialState, storeHolder, previewMode =
           urlStrategy: urlStrategy
         }),
         [authStore.storeName]: _extends({}, authStore.initialState, authInitialState, (_overrideInitialState = overrideInitialState == null ? void 0 : overrideInitialState.auth) != null ? _overrideInitialState : {}, {
-          routes: _extends({}, authStore.initialState.routes, (_authInitialState$rou = authInitialState == null ? void 0 : authInitialState.routes) != null ? _authInitialState$rou : {}, (_overrideInitialState2 = overrideInitialState == null ? void 0 : (_overrideInitialState3 = overrideInitialState.auth) == null ? void 0 : _overrideInitialState3.routes) != null ? _overrideInitialState2 : {})
+          routes: _extends({}, authStore.initialState.routes, (_authInitialState$rou = authInitialState == null ? void 0 : authInitialState.routes) != null ? _authInitialState$rou : {}, (_overrideInitialState2 = overrideInitialState == null ? void 0 : (_overrideInitialState3 = overrideInitialState.auth) == null ? void 0 : _overrideInitialState3.routes) != null ? _overrideInitialState2 : {}),
+          entitlementsState: _extends({}, authStore.initialState.entitlementsState, {
+            options: _extends({}, (_authStore$initialSta = authStore.initialState.entitlementsState) == null ? void 0 : _authStore$initialSta.options, overrideInitialState == null ? void 0 : overrideInitialState.entitlementsOptions)
+          })
         }),
         [auditsStore.storeName]: _extends({}, auditsStore.initialState, (_overrideInitialState4 = overrideInitialState == null ? void 0 : overrideInitialState.auditLogs) != null ? _overrideInitialState4 : {}, {
           auditLogsState: _extends({}, auditsStore.initialState.auditLogsState, (_overrideInitialState5 = overrideInitialState == null ? void 0 : (_overrideInitialState6 = overrideInitialState.auditLogs) == null ? void 0 : _overrideInitialState6.auditLogsState) != null ? _overrideInitialState5 : {}),