@frontegg/rest-api 3.1.74-alpha.9436511986 → 3.1.74-alpha.9437859720

package/ContextHolder/index.d.ts

@@ -12,112 +12,136 @@ export declare class ContextHolder {
     private accessToken;
     private user;
     private requestSource;
-    private onRedirectTo;
-    private logout;
+    onRedirectTo: (path: string, opts?: RedirectOptions) => void;
+    logout: (callback?: () => void) => void;
     private entitlementsOptions;
     private appName;
     private sessionContext?;
     private constructor();
+    static default(): ContextHolder;
+    static for(appName: string): ContextHolder;
+    /**
+     * @deprecated - use ContextHolder.for(appName) / ContextHolder.default()  instead
+     * @param appName
+     */
     static getInstance(appName?: string): ContextHolder;
+    static createInstance(appName?: string): ContextHolder;
     /**
-     * @deprecated - use getFronteggContext(appName).setContext instead
+     * @deprecated - use ContextHolder.for(appName).setContext instead
      */
     static setContext(context: ContextOptions, appName?: string): void;
+    setContext(context: ContextOptions): void;
     /**
-     * @deprecated - use getFronteggContext(appName).setAccessToken instead
+     * @deprecated - use ContextHolder.for(appName).setAccessToken instead
      */
     static setAccessToken(accessToken: string | null, appName?: string): void;
+    setAccessToken(accessToken: string | null): void;
     /**
-     * @deprecated - use getFronteggContext(appName).setUser instead
+     * @deprecated - use ContextHolder.for(appName).setUser instead
      */
     static setUser(user: IUserProfile | null, appName?: string): void;
+    setUser(user: IUserProfile | null): void;
     /**
-     * @deprecated - use getFronteggContext(appName).setRequestSource instead
+     * @deprecated - use ContextHolder.for(appName).setRequestSource instead
      */
     static setRequestSource(requestSource: RequestSource | null, appName?: string): void;
+    setRequestSource(requestSource: RequestSource | null): void;
     /**
-     * @deprecated - use getFronteggContext(appName).setOnRedirectTo instead
+     * @deprecated - use ContextHolder.for(appName).setOnRedirectTo instead
      */
     static setOnRedirectTo(onRedirectTo: (path: string, opts?: RedirectOptions) => void, appName?: string): void;
+    setOnRedirectTo(onRedirectTo: (path: string, opts?: RedirectOptions) => void): void;
     /**
-     * @deprecated - use getFronteggContext(appName).setLogout instead
+     * @deprecated - use ContextHolder.for(appName).setLogout instead
      */
     static setLogout(logout: (callback?: () => void) => void, logoutUrl: string, appName?: string): void;
+    setLogout(logout: (callback?: () => void) => void): void;
     /**
      * App name should also be set for entitlements
-     * @deprecated - use getFronteggContext(appName).setEntitlementsOptions instead
+     * @deprecated - use ContextHolder.for(appName).setEntitlementsOptions instead
      * @param entitlementsOptions frontegg options entitlements config
      * @param appName - app name
      */
     static setEntitlementsOptions(entitlementsOptions: EntitlementsOptions, appName?: string): void;
+    setEntitlementsOptions(entitlementsOptions: EntitlementsOptions): void;
     /**
-     * @deprecated - use getFronteggContext(appName).setSessionContext instead
+     * @deprecated - use ContextHolder.for(appName).setSessionContext instead
      * @param sessionContext frontegg options SessionContext config
      * @param appName - app name
      */
     static setSessionContext(sessionContext: SessionContext, appName?: string): void;
+    setSessionContext(sessionContext: SessionContext): void;
     /**
-     * @deprecated - use getFronteggContext(appName).setAppName instead
+     * @deprecated - use ContextHolder.for(appName).setAppName instead
      */
     static setAppName(appName: string): void;
+    setAppName(appName: string): void;
+    /**
+     * @deprecated - use ContextHolder.for(appName).getContext instead
+     */
     static getContext(appName?: string): ContextOptions;
+    getContext(): ContextOptions;
     /**
-     * @deprecated - use getFronteggContext(appName) instead
+     * @deprecated - use ContextHolder.for(appName).getAccessToken instead
      */
     static getAccessToken(appName?: string): string | null;
+    getAccessToken(): string | null;
     /**
-     * @deprecated - use getFronteggContext(appName).requestSource instead
+     * @deprecated - use ContextHolder.for(appName).requestSource instead
      */
     static getRequestSource(appName?: string): RequestSource | null;
+    getRequestSource(): RequestSource | null;
     /**
-     * @deprecated - use getFronteggContext(appName).getUser instead
+     * @deprecated - use ContextHolder.for(appName).getUser instead
      */
     static getUser(appName?: string): IUserProfile | null;
+    getUser(): IUserProfile | null;
     /**
-     * @deprecated - use getFronteggContext(appName).onRedirectTo instead
+     * @deprecated - use ContextHolder.for(appName).onRedirectTo instead
      */
     static onRedirectTo(path: string, opts?: RedirectOptions, appName?: string): void;
     /**
-     * @deprecated - use getFronteggContext(appName)/logout instead
+     * @deprecated - use ContextHolder.for(appName).logout instead
      */
     static logout(callback?: () => void, appName?: string): void;
     /**
-     * @deprecated - use getFronteggContext(appName).shouldLoadEntitlements instead
+     * @deprecated - use ContextHolder.for(appName).shouldLoadEntitlements instead
      * @returns shouldLoadEntitlements. Default to false.
      */
     static shouldLoadEntitlements(appName?: string): boolean;
+    shouldLoadEntitlements(): boolean;
     /**
-     * @deprecated - use getFronteggContext(appName).isSessionPerTenantEnabled instead
+     * @deprecated - use ContextHolder.for(appName).isSessionPerTenantEnabled instead
      * @returns isSessionPerTenantEnabled. Default to false.
      */
     static isSessionPerTenantEnabled(appName?: string): boolean;
+    isSessionPerTenantEnabled(): boolean;
     /**
-     * @deprecated - use getFronteggContext(appName).getAppName instead
+     * @deprecated - use ContextHolder.for(appName).getAppName instead
      * @returns app name value
      */
     static getAppName(appName?: string): string | null;
+    getAppName(): string | null;
 }
 /**
  * Frontegg context to be used in the application
  *
- * @deprecated use getFronteggContext instead
+ * @deprecated use ContextHolder.for instead
  */
 export declare const FronteggContext: {
     getContext: () => ContextOptions;
     getAccessToken: () => string | null;
+    setAccessToken: (accessToken: string | null) => void;
     getUser: () => IUserProfile | null;
-    onRedirectTo: (path: string, opts: RedirectOptions) => void;
-    logout: (callback?: (() => void) | undefined) => void;
-};
-export declare const getFronteggContext: (appName?: string) => {
-    getContext: () => ContextOptions;
-    getAccessToken: () => string | null;
-    getUser: () => IUserProfile | null;
+    setUser: (user: IUserProfile | null) => void;
     onRedirectTo: (path: string, opts?: RedirectOptions | undefined) => void;
+    setOnRedirectTo: (onRedirectTo: (path: string, opts?: RedirectOptions | undefined) => void) => void;
     logout: (callback?: (() => void) | undefined) => void;
     getRequestSource: () => RequestSource | null;
-    setAccessToken: (accessToken: string | null) => void;
-    setUser: (user: IUserProfile | null) => void;
+    setRequestSource: (requestSource: RequestSource | null) => void;
     isSessionPerTenantEnabled: () => boolean;
     shouldLoadEntitlements: () => boolean;
+    getAppName: () => string | null;
+    setEntitlementsOptions: (entitlementsOptions: EntitlementsOptions) => void;
+    setSessionContext: (sessionContext: SessionContext) => void;
 };

