@frontegg/redux-store 6.122.0 → 6.123.0-alpha.1

package/auth/AcceptInvitationState/index.d.ts

@@ -49,7 +49,6 @@ declare const reducers: {
             customLoginState?: import("..").CustomLoginState | undefined;
             allAccountsState?: import("..").IAllAccountsState | undefined;
             allAccountsDialogsState?: import("..").IAllAccountsDialogsState | undefined;
-            entitlementsState?: import("..").EntitlementsState | undefined;
             securityCenterState?: import("..").SecurityCenterState | undefined;
             routes: import("..").AuthPageRoutes;
             header?: any;
@@ -96,7 +95,6 @@ declare const reducers: {
         customLoginState?: import("..").CustomLoginState | undefined;
         allAccountsState?: import("..").IAllAccountsState | undefined;
         allAccountsDialogsState?: import("..").IAllAccountsDialogsState | undefined;
-        entitlementsState?: import("..").EntitlementsState | undefined;
         securityCenterState?: import("..").SecurityCenterState | undefined;
         routes: import("..").AuthPageRoutes;
         header?: any;

package/auth/AccountSettingsState/index.d.ts

@@ -50,7 +50,6 @@ declare const reducers: {
             customLoginState?: import("..").CustomLoginState | undefined;
             allAccountsState?: import("..").IAllAccountsState | undefined;
             allAccountsDialogsState?: import("..").IAllAccountsDialogsState | undefined;
-            entitlementsState?: import("..").EntitlementsState | undefined;
             securityCenterState?: import("..").SecurityCenterState | undefined;
             routes: import("..").AuthPageRoutes;
             header?: any;
@@ -97,7 +96,6 @@ declare const reducers: {
         customLoginState?: import("..").CustomLoginState | undefined;
         allAccountsState?: import("..").IAllAccountsState | undefined;
         allAccountsDialogsState?: import("..").IAllAccountsDialogsState | undefined;
-        entitlementsState?: import("..").EntitlementsState | undefined;
         securityCenterState?: import("..").SecurityCenterState | undefined;
         routes: import("..").AuthPageRoutes;
         header?: any;

package/auth/ActivateState/index.d.ts

@@ -50,7 +50,6 @@ declare const reducers: {
             customLoginState?: import("..").CustomLoginState | undefined;
             allAccountsState?: import("..").IAllAccountsState | undefined;
             allAccountsDialogsState?: import("..").IAllAccountsDialogsState | undefined;
-            entitlementsState?: import("..").EntitlementsState | undefined;
             securityCenterState?: import("..").SecurityCenterState | undefined;
             routes: import("..").AuthPageRoutes;
             header?: any;
@@ -97,7 +96,6 @@ declare const reducers: {
         customLoginState?: import("..").CustomLoginState | undefined;
         allAccountsState?: import("..").IAllAccountsState | undefined;
         allAccountsDialogsState?: import("..").IAllAccountsDialogsState | undefined;
-        entitlementsState?: import("..").EntitlementsState | undefined;
         securityCenterState?: import("..").SecurityCenterState | undefined;
         routes: import("..").AuthPageRoutes;
         header?: any;
@@ -150,7 +148,6 @@ declare const reducers: {
             customLoginState?: import("..").CustomLoginState | undefined;
             allAccountsState?: import("..").IAllAccountsState | undefined;
             allAccountsDialogsState?: import("..").IAllAccountsDialogsState | undefined;
-            entitlementsState?: import("..").EntitlementsState | undefined;
             securityCenterState?: import("..").SecurityCenterState | undefined;
             routes: import("..").AuthPageRoutes;
             header?: any;

package/auth/ApiTokensState/index.d.ts

@@ -67,7 +67,6 @@ declare const reducers: {
             customLoginState?: import("..").CustomLoginState | undefined;
             allAccountsState?: import("..").IAllAccountsState | undefined;
             allAccountsDialogsState?: import("..").IAllAccountsDialogsState | undefined;
-            entitlementsState?: import("..").EntitlementsState | undefined;
             securityCenterState?: import("..").SecurityCenterState | undefined;
             routes: import("..").AuthPageRoutes;
             header?: any;
@@ -114,7 +113,6 @@ declare const reducers: {
         customLoginState?: import("..").CustomLoginState | undefined;
         allAccountsState?: import("..").IAllAccountsState | undefined;
         allAccountsDialogsState?: import("..").IAllAccountsDialogsState | undefined;
-        entitlementsState?: import("..").EntitlementsState | undefined;
         securityCenterState?: import("..").SecurityCenterState | undefined;
         routes: import("..").AuthPageRoutes;
         header?: any;

package/auth/CustomLoginState/index.d.ts

@@ -49,7 +49,6 @@ declare const reducers: {
             customLoginState?: CustomLoginState | undefined;
             allAccountsState?: import("..").IAllAccountsState | undefined;
             allAccountsDialogsState?: import("..").IAllAccountsDialogsState | undefined;
-            entitlementsState?: import("..").EntitlementsState | undefined;
             securityCenterState?: import("..").SecurityCenterState | undefined;
             routes: import("..").AuthPageRoutes;
             header?: any;
@@ -96,7 +95,6 @@ declare const reducers: {
         customLoginState?: CustomLoginState | undefined;
         allAccountsState?: import("..").IAllAccountsState | undefined;
         allAccountsDialogsState?: import("..").IAllAccountsDialogsState | undefined;
-        entitlementsState?: import("..").EntitlementsState | undefined;
         securityCenterState?: import("..").SecurityCenterState | undefined;
         routes: import("..").AuthPageRoutes;
         header?: any;

package/auth/Entitlements/index.d.ts

@@ -0,0 +1,2 @@
+export * from './saga';
+export * from './utils';

package/auth/Entitlements/index.js

@@ -0,0 +1,4 @@
+// Pay attention: Entitlements is not stored as a slice in the state, but as part of User
+
+export * from './saga';
+export * from './utils';

package/auth/{EntitlementsState → Entitlements}/interfaces.d.ts

@@ -1,9 +1,4 @@
-import { WithStatus } from '../../interfaces';
-import { UserEntitlementsResponse, NotEntitledReason } from '@frontegg/rest-api';
-export declare type EntitlementsState = WithStatus & {
-    entitlements: UserEntitlementsResponse | undefined;
-    options?: EntitlementsOptions | undefined;
-};
+import { NotEntitledReason } from '@frontegg/rest-api';
 export interface EntitlementsOptions {
     enabled: boolean;
 }

package/auth/Entitlements/saga.d.ts

@@ -0,0 +1,28 @@
+import { UserEntitlementsResponse } from '@frontegg/rest-api';
+/**
+ * @param oldEntitlements
+ * @param newEntitlements
+ * @returns true when there is a change between old and new entitlements
+ */
+export declare function isEntitlementsChanged(oldEntitlements: UserEntitlementsResponse | undefined, newEntitlements: UserEntitlementsResponse | undefined): boolean;
+/**
+ * Handle fetched entitlements response by deep comparison with the stored entitlements to prevent
+ * useless renders due to store update
+ * Updating loading state anyway
+ * @param newEntitlementsResponse
+ */
+export declare function handleFetchedEntitlements(newEntitlementsResponse: UserEntitlementsResponse): Generator<import("redux-saga/effects").SelectEffect | import("redux-saga/effects").PutEffect<{
+    payload: Partial<UserEntitlementsResponse>;
+    type: string;
+}>, void, UserEntitlementsResponse>;
+/**
+ * Load entitlements list
+ * Don't update entitlements data in the store when data is equal (deep check) to the existing store data
+ * @param _ saga default argument for dispatched actions
+ * @param callback called to notify the caller that the call is completed (for loading state)
+ */
+export declare function loadEntitlements(_: any, callback?: () => void): Generator<Generator<import("redux-saga/effects").SelectEffect | import("redux-saga/effects").PutEffect<{
+    payload: Partial<UserEntitlementsResponse>;
+    type: string;
+}>, void, UserEntitlementsResponse> | import("redux-saga/effects").CallEffect<UserEntitlementsResponse>, void, UserEntitlementsResponse>;
+export declare function entitlementsSagas(): Generator<import("redux-saga/effects").ForkEffect<never>, void, unknown>;

package/auth/Entitlements/saga.js

@@ -0,0 +1,48 @@
+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';
+
+/**
+ * @param oldEntitlements
+ * @param newEntitlements
+ * @returns true when there is a change between old and new entitlements
+ */
+export function isEntitlementsChanged(oldEntitlements, newEntitlements) {
+  return isEqual(oldEntitlements, newEntitlements);
+}
+
+/**
+ * Handle fetched entitlements response by deep comparison with the stored entitlements to prevent
+ * useless renders due to store update
+ * Updating loading state anyway
+ * @param newEntitlementsResponse
+ */
+export function* handleFetchedEntitlements(newEntitlementsResponse) {
+  const oldEntitlements = yield select(state => {
+    var _state$auth$user;
+    return (_state$auth$user = state.auth.user) == null ? void 0 : _state$auth$user.entitlements;
+  });
+  if (isEntitlementsChanged(oldEntitlements, newEntitlementsResponse)) {
+    return;
+  }
+  yield put(actions.setEntitlements(newEntitlementsResponse));
+}
+
+/**
+ * Load entitlements list
+ * Don't update entitlements data in the store when data is equal (deep check) to the existing store data
+ * @param _ saga default argument for dispatched actions
+ * @param callback called to notify the caller that the call is completed (for loading state)
+ */
+export function* loadEntitlements(_, callback) {
+  try {
+    const entitlements = yield call(api.entitlements.loadEntitlements);
+    yield handleFetchedEntitlements(entitlements);
+  } catch (e) {} finally {
+    callback == null ? void 0 : callback();
+  }
+}
+export function* entitlementsSagas() {
+  yield takeLeading(actions.loadEntitlements, loadEntitlements);
+}

package/auth/{EntitlementsState → Entitlements}/utils.d.ts

@@ -1,26 +1,23 @@
 import { UserEntitlementsResponse } from '@frontegg/rest-api';
-import { EntitlementsOptions, EntitledToOptions, Entitlement } from './interfaces';
+import { EntitledToOptions, Entitlement } from './interfaces';
 /**
   @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 getPermissionEntitlements: (entitlements: UserEntitlementsResponse | undefined, key: string, entitlementsVendorConfig: EntitlementsOptions | undefined) => Entitlement;
+export declare const getPermissionEntitlements: (entitlements: UserEntitlementsResponse | undefined, key: string) => 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;
+export declare const getFeatureEntitlements: (entitlements: UserEntitlementsResponse | undefined, key: string) => Entitlement;
 /**
   @param entitlements
-  @param entitledToOptions including permission or feature
-  @param entitlementsVendorConfig entitlements frontegg provider configuration
+  @param options including permission or feature
   @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;
+export declare const getEntitlements: (entitlements: UserEntitlementsResponse | undefined, options: EntitledToOptions) => Entitlement;

package/auth/{EntitlementsState → Entitlements}/utils.js

@@ -1,24 +1,23 @@
-import { NotEntitledReason } from '@frontegg/rest-api';
+import { NotEntitledReason, ContextHolder } from '@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;
+const guardEntitlementsUsage = () => {
+  if (ContextHolder.shouldLoadEntitlements()) 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);
+const getEntitlementsHelper = (keyEntitlements, missingKeyEnum) => {
+  guardEntitlementsUsage();
   if (!keyEntitlements) {
     return {
       isEntitled: false,
@@ -39,37 +38,34 @@ const getEntitlementsHelper = (keyEntitlements, entitlementsVendorConfig, missin
 /**
   @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) => {
+export const getPermissionEntitlements = (entitlements, key) => {
   var _entitlements$permiss;
-  return getEntitlementsHelper(entitlements == null ? void 0 : (_entitlements$permiss = entitlements.permissions) == null ? void 0 : _entitlements$permiss[key], entitlementsVendorConfig, NotEntitledReason.MISSING_PERMISSION);
+  return getEntitlementsHelper(entitlements == null ? void 0 : (_entitlements$permiss = entitlements.permissions) == null ? void 0 : _entitlements$permiss[key], 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) => {
+export const getFeatureEntitlements = (entitlements, key) => {
   var _entitlements$feature;
-  return getEntitlementsHelper(entitlements == null ? void 0 : (_entitlements$feature = entitlements.features) == null ? void 0 : _entitlements$feature[key], entitlementsVendorConfig, NotEntitledReason.MISSING_FEATURE);
+  return getEntitlementsHelper(entitlements == null ? void 0 : (_entitlements$feature = entitlements.features) == null ? void 0 : _entitlements$feature[key], NotEntitledReason.MISSING_FEATURE);
 };
 
 /**
   @param entitlements
-  @param entitledToOptions including permission or feature
-  @param entitlementsVendorConfig entitlements frontegg provider configuration
+  @param options including permission or feature
   @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) => {
+export const getEntitlements = (entitlements, options) => {
   if ('permissionKey' in options) {
-    return getPermissionEntitlements(entitlements, options.permissionKey, entitlementsVendorConfig);
+    return getPermissionEntitlements(entitlements, options.permissionKey);
   }
-  return getFeatureEntitlements(entitlements, options.featureKey, entitlementsVendorConfig);
+  return getFeatureEntitlements(entitlements, options.featureKey);
 };

package/auth/ForgotPasswordState/index.d.ts

@@ -49,7 +49,6 @@ declare const reducers: {
             customLoginState?: import("..").CustomLoginState | undefined;
             allAccountsState?: import("..").IAllAccountsState | undefined;
             allAccountsDialogsState?: import("..").IAllAccountsDialogsState | undefined;
-            entitlementsState?: import("..").EntitlementsState | undefined;
             securityCenterState?: import("..").SecurityCenterState | undefined;
             routes: import("..").AuthPageRoutes;
             header?: any;
@@ -96,7 +95,6 @@ declare const reducers: {
         customLoginState?: import("..").CustomLoginState | undefined;
         allAccountsState?: import("..").IAllAccountsState | undefined;
         allAccountsDialogsState?: import("..").IAllAccountsDialogsState | undefined;
-        entitlementsState?: import("..").EntitlementsState | undefined;
         securityCenterState?: import("..").SecurityCenterState | undefined;
         routes: import("..").AuthPageRoutes;
         header?: any;

package/auth/GroupsState/groupsDialogsState.d.ts

@@ -48,7 +48,6 @@ declare const reducers: {
             customLoginState?: import("..").CustomLoginState | undefined;
             allAccountsState?: import("..").IAllAccountsState | undefined;
             allAccountsDialogsState?: import("..").IAllAccountsDialogsState | undefined;
-            entitlementsState?: import("..").EntitlementsState | undefined;
             securityCenterState?: import("..").SecurityCenterState | undefined;
             routes: import("..").AuthPageRoutes;
             header?: any;
@@ -95,7 +94,6 @@ declare const reducers: {
         customLoginState?: import("..").CustomLoginState | undefined;
         allAccountsState?: import("..").IAllAccountsState | undefined;
         allAccountsDialogsState?: import("..").IAllAccountsDialogsState | undefined;
-        entitlementsState?: import("..").EntitlementsState | undefined;
         securityCenterState?: import("..").SecurityCenterState | undefined;
         routes: import("..").AuthPageRoutes;
         header?: any;
@@ -141,7 +139,6 @@ declare const reducers: {
         customLoginState?: import("..").CustomLoginState | undefined;
         allAccountsState?: import("..").IAllAccountsState | undefined;
         allAccountsDialogsState?: import("..").IAllAccountsDialogsState | undefined;
-        entitlementsState?: import("..").EntitlementsState | undefined;
         securityCenterState?: import("..").SecurityCenterState | undefined;
         routes: import("..").AuthPageRoutes;
         header?: any;
@@ -187,7 +184,6 @@ declare const reducers: {
         customLoginState?: import("..").CustomLoginState | undefined;
         allAccountsState?: import("..").IAllAccountsState | undefined;
         allAccountsDialogsState?: import("..").IAllAccountsDialogsState | undefined;
-        entitlementsState?: import("..").EntitlementsState | undefined;
         securityCenterState?: import("..").SecurityCenterState | undefined;
         routes: import("..").AuthPageRoutes;
         header?: any;
@@ -240,7 +236,6 @@ declare const reducers: {
             customLoginState?: import("..").CustomLoginState | undefined;
             allAccountsState?: import("..").IAllAccountsState | undefined;
             allAccountsDialogsState?: import("..").IAllAccountsDialogsState | undefined;
-            entitlementsState?: import("..").EntitlementsState | undefined;
             securityCenterState?: import("..").SecurityCenterState | undefined;
             routes: import("..").AuthPageRoutes;
             header?: any;
@@ -287,7 +282,6 @@ declare const reducers: {
         customLoginState?: import("..").CustomLoginState | undefined;
         allAccountsState?: import("..").IAllAccountsState | undefined;
         allAccountsDialogsState?: import("..").IAllAccountsDialogsState | undefined;
-        entitlementsState?: import("..").EntitlementsState | undefined;
         securityCenterState?: import("..").SecurityCenterState | undefined;
         routes: import("..").AuthPageRoutes;
         header?: any;
@@ -361,7 +355,6 @@ declare const reducers: {
             customLoginState?: import("..").CustomLoginState | undefined;
             allAccountsState?: import("..").IAllAccountsState | undefined;
             allAccountsDialogsState?: import("..").IAllAccountsDialogsState | undefined;
-            entitlementsState?: import("..").EntitlementsState | undefined;
             securityCenterState?: import("..").SecurityCenterState | undefined;
             routes: import("..").AuthPageRoutes;
             header?: any;
@@ -408,7 +401,6 @@ declare const reducers: {
         customLoginState?: import("..").CustomLoginState | undefined;
         allAccountsState?: import("..").IAllAccountsState | undefined;
         allAccountsDialogsState?: import("..").IAllAccountsDialogsState | undefined;
-        entitlementsState?: import("..").EntitlementsState | undefined;
         securityCenterState?: import("..").SecurityCenterState | undefined;
         routes: import("..").AuthPageRoutes;
         header?: any;
@@ -454,7 +446,6 @@ declare const reducers: {
         customLoginState?: import("..").CustomLoginState | undefined;
         allAccountsState?: import("..").IAllAccountsState | undefined;
         allAccountsDialogsState?: import("..").IAllAccountsDialogsState | undefined;
-        entitlementsState?: import("..").EntitlementsState | undefined;
         securityCenterState?: import("..").SecurityCenterState | undefined;
         routes: import("..").AuthPageRoutes;
         header?: any;
@@ -500,7 +491,6 @@ declare const reducers: {
         customLoginState?: import("..").CustomLoginState | undefined;
         allAccountsState?: import("..").IAllAccountsState | undefined;
         allAccountsDialogsState?: import("..").IAllAccountsDialogsState | undefined;
-        entitlementsState?: import("..").EntitlementsState | undefined;
         securityCenterState?: import("..").SecurityCenterState | undefined;
         routes: import("..").AuthPageRoutes;
         header?: any;
@@ -553,7 +543,6 @@ declare const reducers: {
             customLoginState?: import("..").CustomLoginState | undefined;
             allAccountsState?: import("..").IAllAccountsState | undefined;
             allAccountsDialogsState?: import("..").IAllAccountsDialogsState | undefined;
-            entitlementsState?: import("..").EntitlementsState | undefined;
             securityCenterState?: import("..").SecurityCenterState | undefined;
             routes: import("..").AuthPageRoutes;
             header?: any;
@@ -600,7 +589,6 @@ declare const reducers: {
         customLoginState?: import("..").CustomLoginState | undefined;
         allAccountsState?: import("..").IAllAccountsState | undefined;
         allAccountsDialogsState?: import("..").IAllAccountsDialogsState | undefined;
-        entitlementsState?: import("..").EntitlementsState | undefined;
         securityCenterState?: import("..").SecurityCenterState | undefined;
         routes: import("..").AuthPageRoutes;
         header?: any;

package/auth/GroupsState/index.d.ts

@@ -66,7 +66,6 @@ declare const reducers: {
             customLoginState?: import("..").CustomLoginState | undefined;
             allAccountsState?: import("..").IAllAccountsState | undefined;
             allAccountsDialogsState?: import("..").IAllAccountsDialogsState | undefined;
-            entitlementsState?: import("..").EntitlementsState | undefined;
             securityCenterState?: import("..").SecurityCenterState | undefined;
             routes: import("..").AuthPageRoutes;
             header?: any;
@@ -113,7 +112,6 @@ declare const reducers: {
         customLoginState?: import("..").CustomLoginState | undefined;
         allAccountsState?: import("..").IAllAccountsState | undefined;
         allAccountsDialogsState?: import("..").IAllAccountsDialogsState | undefined;
-        entitlementsState?: import("..").EntitlementsState | undefined;
         securityCenterState?: import("..").SecurityCenterState | undefined;
         routes: import("..").AuthPageRoutes;
         header?: any;

package/auth/ImpersonationState/index.d.ts

@@ -49,7 +49,6 @@ declare const reducers: {
             customLoginState?: import("..").CustomLoginState | undefined;
             allAccountsState?: import("..").IAllAccountsState | undefined;
             allAccountsDialogsState?: import("..").IAllAccountsDialogsState | undefined;
-            entitlementsState?: import("..").EntitlementsState | undefined;
             securityCenterState?: import("..").SecurityCenterState | undefined;
             routes: import("..").AuthPageRoutes;
             header?: any;
@@ -96,7 +95,6 @@ declare const reducers: {
         customLoginState?: import("..").CustomLoginState | undefined;
         allAccountsState?: import("..").IAllAccountsState | undefined;
         allAccountsDialogsState?: import("..").IAllAccountsDialogsState | undefined;
-        entitlementsState?: import("..").EntitlementsState | undefined;
         securityCenterState?: import("..").SecurityCenterState | undefined;
         routes: import("..").AuthPageRoutes;
         header?: any;

package/auth/LoginState/index.d.ts

@@ -51,7 +51,6 @@ declare const reducers: {
             customLoginState?: import("..").CustomLoginState | undefined;
             allAccountsState?: import("..").IAllAccountsState | undefined;
             allAccountsDialogsState?: import("..").IAllAccountsDialogsState | undefined;
-            entitlementsState?: import("..").EntitlementsState | undefined;
             securityCenterState?: import("..").SecurityCenterState | undefined;
             routes: import("..").AuthPageRoutes;
             header?: any;
@@ -98,7 +97,6 @@ declare const reducers: {
         customLoginState?: import("..").CustomLoginState | undefined;
         allAccountsState?: import("..").IAllAccountsState | undefined;
         allAccountsDialogsState?: import("..").IAllAccountsDialogsState | undefined;
-        entitlementsState?: import("..").EntitlementsState | undefined;
         securityCenterState?: import("..").SecurityCenterState | undefined;
         routes: import("..").AuthPageRoutes;
         header?: any;

package/auth/LoginState/interfaces.d.ts

@@ -94,4 +94,3 @@ 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,5 +29,4 @@ export let QuickLoginStrategy;
   QuickLoginStrategy["Android"] = "android";
   QuickLoginStrategy["Sms"] = "sms";
 })(QuickLoginStrategy || (QuickLoginStrategy = {}));
-export { AuthStrategyEnum };
-export const ADMIN_PORTAL_ENTITLEMENTS_FF = 'admin_portal_entitlements';
+export { AuthStrategyEnum };

package/auth/LoginState/saga.d.ts

@@ -54,8 +54,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, (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 refreshToken(): Generator<import("redux-saga/effects").SelectEffect | CallEffect<any>, void, AuthState>;
+export declare function refreshTokenForSocialLogins(): Generator<import("redux-saga/effects").SelectEffect | 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

@@ -26,7 +26,7 @@ import { api, AuthStrategyEnum, ContextHolder, fetch, WebAuthnDeviceType } from
 import { actions } from '../reducer';
 import { FRONTEGG_AFTER_AUTH_REDIRECT_URL, HOSTED_LOGIN_VERIFIER_KEY } from '../../constants';
 import { UserVeirifedOriginTypes } from '../interfaces';
-import { LoginFlow, LoginStep, ADMIN_PORTAL_ENTITLEMENTS_FF } from './interfaces';
+import { LoginFlow, LoginStep } from './interfaces';
 import { loadAllowSignUps } from '../SignUp/saga';
 import { MFAStep } from '../MfaState/interfaces';
 import { dummyIps, userDemo } from '../dummy';
@@ -39,8 +39,29 @@ import { loadPublicAuthStrategiesPolicy } from '../SecurityPolicyState/saga';
 import { getPasskeysVendorPolicy } from '../PasskeysState/helpers';
 import { getPathAndSearchParamsFromUrl, getRedirectUrl, getSearchParamsFromUrl, getSearchParam, TENANT_ID_PARAM_KEY, getMfaStepForEnrolledUsers, getMfaStepForNotEnrolledUsers, isMfaRequired } from './utils';
 import { errorHandler } from '../../utils';
-import { loadEntitlements } from '../EntitlementsState/saga';
 import { authStrategyLoginStepMap } from './consts';
+import { isEntitlementsChanged } from '../Entitlements';
+
+/**
+ * Prevent unnecessary entitlements reference update inside the user object by
+ * deep equality with the stored user.entitlements
+ * This function should not be used for first login because no stored entitlements.
+ * @param updatedUser new user response from the BE
+ * @returns final user object with the correct entitlements reference
+ */
+function* handleUnnecessaryEntitlementsUpdate(updatedUser) {
+  const oldEntitlements = yield select(state => {
+    var _state$auth$user;
+    return (_state$auth$user = state.auth.user) == null ? void 0 : _state$auth$user.entitlements;
+  });
+  if (isEntitlementsChanged(oldEntitlements, updatedUser == null ? void 0 : updatedUser.entitlements)) {
+    // set the previous entitlemenets object
+    return _extends({}, updatedUser, {
+      entitlements: oldEntitlements
+    });
+  }
+  return updatedUser;
+}
 export function* afterAuthenticationStateUpdate({
   user,
   tenants = [],
@@ -191,23 +212,6 @@ function* shouldNevigateToRegisterQuickLogin(user) {
   const quickLoginToRegister = (_ref = localStorage.getItem('register-quick-login')) != null ? _ref : loginState.quickLoginToRegister;
   return quickLoginToRegister && localStorage.getItem(`${user.id}-${quickLoginToRegister}`) !== 'true' && !window.location.pathname.endsWith(routes.logoutUrl);
 }
-function* handleLoadEntitlements() {
-  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]);
-  if (isEntitlementsFFOn) {
-    yield call(loadEntitlements);
-  }
-}
 export function* refreshToken() {
   const {
     hostedLoginBox
@@ -217,7 +221,6 @@ export function* refreshToken() {
   } else {
     yield call(refreshTokenEmbedded);
   }
-  yield handleLoadEntitlements();
 }
 export function* refreshTokenForSocialLogins() {
   const {
@@ -228,7 +231,6 @@ export function* refreshTokenForSocialLogins() {
   } else {
     yield call(refreshTokenEmbeddedSocialLogins);
   }
-  yield handleLoadEntitlements();
 }
 function* refreshTokenHosted() {
   const {
@@ -249,7 +251,10 @@ function* refreshTokenHosted() {
       refresh_token: user == null ? void 0 : user.refreshToken
     };
     const response = yield call(api.auth.exchangeOAuthTokensV2, body);
-    yield call(afterAuthenticationStateUpdate, response, {
+    const updatedUser = yield call(handleUnnecessaryEntitlementsUpdate, response.user);
+    yield call(afterAuthenticationStateUpdate, _extends({}, response, {
+      user: updatedUser
+    }), {
       isAuthenticated: true
     });
   } catch (e) {
@@ -280,7 +285,10 @@ function* refreshTokenHostedSocialLogins() {
       refresh_token: currentUser == null ? void 0 : currentUser.refreshToken
     };
     const response = yield call(api.auth.exchangeOAuthTokensV2, body);
-    yield call(afterAuthenticationStateUpdate, response, {
+    const updatedUser = yield call(handleUnnecessaryEntitlementsUpdate, response.user);
+    yield call(afterAuthenticationStateUpdate, _extends({}, response, {
+      user: updatedUser
+    }), {
       isAuthenticated: true
     });
   } catch (e) {
@@ -317,8 +325,9 @@ function* refreshTokenEmbedded() {
       }
       const quickLoginToRegister = (_ref2 = localStorage.getItem('register-quick-login')) != null ? _ref2 : loginState.quickLoginToRegister;
       const shouldNavigateToRegisterQuickLogin = yield shouldNevigateToRegisterQuickLogin(user);
+      const updatedUser = yield call(handleUnnecessaryEntitlementsUpdate, user);
       yield call(afterAuthenticationStateUpdate, {
-        user,
+        user: updatedUser,
         tenants,
         activeTenant
       }, {
@@ -358,6 +367,7 @@ function* refreshTokenEmbeddedSocialLogins() {
         preserveQueryParams: true
       });
     } else {
+      const updatedUser = yield call(handleUnnecessaryEntitlementsUpdate, user);
       const shouldShowPrompt = yield call(shouldShowPromptPasskeys);
       if (shouldShowPrompt) {
         yield put(actions.setLoginState({
@@ -365,7 +375,7 @@ function* refreshTokenEmbeddedSocialLogins() {
           loading: false
         }));
         yield call(afterAuthenticationStateUpdate, {
-          user,
+          user: updatedUser,
           tenants,
           activeTenant
         }, {
@@ -382,7 +392,7 @@ function* refreshTokenEmbeddedSocialLogins() {
         const quickLoginToRegister = (_ref3 = localStorage.getItem('register-quick-login')) != null ? _ref3 : loginState.quickLoginToRegister;
         const shouldNavigateToRegisterQuickLogin = yield shouldNevigateToRegisterQuickLogin(user);
         yield call(afterAuthenticationStateUpdate, {
-          user,
+          user: updatedUser,
           tenants,
           activeTenant
         }, {