@frontegg/react-hooks 6.198.0-alpha.2 → 6.198.0-alpha.3

package/FronteggProvider/index.js

@@ -93,7 +93,7 @@ const FronteggContent = ({
   });
 };
 export const FronteggStoreProvider = props => {
-  var _app$options$contextO, _app$options3, _app$options$previewM, _app$options4, _app$options5, _app$options6, _app$name;
+  var _app$options$contextO, _app$options3, _app$options$previewM, _app$options4, _app$options5, _app$options6;
   const {
     children,
     app,
@@ -113,13 +113,12 @@ export const FronteggStoreProvider = props => {
   }) : {
     hostedLoginBox: app == null ? void 0 : (_app$options6 = app.options) == null ? void 0 : _app$options6.hostedLoginBox
   };
-  const appName = (_app$name = app == null ? void 0 : app.name) != null ? _app$name : 'default';
-  ContextHolder.for(appName).setContext(context);
+  ContextHolder.setContext(context);
   const store = useMemo(() => {
-    var _app$options7;
+    var _app$name, _app$options7;
     return createFronteggStore({
       context,
-      appName
+      appName: (_app$name = app == null ? void 0 : app.name) != null ? _app$name : 'default'
     }, app, previewMode, authOptions, undefined, false, app == null ? void 0 : (_app$options7 = app.options) == null ? void 0 : _app$options7.urlStrategy);
   }, [app, previewMode]);
   return /*#__PURE__*/_jsxs(Provider, {

package/auth/entitlements.js

@@ -1,7 +1,7 @@
 import { getPermissionEntitlements, getFeatureEntitlements, getEntitlements } from '@frontegg/redux-store';
 import { useAuth } from './hooks';
 import { useMemo } from 'react';
-import { useRootState, useShadowDom } from '../common';
+import { useShadowDom } from '../common';
 import { useFeatureFlags } from '../flags';
 
 /**
@@ -45,10 +45,7 @@ export const useFeatureEntitlements = (key, customAttributes) => {
     entitlements,
     attributes
   } = useEntitlementsQueryData(customAttributes);
-  const {
-    appName
-  } = useRootState();
-  return getFeatureEntitlements(entitlements, key, attributes, undefined, appName);
+  return getFeatureEntitlements(entitlements, key, attributes);
 };
 
 /**
@@ -61,10 +58,7 @@ export const usePermissionEntitlements = (key, customAttributes) => {
     entitlements,
     attributes
   } = useEntitlementsQueryData(customAttributes);
-  const {
-    appName
-  } = useRootState();
-  return getPermissionEntitlements(entitlements, key, attributes, undefined, appName);
+  return getPermissionEntitlements(entitlements, key, attributes);
 };
 
 /**
@@ -77,10 +71,7 @@ export const useEntitlements = (options, customAttributes) => {
     entitlements,
     attributes
   } = useEntitlementsQueryData(customAttributes);
-  const {
-    appName
-  } = useRootState();
-  return getEntitlements(entitlements, options, attributes, undefined, appName);
+  return getEntitlements(entitlements, options, attributes);
 };
 
 /**
@@ -91,16 +82,13 @@ export const useEntitlementsActions = () => {
   // this code is duplicated because React is yelling when using useEntitlementsQueryData inside the isEntitledTo function because it's not a hook
   const user = useUserState();
   const entitlements = useEntitlementsState();
-  const {
-    appName
-  } = useRootState();
   return useMemo(() => ({
     isEntitledTo: (options, customAttributes) => {
       const attributes = {
         custom: customAttributes,
         jwt: user
       };
-      return getEntitlements(entitlements, options, attributes, undefined, appName);
+      return getEntitlements(entitlements, options, attributes);
     }
   }), [user, entitlements]);
 };

package/auth/hooks.js

@@ -1,11 +1,11 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
-import { useMemo } from 'react';
+import { useContext, useMemo } from 'react';
 import { bindActionCreators } from '@frontegg/redux-store';
 import { authActions, authStoreName } from '@frontegg/redux-store';
 import { shallowEqual } from 'react-redux';
 import { useSelector, useDispatch } from '../FronteggStoreContext';
 import { ContextHolder } from '@frontegg/rest-api';
-import { useShadowDom } from '../common';
+import { ShadowDomContext } from '../common';
 const defaultMapper = {
   state: state => state,
   actions: actions => actions
@@ -68,13 +68,9 @@ export const useAuthActions = () => {
   return useMemo(() => bindActionCreators(authActions, dispatch), [authActions]);
 };
 export const useOnRedirectTo = () => {
-  const {
-    onRedirectTo
-  } = useAuth();
-  const {
-    appName
-  } = useShadowDom();
-  return onRedirectTo || ContextHolder.for(appName).onRedirectTo;
+  var _context$onRedirectTo;
+  const context = useContext(ShadowDomContext);
+  return (_context$onRedirectTo = context == null ? void 0 : context.onRedirectTo) != null ? _context$onRedirectTo : ContextHolder.onRedirectTo;
 };
 export const useAuthRoutes = () => useAuth(state => _extends({}, state.routes));
 

package/common/index.d.ts

@@ -1,7 +1,6 @@
 import { Dispatch, SetStateAction } from 'react';
 import { FronteggAppInstance, FronteggAppOptions } from '@frontegg/types';
 import type { FronteggState } from '@frontegg/redux-store';
-import { FetchClient, FronteggApiClient } from '@frontegg/rest-api';
 interface ShadowDomContextData extends FronteggAppOptions {
     injector: FronteggAppInstance;
     iframeRendering: boolean;
@@ -14,9 +13,6 @@ interface ShadowDomContextData extends FronteggAppOptions {
 }
 export interface DomContext extends ShadowDomContextData {
     isShadowDom: boolean;
-    fetchClient: FetchClient;
-    apiClient: FronteggApiClient;
-    appName: string;
 }
 export declare const ShadowDomContext: import("react").Context<ShadowDomContextData>;
 export declare const useShadowDom: () => DomContext;

package/common/index.js

@@ -4,10 +4,8 @@ const _excluded = ["urlStrategy", "onRedirectTo", "renderByRoute", "customLoader
 import { createContext, useContext } from 'react';
 import { useSelector } from '../FronteggStoreContext';
 import { shallowEqual } from 'react-redux';
-import { FetchClient, createApiClient } from '@frontegg/rest-api';
 export const ShadowDomContext = /*#__PURE__*/createContext({});
 export const useShadowDom = () => {
-  var _rest$injector$name, _rest$injector;
   const context = useContext(ShadowDomContext);
   const {
       urlStrategy = 'path',
@@ -18,7 +16,6 @@ export const useShadowDom = () => {
       contextOptions
     } = context,
     rest = _objectWithoutPropertiesLoose(context, _excluded);
-  const appName = (_rest$injector$name = (_rest$injector = rest.injector) == null ? void 0 : _rest$injector.name) != null ? _rest$injector$name : 'default';
   return _extends({
     isShadowDom: true,
     onRedirectTo,
@@ -29,11 +26,7 @@ export const useShadowDom = () => {
     contextOptions: _extends({
       requestCredentials: 'include'
     }, contextOptions)
-  }, rest, {
-    appName,
-    fetchClient: new FetchClient(appName),
-    apiClient: createApiClient(appName)
-  });
+  }, rest);
 };
 export const useRootState = () => {
   return useSelector(state => state.root, shallowEqual);

package/flags/useFeatureFlags.js

@@ -2,15 +2,15 @@ import { FeatureFlags } from '@frontegg/rest-api';
 import { useShadowDom } from '../common';
 export const useFeatureFlags = flags => {
   const {
-    appName
+    injector
   } = useShadowDom();
-  return FeatureFlags.getFeatureFlags(flags, appName);
+  return FeatureFlags.getFeatureFlags(flags, injector.name);
 };
 export const useFeatureFlagsChecker = () => {
   const {
-    appName
+    injector
   } = useShadowDom();
   return flags => {
-    return FeatureFlags.getFeatureFlags(flags, appName);
+    return FeatureFlags.getFeatureFlags(flags, injector.name);
   };
 };

package/index.js

@@ -1,4 +1,4 @@
-/** @license Frontegg v6.198.0-alpha.2
+/** @license Frontegg v6.198.0-alpha.3
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

package/node/FronteggProvider/index.js

@@ -100,7 +100,7 @@ const FronteggContent = ({
   });
 };
 const FronteggStoreProvider = props => {
-  var _app$options$contextO, _app$options3, _app$options$previewM, _app$options4, _app$options5, _app$options6, _app$name;
+  var _app$options$contextO, _app$options3, _app$options$previewM, _app$options4, _app$options5, _app$options6;
   const {
     children,
     app,
@@ -120,13 +120,12 @@ const FronteggStoreProvider = props => {
   }) : {
     hostedLoginBox: app == null ? void 0 : (_app$options6 = app.options) == null ? void 0 : _app$options6.hostedLoginBox
   };
-  const appName = (_app$name = app == null ? void 0 : app.name) != null ? _app$name : 'default';
-  _restApi.ContextHolder.for(appName).setContext(context);
+  _restApi.ContextHolder.setContext(context);
   const store = (0, _react.useMemo)(() => {
-    var _app$options7;
+    var _app$name, _app$options7;
     return (0, _reduxStore.createFronteggStore)({
       context,
-      appName
+      appName: (_app$name = app == null ? void 0 : app.name) != null ? _app$name : 'default'
     }, app, previewMode, authOptions, undefined, false, app == null ? void 0 : (_app$options7 = app.options) == null ? void 0 : _app$options7.urlStrategy);
   }, [app, previewMode]);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_FronteggStoreContext.Provider, {

package/node/auth/entitlements.js

@@ -50,10 +50,7 @@ const useFeatureEntitlements = (key, customAttributes) => {
     entitlements,
     attributes
   } = useEntitlementsQueryData(customAttributes);
-  const {
-    appName
-  } = (0, _common.useRootState)();
-  return (0, _reduxStore.getFeatureEntitlements)(entitlements, key, attributes, undefined, appName);
+  return (0, _reduxStore.getFeatureEntitlements)(entitlements, key, attributes);
 };
 
 /**
@@ -67,10 +64,7 @@ const usePermissionEntitlements = (key, customAttributes) => {
     entitlements,
     attributes
   } = useEntitlementsQueryData(customAttributes);
-  const {
-    appName
-  } = (0, _common.useRootState)();
-  return (0, _reduxStore.getPermissionEntitlements)(entitlements, key, attributes, undefined, appName);
+  return (0, _reduxStore.getPermissionEntitlements)(entitlements, key, attributes);
 };
 
 /**
@@ -84,10 +78,7 @@ const useEntitlements = (options, customAttributes) => {
     entitlements,
     attributes
   } = useEntitlementsQueryData(customAttributes);
-  const {
-    appName
-  } = (0, _common.useRootState)();
-  return (0, _reduxStore.getEntitlements)(entitlements, options, attributes, undefined, appName);
+  return (0, _reduxStore.getEntitlements)(entitlements, options, attributes);
 };
 
 /**
@@ -99,16 +90,13 @@ const useEntitlementsActions = () => {
   // this code is duplicated because React is yelling when using useEntitlementsQueryData inside the isEntitledTo function because it's not a hook
   const user = useUserState();
   const entitlements = useEntitlementsState();
-  const {
-    appName
-  } = (0, _common.useRootState)();
   return (0, _react.useMemo)(() => ({
     isEntitledTo: (options, customAttributes) => {
       const attributes = {
         custom: customAttributes,
         jwt: user
       };
-      return (0, _reduxStore.getEntitlements)(entitlements, options, attributes, undefined, appName);
+      return (0, _reduxStore.getEntitlements)(entitlements, options, attributes);
     }
   }), [user, entitlements]);
 };

package/node/auth/hooks.js

@@ -79,13 +79,9 @@ const useAuthActions = () => {
 };
 exports.useAuthActions = useAuthActions;
 const useOnRedirectTo = () => {
-  const {
-    onRedirectTo
-  } = useAuth();
-  const {
-    appName
-  } = (0, _common.useShadowDom)();
-  return onRedirectTo || _restApi.ContextHolder.for(appName).onRedirectTo;
+  var _context$onRedirectTo;
+  const context = (0, _react.useContext)(_common.ShadowDomContext);
+  return (_context$onRedirectTo = context == null ? void 0 : context.onRedirectTo) != null ? _context$onRedirectTo : _restApi.ContextHolder.onRedirectTo;
 };
 exports.useOnRedirectTo = useOnRedirectTo;
 const useAuthRoutes = () => useAuth(state => (0, _extends2.default)({}, state.routes));

package/node/common/index.js

@@ -15,7 +15,6 @@ var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runt
 var _react = require("react");
 var _FronteggStoreContext = require("../FronteggStoreContext");
 var _reactRedux = require("react-redux");
-var _restApi = require("@frontegg/rest-api");
 var _CustomComponentHolder = require("./CustomComponentHolder");
 Object.keys(_CustomComponentHolder).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -32,7 +31,6 @@ const _excluded = ["urlStrategy", "onRedirectTo", "renderByRoute", "customLoader
 const ShadowDomContext = /*#__PURE__*/(0, _react.createContext)({});
 exports.ShadowDomContext = ShadowDomContext;
 const useShadowDom = () => {
-  var _rest$injector$name, _rest$injector;
   const context = (0, _react.useContext)(ShadowDomContext);
   const {
       urlStrategy = 'path',
@@ -43,7 +41,6 @@ const useShadowDom = () => {
       contextOptions
     } = context,
     rest = (0, _objectWithoutPropertiesLoose2.default)(context, _excluded);
-  const appName = (_rest$injector$name = (_rest$injector = rest.injector) == null ? void 0 : _rest$injector.name) != null ? _rest$injector$name : 'default';
   return (0, _extends2.default)({
     isShadowDom: true,
     onRedirectTo,
@@ -54,11 +51,7 @@ const useShadowDom = () => {
     contextOptions: (0, _extends2.default)({
       requestCredentials: 'include'
     }, contextOptions)
-  }, rest, {
-    appName,
-    fetchClient: new _restApi.FetchClient(appName),
-    apiClient: (0, _restApi.createApiClient)(appName)
-  });
+  }, rest);
 };
 exports.useShadowDom = useShadowDom;
 const useRootState = () => {

package/node/flags/useFeatureFlags.js

@@ -8,17 +8,17 @@ var _restApi = require("@frontegg/rest-api");
 var _common = require("../common");
 const useFeatureFlags = flags => {
   const {
-    appName
+    injector
   } = (0, _common.useShadowDom)();
-  return _restApi.FeatureFlags.getFeatureFlags(flags, appName);
+  return _restApi.FeatureFlags.getFeatureFlags(flags, injector.name);
 };
 exports.useFeatureFlags = useFeatureFlags;
 const useFeatureFlagsChecker = () => {
   const {
-    appName
+    injector
   } = (0, _common.useShadowDom)();
   return flags => {
-    return _restApi.FeatureFlags.getFeatureFlags(flags, appName);
+    return _restApi.FeatureFlags.getFeatureFlags(flags, injector.name);
   };
 };
 exports.useFeatureFlagsChecker = useFeatureFlagsChecker;

package/node/index.js

@@ -1,4 +1,4 @@
-/** @license Frontegg v6.198.0-alpha.2
+/** @license Frontegg v6.198.0-alpha.3
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@frontegg/react-hooks",
-  "version": "6.198.0-alpha.2",
+  "version": "6.198.0-alpha.3",
   "main": "./node/index.js",
   "license": "MIT",
   "author": "Frontegg LTD",
   "dependencies": {
     "@babel/runtime": "^7.18.6",
-    "@frontegg/redux-store": "6.198.0-alpha.2",
-    "@frontegg/types": "6.198.0-alpha.2",
+    "@frontegg/redux-store": "6.198.0-alpha.3",
+    "@frontegg/types": "6.198.0-alpha.3",
     "@types/react": "*",
     "get-value": "^3.0.1",
     "react-redux": "^7.x"