package/ContextHolder/index.js

@@ -14,7 +14,19 @@ export class ContextHolder {
     this.sessionContext = void 0;
   }
 
+  static default() {
+    return ContextHolder.getInstance(DEFAULT_APP_NAME);
+  }
+
+  static for(appName) {
+    return ContextHolder.getInstance(appName);
+  }
+
   static getInstance(appName = 'default') {
+    if (!ContextHolder._apps) {
+      ContextHolder._apps = {};
+    }
+
     if (ContextHolder._apps[appName]) {
       return ContextHolder._apps[appName];
     }
@@ -23,52 +35,106 @@ export class ContextHolder {
     return ContextHolder._apps[appName];
   }
 
+  static createInstance(appName = 'default') {
+    ContextHolder._apps[appName] = new ContextHolder();
+    ContextHolder._apps[appName].appName = appName;
+    return ContextHolder._apps[appName];
+  }
+
   static setContext(context, appName = 'default') {
-    ContextHolder.getInstance(appName).context = context;
+    ContextHolder.for(appName).context = context;
+  }
+
+  setContext(context) {
+    this.context = context;
   }
 
   static setAccessToken(accessToken, appName = 'default') {
-    ContextHolder.getInstance(appName).accessToken = accessToken;
+    ContextHolder.for(appName).accessToken = accessToken;
+  }
+
+  setAccessToken(accessToken) {
+    this.accessToken = accessToken;
   }
 
   static setUser(user, appName = 'default') {
-    ContextHolder.getInstance(appName).user = user;
+    ContextHolder.for(appName).user = user;
+  }
+
+  setUser(user) {
+    this.user = user;
   }
 
   static setRequestSource(requestSource, appName = 'default') {
-    ContextHolder.getInstance(appName).requestSource = requestSource;
+    ContextHolder.for(appName).requestSource = requestSource;
+  }
+
+  setRequestSource(requestSource) {
+    this.requestSource = requestSource;
   }
 
   static setOnRedirectTo(onRedirectTo, appName = 'default') {
-    ContextHolder.getInstance(appName).onRedirectTo = onRedirectTo;
+    ContextHolder.for(appName).onRedirectTo = onRedirectTo;
+  }
+
+  setOnRedirectTo(onRedirectTo) {
+    this.onRedirectTo = onRedirectTo;
   }
 
   static setLogout(logout, logoutUrl, appName = 'default') {
-    ContextHolder.getInstance(appName).logout = callback => {
+    const context = ContextHolder.for(appName);
+
+    context.logout = callback => {
       if (!callback) {
-        ContextHolder.onRedirectTo(logoutUrl, undefined, appName);
+        context.onRedirectTo(logoutUrl, undefined);
       } else {
         logout(callback);
       }
     };
   }
 
+  setLogout(logout) {
+    this.logout = logout;
+  }
+
   static setEntitlementsOptions(entitlementsOptions, appName = 'default') {
-    ContextHolder.getInstance(appName).entitlementsOptions = entitlementsOptions;
+    ContextHolder.for(appName).entitlementsOptions = entitlementsOptions;
+  }
+
+  setEntitlementsOptions(entitlementsOptions) {
+    this.entitlementsOptions = entitlementsOptions;
   }
 
   static setSessionContext(sessionContext, appName = 'default') {
-    ContextHolder.getInstance(appName).sessionContext = sessionContext;
+    ContextHolder.for(appName).sessionContext = sessionContext;
+  }
+
+  setSessionContext(sessionContext) {
+    this.sessionContext = sessionContext;
   }
 
   static setAppName(appName) {
-    ContextHolder.getInstance(appName).appName = appName;
+    ContextHolder.for(appName).appName = appName;
+  }
+
+  setAppName(appName) {
+    this.appName = appName;
   }
 
   static getContext(appName = 'default') {
-    var _ContextHolder$getIns;
+    var _ContextHolder$for$co;
 
-    return (_ContextHolder$getIns = ContextHolder.getInstance(appName).context) != null ? _ContextHolder$getIns : {
+    return (_ContextHolder$for$co = ContextHolder.for(appName).context) != null ? _ContextHolder$for$co : {
+      baseUrl: window.location.href,
+      tokenResolver: () => 'my-authentication-token',
+      logLevel: 'error'
+    };
+  }
+
+  getContext() {
+    var _this$context;
+
+    return (_this$context = this.context) != null ? _this$context : {
       baseUrl: window.location.href,
       tokenResolver: () => 'my-authentication-token',
       logLevel: 'error'
@@ -76,59 +142,86 @@ export class ContextHolder {
   }
 
   static getAccessToken(appName = 'default') {
-    return ContextHolder.getInstance(appName).accessToken;
+    return ContextHolder.for(appName).accessToken;
+  }
+
+  getAccessToken() {
+    return this.accessToken;
   }
 
   static getRequestSource(appName = 'default') {
-    return ContextHolder.getInstance(appName).requestSource;
+    return ContextHolder.for(appName).requestSource;
+  }
+
+  getRequestSource() {
+    return this.requestSource;
   }
 
   static getUser(appName = 'default') {
-    return ContextHolder.getInstance(appName).user;
+    return ContextHolder.for(appName).user;
+  }
+
+  getUser() {
+    return this.user;
   }
 
   static onRedirectTo(path, opts, appName = 'default') {
-    return ContextHolder.getInstance(appName).onRedirectTo(path, opts);
+    return ContextHolder.for(appName).onRedirectTo(path, opts);
   }
 
   static logout(callback, appName = 'default') {
-    return ContextHolder.getInstance(appName).logout(callback);
+    return ContextHolder.for(appName).logout(callback);
   }
 
   static shouldLoadEntitlements(appName = 'default') {
-    var _ContextHolder$getIns2;
+    var _ContextHolder$for$en;
+
+    return ((_ContextHolder$for$en = ContextHolder.for(appName).entitlementsOptions) == null ? void 0 : _ContextHolder$for$en.enabled) || false;
+  }
 
-    return ((_ContextHolder$getIns2 = ContextHolder.getInstance(appName).entitlementsOptions) == null ? void 0 : _ContextHolder$getIns2.enabled) || false;
+  shouldLoadEntitlements() {
+    var _this$entitlementsOpt;
+
+    return ((_this$entitlementsOpt = this.entitlementsOptions) == null ? void 0 : _this$entitlementsOpt.enabled) || false;
   }
 
   static isSessionPerTenantEnabled(appName = 'default') {
-    var _ContextHolder$getIns3;
+    var _ContextHolder$for$se;
+
+    return ((_ContextHolder$for$se = ContextHolder.for(appName).sessionContext) == null ? void 0 : _ContextHolder$for$se.enableSessionPerTenant) || false;
+  }
 
-    return ((_ContextHolder$getIns3 = ContextHolder.getInstance(appName).sessionContext) == null ? void 0 : _ContextHolder$getIns3.enableSessionPerTenant) || false;
+  isSessionPerTenantEnabled() {
+    var _this$sessionContext;
+
+    return ((_this$sessionContext = this.sessionContext) == null ? void 0 : _this$sessionContext.enableSessionPerTenant) || false;
   }
 
   static getAppName(appName = 'default') {
-    return ContextHolder.getInstance(appName).appName;
+    return ContextHolder.for(appName).appName;
+  }
+
+  getAppName() {
+    return this.appName;
   }
 
 }
 ContextHolder._apps = void 0;
+const DEFAULT_APP_NAME = 'default';
 export const FronteggContext = {
-  getContext: () => ContextHolder.getContext(),
-  getAccessToken: () => ContextHolder.getAccessToken(),
-  getUser: () => ContextHolder.getUser(),
-  onRedirectTo: (path, opts) => ContextHolder.onRedirectTo(path, opts),
-  logout: callback => ContextHolder.logout(callback)
-};
-export const getFronteggContext = (appName = 'default') => ({
-  getContext: () => ContextHolder.getContext(appName),
-  getAccessToken: () => ContextHolder.getAccessToken(appName),
-  getUser: () => ContextHolder.getUser(appName),
-  onRedirectTo: (path, opts) => ContextHolder.onRedirectTo(path, opts, appName),
-  logout: callback => ContextHolder.logout(callback, appName),
-  getRequestSource: () => ContextHolder.getRequestSource(appName),
-  setAccessToken: accessToken => ContextHolder.setAccessToken(accessToken, appName),
-  setUser: user => ContextHolder.setUser(user, appName),
-  isSessionPerTenantEnabled: () => ContextHolder.isSessionPerTenantEnabled(appName),
-  shouldLoadEntitlements: () => ContextHolder.shouldLoadEntitlements(appName)
-});
+  getContext: () => ContextHolder.getContext(DEFAULT_APP_NAME),
+  getAccessToken: () => ContextHolder.getAccessToken(DEFAULT_APP_NAME),
+  setAccessToken: accessToken => ContextHolder.setAccessToken(accessToken, DEFAULT_APP_NAME),
+  getUser: () => ContextHolder.getUser(DEFAULT_APP_NAME),
+  setUser: user => ContextHolder.setUser(user, DEFAULT_APP_NAME),
+  onRedirectTo: (path, opts) => ContextHolder.onRedirectTo(path, opts, DEFAULT_APP_NAME),
+  setOnRedirectTo: onRedirectTo => ContextHolder.setOnRedirectTo(onRedirectTo, DEFAULT_APP_NAME),
+  logout: callback => ContextHolder.logout(callback, DEFAULT_APP_NAME),
+  getRequestSource: () => ContextHolder.getRequestSource(DEFAULT_APP_NAME),
+  setRequestSource: requestSource => ContextHolder.setRequestSource(requestSource, DEFAULT_APP_NAME),
+  isSessionPerTenantEnabled: () => ContextHolder.isSessionPerTenantEnabled(DEFAULT_APP_NAME),
+  shouldLoadEntitlements: () => ContextHolder.shouldLoadEntitlements(DEFAULT_APP_NAME),
+  getAppName: () => ContextHolder.getAppName(DEFAULT_APP_NAME),
+  setEntitlementsOptions: entitlementsOptions => ContextHolder.setEntitlementsOptions(entitlementsOptions, DEFAULT_APP_NAME),
+  setSessionContext: sessionContext => ContextHolder.setSessionContext(sessionContext, DEFAULT_APP_NAME)
+};

package/FetchClient.d.ts

@@ -22,10 +22,17 @@ export declare class FetchClient {
     extractHeadersFromOptions: (options?: UserJwtOptions) => {
         Authorization?: string;
     };
+    /** @deprecated use getContextBaseUrl instead */
+    static getBaseUrl: (context: ContextOptions, url: string, withFronteggPrefix?: boolean) => string;
+    /** @deprecated use getContextBaseUrl instead */
+    getBaseUrl: (context: ContextOptions, url: string, withFronteggPrefix?: boolean) => string;
+    getContextBaseUrl: (url: string, withFronteggPrefix?: boolean) => string;
+    static getMetadataHeaders: (context: ContextOptions) => Record<string, string>;
+    /** @deprecated - use getContextMetadataHeaders instead */
+    getMetadataHeaders: (context: ContextOptions) => Record<string, string>;
+    getContextMetadataHeaders: () => Record<string, string>;
+    static getScopedTenant: () => string | null;
 }
-export declare function getBaseUrl(context: ContextOptions, url: string, withFronteggPrefix?: boolean): string;
-export declare function getMetadataHeaders(context: ContextOptions): Record<string, string>;
-export declare function getScopedTenant(): string | null;
 declare const _default: FetchClient;
 /**
  * import FetchClient and use it to make requests to the server for specific application

package/FetchClient.js

@@ -1,5 +1,5 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
-import { getFronteggContext } from './ContextHolder';
+import { ContextHolder } from './ContextHolder';
 import { FronteggApiError } from './error';
 import { GENERIC_ERROR_MESSAGE } from './constants';
 import { fronteggHeaders } from './interfaces';
@@ -8,12 +8,12 @@ export class FetchClient {
     this.appName = void 0;
 
     this.getFronteggContext = () => {
-      return getFronteggContext(this.appName);
+      return ContextHolder.for(this.appName);
     };
 
     this.prepareUrl = async (url, params) => {
       const context = this.getFronteggContext().getContext();
-      const baseUrl = getBaseUrl(context, url);
+      const baseUrl = this.getContextBaseUrl(url);
       const paramsToSend = await this.buildQueryParams(context, params);
       let finalUrl = url.startsWith('http') ? url : `${baseUrl}${url}`;
       const hasKeys = Object.keys(paramsToSend).length > 0;
@@ -90,10 +90,10 @@ export class FetchClient {
 
       const fronteggContext = this.getFronteggContext();
       const context = fronteggContext.getContext();
-      const headers = getMetadataHeaders(context);
+      const headers = FetchClient.getMetadataHeaders(context);
       const authToken = await ((_context$tokenResolve = context == null ? void 0 : context.tokenResolver) != null ? _context$tokenResolve : fronteggContext.getAccessToken)();
       const requestSource = fronteggContext.getRequestSource();
-      const scopedTenant = getScopedTenant();
+      const scopedTenant = FetchClient.getScopedTenant();
 
       if (contentType) {
         headers[fronteggHeaders.contentType] = contentType;
@@ -121,7 +121,7 @@ export class FetchClient {
     this.sendRequest = async opts => {
       var _opts$method, _ref, _opts$credentials;
 
-      const context = getFronteggContext(this.appName).getContext();
+      const context = this.getFronteggContext().getContext();
       const headers = await this.buildRequestHeaders(opts.contentType);
       const url = await this.prepareUrl(opts.url, opts.params);
       const response = await fetch(url, {
@@ -232,11 +232,30 @@ export class FetchClient {
       Authorization: options.jwt
     } : {});
 
+    this.getBaseUrl = (context, url, withFronteggPrefix = true) => {
+      return FetchClient.getBaseUrl(context, url, withFronteggPrefix);
+    };
+
+    this.getContextBaseUrl = (url, withFronteggPrefix = true) => {
+      const context = this.getFronteggContext().getContext();
+      return this.getBaseUrl(context, url, withFronteggPrefix);
+    };
+
+    this.getMetadataHeaders = context => {
+      return FetchClient.getMetadataHeaders(context);
+    };
+
+    this.getContextMetadataHeaders = () => {
+      const context = this.getFronteggContext().getContext();
+      return FetchClient.getMetadataHeaders(context);
+    };
+
     this.appName = appName;
   }
 
 }
-export function getBaseUrl(context, url, withFronteggPrefix = true) {
+
+FetchClient.getBaseUrl = (context, url, withFronteggPrefix = true) => {
   let baseUrl;
 
   if (typeof context.baseUrl === 'function') {
@@ -257,8 +276,9 @@ export function getBaseUrl(context, url, withFronteggPrefix = true) {
   }
 
   return baseUrl;
-}
-export function getMetadataHeaders(context) {
+};
+
+FetchClient.getMetadataHeaders = context => {
   var _context$metadataHead, _context$metadataHead2;
 
   const headers = {};
@@ -272,8 +292,9 @@ export function getMetadataHeaders(context) {
   }
 
   return headers;
-}
-export function getScopedTenant() {
+};
+
+FetchClient.getScopedTenant = () => {
   const urlParams = new URLSearchParams(window.location.search);
   const scopedTenant = urlParams.get('tenantId');
 
@@ -282,5 +303,6 @@ export function getScopedTenant() {
   }
 
   return null;
-}
+};
+
 export default new FetchClient('default');

package/auth/index.js

@@ -8,7 +8,6 @@ export * from "./enums";
 export { FRONTEGG_SEPARATE_TABS_BY_TENANT } from "./constants";
 export { setTabTenantInSessionStorage, getTabTenantFromSessionStorage, getCurrentUserTenantsFunction, removeTabTenantFromSessionStorage } from './utils';
 import { urls } from "../constants";
-import { getFronteggContext } from '../ContextHolder';
 import { jwtDecode } from "../jwt";
 import { LOAD_AUTHORIZATION_FF } from './interfaces';
 import { ADMIN_PORTAL_ENTITLEMENTS_FF } from '../entitlements/interfaces';
@@ -17,6 +16,7 @@ import { executeConditionalPromise, getCurrentUserTenantsFunction, getTabTenantF
 import { TenantsApi } from "../tenants";
 import { BaseApiClient } from '../BaseApiClient';
 import { EntitlementsApi } from '../entitlements';
+import { ContextHolder } from '../ContextHolder';
 export class AuthenticationApi extends BaseApiClient {
   constructor(appName) {
     super(appName);
@@ -28,14 +28,14 @@ export class AuthenticationApi extends BaseApiClient {
         return loginResponse;
       }
 
-      const contextHolder = getFronteggContext(this.appName);
+      const contextHolder = ContextHolder.for(this.appName);
       contextHolder.setAccessToken(loginResponse.accessToken);
       const me = await this.getMeAndEntitlements();
       const decodedContent = loginResponse.accessToken ? jwtDecode(loginResponse.accessToken) : {};
 
       const user = _extends({}, loginResponse, decodedContent, me);
 
-      getFronteggContext(this.appName).setUser(user);
+      contextHolder.setUser(user);
       return user;
     };
 
@@ -46,14 +46,14 @@ export class AuthenticationApi extends BaseApiClient {
         };
       }
 
-      const contextHolder = getFronteggContext(this.appName);
+      const contextHolder = ContextHolder.for(this.appName);
       contextHolder.setAccessToken(loginResponse.accessToken);
       const [me, tenants] = await Promise.all([this.getMeAndEntitlements(), this.tenantsApi.getTenants()]);
       const decodedContent = loginResponse.accessToken ? jwtDecode(loginResponse.accessToken) : {};
 
       const user = _extends({}, loginResponse, decodedContent, me);
 
-      getFronteggContext(this.appName).setUser(user);
+      contextHolder.setUser(user);
       return {
         user,
         tenants
@@ -71,7 +71,7 @@ export class AuthenticationApi extends BaseApiClient {
         };
       }
 
-      const contextHolder = getFronteggContext(this.appName);
+      const contextHolder = ContextHolder.for(this.appName);
       contextHolder.setAccessToken(accessToken);
       const [me, currentUserTenants] = await Promise.all([this.getMeAndEntitlements(), getCurrentUserTenantsFunction(this.appName)()]);
       const decodedContent = accessToken ? jwtDecode(accessToken) : {};
@@ -91,7 +91,7 @@ export class AuthenticationApi extends BaseApiClient {
     };
 
     this.generateLoginResponseFromOAuthResponse = async oauthResponse => {
-      const contextHolder = getFronteggContext(this.appName);
+      const contextHolder = ContextHolder.for(this.appName);
       contextHolder.setAccessToken(oauthResponse.id_token);
       const me = await this.getMeAndEntitlements();
       const decodedContent = oauthResponse.id_token ? jwtDecode(oauthResponse.id_token) : {};
@@ -109,7 +109,7 @@ export class AuthenticationApi extends BaseApiClient {
     };
 
     this.generateLoginResponseFromOAuthResponseV2 = async oauthResponse => {
-      const contextHolder = getFronteggContext(this.appName);
+      const contextHolder = ContextHolder.for(this.appName);
       contextHolder.setAccessToken(oauthResponse.id_token);
       const [me, currentUserTenants] = await Promise.all([this.getMeAndEntitlements(), getCurrentUserTenantsFunction(this.appName)()]);
       const decodedContent = oauthResponse.id_token ? jwtDecode(oauthResponse.id_token) : {};
@@ -904,7 +904,7 @@ export class AuthenticationApi extends BaseApiClient {
   }
 
   shouldLoadEntitlements() {
-    if (!getFronteggContext(this.appName).shouldLoadEntitlements()) {
+    if (!ContextHolder.for(this.appName).shouldLoadEntitlements()) {
       return false;
     }
 

package/auth/utils.js

@@ -1,4 +1,4 @@
-import { getFronteggContext } from '../ContextHolder';
+import { ContextHolder } from '../ContextHolder';
 import { USE_CURRENT_USER_TENANTS_V1_ENDPOINT_FF } from './constants';
 import { FeatureFlags } from '../feature-flags';
 import { UsersApi } from '../users';
@@ -22,7 +22,7 @@ export function removeTabTenantFromSessionStorage() {
   sessionStorage.removeItem(FRONTEGG_SEPARATE_TABS_BY_TENANT);
 }
 export function getTabTenantFromSessionStorage(appName) {
-  if (!getFronteggContext(appName).isSessionPerTenantEnabled()) {
+  if (!ContextHolder.for(appName).isSessionPerTenantEnabled()) {
     return null;
   }
 
@@ -32,7 +32,7 @@ export function getCurrentUserTenantsFunction(appName) {
   const usersApi = new UsersApi(appName);
   const [useCurrentUserTenantsV1] = FeatureFlags.getFeatureFlags([USE_CURRENT_USER_TENANTS_V1_ENDPOINT_FF], appName);
 
-  if (getFronteggContext(appName).isSessionPerTenantEnabled()) {
+  if (ContextHolder.for(appName).isSessionPerTenantEnabled()) {
     return usersApi.getCurrentUserTenantsV1;
   }