@frontegg/react-hooks 6.178.0-alpha.3 → 6.179.0

package/FronteggProvider/index.d.ts

@@ -1 +1,12 @@
-export * from './FronteggProvider';
+import { FC, ReactNode } from 'react';
+import { ContextOptions } from '@frontegg/rest-api';
+import { FronteggAppInstance } from '@frontegg/types';
+declare type FronteggProviderProps = {
+    app?: FronteggAppInstance;
+    contextOptions?: ContextOptions;
+    setLoading?: (loading: boolean) => void;
+    children?: ReactNode | undefined;
+    alwaysVisibleChildren?: ReactNode;
+};
+export declare const FronteggStoreProvider: FC<FronteggProviderProps>;
+export {};

package/FronteggProvider/index.js

@@ -1 +1,133 @@
-export * from './FronteggProvider';
+import _extends from "@babel/runtime/helpers/esm/extends";
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
+const _excluded = ["authenticatedUrl", "signUpSuccessUrl"];
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { createFronteggStore } from '@frontegg/redux-store';
+import { ContextHolder } from '@frontegg/rest-api';
+import { useAuth, useAuthRoutes } from '../auth';
+import { Provider, FronteggStoreContext } from '../FronteggStoreContext';
+import { Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+const defaultSetLoading = loading => {
+  if (loading) {
+    document.body.classList.add('frontegg-loading');
+  } else {
+    document.body.classList.remove('frontegg-loading');
+  }
+};
+const HideChildrenIfFronteggRoutes = ({
+  children,
+  basename
+}) => {
+  const routes = useAuthRoutes();
+  const uriRef = useRef(window.location.pathname);
+  const animationFrameRef = useRef(0);
+  const [uri, setUri] = useState(window.location.pathname);
+  const checker = useCallback(() => {
+    if (uriRef.current !== window.location.pathname) {
+      uriRef.current = window.location.pathname;
+      setUri(document.location.pathname);
+    }
+    animationFrameRef.current = window.requestAnimationFrame(checker);
+  }, []);
+  useEffect(() => {
+    document.addEventListener('frontegg_onRedirectTo_fired', () => {
+      if (uriRef.current !== window.location.pathname) {
+        uriRef.current = window.location.pathname;
+        setUri(document.location.pathname);
+      }
+    });
+    window.addEventListener('popstate', () => {
+      if (uriRef.current !== window.location.pathname) {
+        uriRef.current = window.location.pathname;
+        setUri(document.location.pathname);
+      }
+    });
+    animationFrameRef.current = window.requestAnimationFrame(checker);
+    return () => {
+      window.cancelAnimationFrame(animationFrameRef.current);
+    };
+  }, [checker, setUri]);
+  const calculatedBasename = basename ? basename.endsWith('/') ? basename.substring(0, basename.length - 1) : '' : '';
+  const checkRoutes = _objectWithoutPropertiesLoose(routes, _excluded);
+  if (Object.values(checkRoutes).map(url => `${calculatedBasename}${url}`).indexOf(uri) !== -1) {
+    return null;
+  }
+  return /*#__PURE__*/_jsx(_Fragment, {
+    children: children
+  });
+};
+const FronteggContent = ({
+  children,
+  app,
+  setLoading
+}) => {
+  var _app$options, _app$options2;
+  const {
+    isLoading
+  } = useAuth(({
+    isLoading
+  }) => ({
+    isLoading
+  }));
+  const customLoginBox = !app || (app == null ? void 0 : (_app$options = app.options) == null ? void 0 : _app$options.customLoginBox) === true;
+  const isNextJS = (app == null ? void 0 : (_app$options2 = app.options) == null ? void 0 : _app$options2.framework) === 'nextjs';
+  const alwaysShowChildren = customLoginBox || isNextJS;
+  const loadingRef = useRef(undefined);
+  if (isLoading !== loadingRef.current && !isNextJS) {
+    loadingRef.current = isLoading;
+    setLoading(isLoading);
+  }
+  if (alwaysShowChildren) {
+    return /*#__PURE__*/_jsx(_Fragment, {
+      children: children
+    });
+  }
+  if (isLoading && !isNextJS) {
+    return null;
+  }
+  return /*#__PURE__*/_jsx(HideChildrenIfFronteggRoutes, {
+    basename: app == null ? void 0 : app.options.basename,
+    children: children
+  });
+};
+export const FronteggStoreProvider = props => {
+  var _app$options$contextO, _app$options3, _app$options$previewM, _app$options4, _app$options5, _app$options6;
+  const {
+    children,
+    app,
+    contextOptions,
+    setLoading = defaultSetLoading,
+    alwaysVisibleChildren
+  } = props;
+
+  // TODO: make this optionals more readable
+  const context = (_app$options$contextO = app == null ? void 0 : (_app$options3 = app.options) == null ? void 0 : _app$options3.contextOptions) != null ? _app$options$contextO : contextOptions;
+  if (!context) {
+    throw Error('contextOptions must not be null or undefined');
+  }
+  const previewMode = (_app$options$previewM = app == null ? void 0 : (_app$options4 = app.options) == null ? void 0 : _app$options4.previewMode) != null ? _app$options$previewM : false;
+  const authOptions = app != null && (_app$options5 = app.options) != null && _app$options5.authOptions ? _extends({}, app.options.authOptions, {
+    hostedLoginBox: app.options.hostedLoginBox
+  }) : {
+    hostedLoginBox: app == null ? void 0 : (_app$options6 = app.options) == null ? void 0 : _app$options6.hostedLoginBox
+  };
+  ContextHolder.setContext(context);
+  const store = useMemo(() => {
+    var _app$name, _app$options7;
+    return createFronteggStore({
+      context,
+      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, {
+    context: FronteggStoreContext,
+    store: store,
+    children: [alwaysVisibleChildren, /*#__PURE__*/_jsx(FronteggContent, {
+      setLoading: setLoading,
+      app: app,
+      children: children
+    })]
+  });
+};

package/FronteggStoreContext/index.d.ts

@@ -1 +1,13 @@
-export * from './FronteggStoreContext';
+import React, { FC, ReactNode } from 'react';
+import { ReactReduxContextValue, ProviderProps } from 'react-redux';
+import type { Action, AnyAction } from '@frontegg/redux-store';
+export declare const FronteggStoreContext: React.Context<ReactReduxContextValue<any, AnyAction>>;
+export declare const useSelector: <Selected extends unknown>(selector: (state: any) => Selected, equalityFn?: ((previous: Selected, next: Selected) => boolean) | undefined) => Selected;
+export declare const useDispatch: () => import("redux").Dispatch<AnyAction>;
+export declare const useStore: () => import("redux").Store<any, AnyAction>;
+export { shallowEqual, Provider as ReactReduxProvider } from 'react-redux';
+declare type ProviderWithChildren<A extends Action = AnyAction> = FC<ProviderProps<A> & {
+    children?: ReactNode | undefined;
+}>;
+export declare const Provider: ProviderWithChildren;
+export default FronteggStoreContext;

package/FronteggStoreContext/index.js

@@ -1 +1,14 @@
-export * from './FronteggStoreContext';
+import React from 'react';
+import { createSelectorHook, createDispatchHook, createStoreHook, Provider as ReactReduxProvider } from 'react-redux';
+export const FronteggStoreContext = /*#__PURE__*/React.createContext(null);
+
+// @ts-ignore
+if (process.env.NODE_ENV !== 'production') {
+  FronteggStoreContext.displayName = 'FronteggStoreContext';
+}
+export const useSelector = createSelectorHook(FronteggStoreContext);
+export const useDispatch = createDispatchHook(FronteggStoreContext);
+export const useStore = createStoreHook(FronteggStoreContext);
+export { shallowEqual, Provider as ReactReduxProvider } from 'react-redux';
+export const Provider = ReactReduxProvider;
+export default FronteggStoreContext;

package/audits/auditLogs.d.ts

@@ -1,3 +1,5 @@
-import { AuditLogsState, AuditsActions } from '@frontegg/redux-store';
+import { AuditLogsActions, AuditLogsState } from '@frontegg/redux-store';
+export declare type AuditLogsStateMapper<S> = (state: AuditLogsState) => S;
 export declare function useAuditLogsState(): AuditLogsState;
-export declare const useAuditLogsActions: () => AuditsActions;
+export declare function useAuditLogsState<S>(stateMapper: AuditLogsStateMapper<S>): S;
+export declare const useAuditLogsActions: () => AuditLogsActions;

package/audits/auditLogs.js

@@ -1,9 +1,7 @@
-import { useStore } from '../FronteggStoreContext';
-import { useSnapshot } from 'valtio/react';
-export function useAuditLogsState() {
-  const state = useStore().store.auditLogs.auditLogsState;
-  return useSnapshot(state);
+import { reducerActionsGenerator, stateHookGenerator } from './hooks';
+import { auditLogsActions, auditLogsReducers } from '@frontegg/redux-store';
+const defaultMapper = state => state;
+export function useAuditLogsState(stateMapper = defaultMapper) {
+  return stateHookGenerator(stateMapper, 'auditLogsState');
 }
-export const useAuditLogsActions = () => {
-  return useStore().stateActions.auditLogs;
-};
+export const useAuditLogsActions = () => reducerActionsGenerator(auditLogsActions, auditLogsReducers);

package/audits/auditsMetadata.d.ts

@@ -1,3 +1,5 @@
-import { AuditsActions, AuditsMetadataState } from '@frontegg/redux-store';
+import { AuditsMetadataActions, AuditsMetadataState } from '@frontegg/redux-store';
+export declare type AuditsMetadataStateMapper<S> = (state: AuditsMetadataState) => S;
 export declare function useAuditsMetadataState(): AuditsMetadataState;
-export declare const useAuditsMetadataActions: () => AuditsActions;
+export declare function useAuditsMetadataState<S>(stateMapper: AuditsMetadataStateMapper<S>): S;
+export declare const useAuditsMetadataActions: () => AuditsMetadataActions;

package/audits/auditsMetadata.js

@@ -1,9 +1,7 @@
-import { useStore } from '../FronteggStoreContext';
-import { useSnapshot } from 'valtio/react';
-export function useAuditsMetadataState() {
-  const state = useStore().store.auditLogs.auditsMetadataState;
-  return useSnapshot(state);
+import { auditsMetadataActions, auditsMetadataReducers } from '@frontegg/redux-store';
+import { reducerActionsGenerator, stateHookGenerator } from './hooks';
+const defaultMapper = state => state;
+export function useAuditsMetadataState(stateMapper = defaultMapper) {
+  return stateHookGenerator(stateMapper, 'auditsMetadataState');
 }
-export const useAuditsMetadataActions = () => {
-  return useStore().stateActions.auditLogs;
-};
+export const useAuditsMetadataActions = () => reducerActionsGenerator(auditsMetadataActions, auditsMetadataReducers);

package/audits/hooks.d.ts

@@ -1,9 +1,17 @@
+import { CaseReducerActions, SliceCaseReducers } from '@frontegg/redux-store';
 import { AuditsActions, AuditsState } from '@frontegg/redux-store';
 export declare type AuditsMapper = {
     state: (state: AuditsState) => any;
     actions: (actions: AuditsActions) => any;
 };
+export declare type StateHookFunction<T> = (() => T) & (<S extends object>(mapper: (state: T) => S) => S);
 export declare type AuditsStateMapper<S> = (state: AuditsState) => S;
 export declare function useAuditsState(): AuditsState;
 export declare function useAuditsState<S>(stateMapper: AuditsStateMapper<S>): S;
 export declare const useAuditsActions: () => AuditsActions;
+/**
+ * hooks helpers
+ */
+export declare const sliceReducerActionsBy: <T extends SliceCaseReducers<any>>(reducer: T) => CaseReducerActions<T>;
+export declare const stateHookGenerator: (stateMapper: any, subState: keyof AuditsState) => any;
+export declare const reducerActionsGenerator: (actions: any, reducers: SliceCaseReducers<any>) => any;

package/audits/hooks.js

@@ -1,14 +1,38 @@
-import { useStore } from '../FronteggStoreContext';
-import { useSnapshot } from 'valtio/react';
+import _extends from "@babel/runtime/helpers/esm/extends";
+import { useMemo } from 'react';
+import { bindActionCreators } from '@frontegg/redux-store';
+import { shallowEqual } from 'react-redux';
+import { useSelector, useDispatch } from '../FronteggStoreContext';
+import { auditsActions, auditsStoreName } from '@frontegg/redux-store';
 const defaultMapper = {
   state: state => state,
   actions: actions => actions
 };
 export function useAuditsState(stateMapper = defaultMapper.state) {
-  const state = useStore().store.auditLogs;
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  return stateMapper(useSnapshot(state));
+  return useSelector(state => stateMapper(state[auditsStoreName]), shallowEqual);
 }
 export const useAuditsActions = () => {
-  return useStore().stateActions.auditLogs;
+  const dispatch = useDispatch();
+  return useMemo(() => bindActionCreators(auditsActions, dispatch), [auditsActions]);
+};
+
+/**
+ * hooks helpers
+ */
+export const sliceReducerActionsBy = reducer => {
+  const reducerKeys = Object.keys(reducer);
+  const reducerActions = reducerKeys.map(key => ({
+    [key]: auditsActions[key]
+  }));
+  return reducerActions.reduce((p, n) => _extends({}, p, n), {});
+};
+export const stateHookGenerator = (stateMapper, subState) => {
+  return useSelector(state => {
+    var _stateMapper;
+    return (_stateMapper = stateMapper == null ? void 0 : stateMapper(state[auditsStoreName][subState])) != null ? _stateMapper : state[auditsStoreName][subState];
+  }, shallowEqual);
+};
+export const reducerActionsGenerator = (actions, reducers) => {
+  const dispatch = useDispatch();
+  return useMemo(() => bindActionCreators(_extends({}, actions, sliceReducerActionsBy(reducers)), dispatch), [dispatch]);
 };

package/auth/{allAccounts.d.ts → MSP/allAccounts.d.ts}

@@ -1,7 +1,9 @@
-import { IAllAccountsState, AllAccountsActions, IAllAccountsDialogsState, AllAccountsDialogActions } from '@frontegg/redux-store';
+import { IAllAccountsState, AllAccountsActions, IAllAccountsDialogsState, AllAccountsDialogsActions } from '@frontegg/redux-store';
 export declare type AllAccountsStateMapper<S> = (state: IAllAccountsState) => S;
 export declare function useAllAccountsState(): IAllAccountsState;
 export declare function useAllAccountsState<S>(stateMapper: AllAccountsStateMapper<S>): S;
 export declare const useAllAccountsActions: () => AllAccountsActions;
+export declare type AllAccountsDialogsStateMapper<S> = (state: IAllAccountsDialogsState) => S;
 export declare function useAllAccountsDialogsState(): IAllAccountsDialogsState;
-export declare const useAllAccountsDialogsActions: () => AllAccountsDialogActions;
+export declare function useAllAccountsDialogsState<S>(stateMapper: AllAccountsDialogsStateMapper<S>): S;
+export declare const useAllAccountsDialogsActions: () => AllAccountsDialogsActions;

package/auth/MSP/allAccounts.js

@@ -0,0 +1,15 @@
+import { allAccountsActions, allAccountsReducers, allAccountsDialogsReducers } from '@frontegg/redux-store';
+import { reducerActionsGenerator, stateHookGenerator } from '../hooks';
+const defaultMapper = state => state;
+export function useAllAccountsState(stateMapper = defaultMapper) {
+  return stateHookGenerator(stateMapper, 'allAccountsState');
+}
+export const useAllAccountsActions = () => reducerActionsGenerator(allAccountsActions, allAccountsReducers);
+
+//dialogs
+
+const defaultDialogsMapper = state => state;
+export function useAllAccountsDialogsState(stateMapper = defaultDialogsMapper) {
+  return stateHookGenerator(stateMapper, 'allAccountsDialogsState');
+}
+export const useAllAccountsDialogsActions = () => reducerActionsGenerator({}, allAccountsDialogsReducers);

package/auth/acceptInvitation.js

@@ -1,13 +1,8 @@
-import { useStore } from '../FronteggStoreContext';
-import { useSnapshot } from 'valtio/react';
-
-// TODO: remove useless stateMapper, valtio already does this
-
+import { acceptInvitationReducers, acceptInvitationActions } from '@frontegg/redux-store';
+import { reducerActionsGenerator, stateHookGenerator } from './hooks';
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 const defaultMapper = state => state;
 export function useAcceptInvitationState(stateMapper = defaultMapper) {
-  const state = useStore().store.auth.acceptInvitationState;
-  return stateMapper(useSnapshot(state));
+  return stateHookGenerator(stateMapper, 'acceptInvitationState');
 }
-export const useAcceptInvitationActions = () => {
-  return useStore().stateActions.auth.acceptInvitationActions;
-};
+export const useAcceptInvitationActions = () => reducerActionsGenerator(acceptInvitationActions, acceptInvitationReducers);

package/auth/activateAccount.js

@@ -1,13 +1,7 @@
-import { useStore } from '../FronteggStoreContext';
-import { useSnapshot } from 'valtio/react';
-
-// TODO: remove useless stateMapper, valtio already does this
-
+import { activateAccountReducers, activateAccountActions } from '@frontegg/redux-store';
+import { reducerActionsGenerator, stateHookGenerator } from './hooks';
 const defaultMapper = state => state;
 export function useActivateAccountState(stateMapper = defaultMapper) {
-  const state = useStore().store.auth.activateAccountState;
-  return stateMapper(useSnapshot(state));
+  return stateHookGenerator(stateMapper, 'activateState');
 }
-export const useActivateAccountActions = () => {
-  return useStore().stateActions.auth.activateAccountActions;
-};
+export const useActivateAccountActions = () => reducerActionsGenerator(activateAccountActions, activateAccountReducers);

package/auth/apiTokens.d.ts

@@ -1,3 +1,5 @@
 import { ApiTokensActions, ApiTokensState } from '@frontegg/redux-store';
+export declare type ApiTokensStateMapper<S> = (state: ApiTokensState) => S;
 export declare function useApiTokensState(): ApiTokensState;
+export declare function useApiTokensState<S>(stateMapper: ApiTokensStateMapper<S>): S;
 export declare const useApiTokensActions: () => ApiTokensActions;

package/auth/apiTokens.js

@@ -1,9 +1,7 @@
-import { useStore } from '../FronteggStoreContext';
-import { useSnapshot } from 'valtio/react';
-export function useApiTokensState() {
-  const state = useStore().store.auth.apiTokensState;
-  return useSnapshot(state);
+import { apiTokensActions, apiTokensReducers } from '@frontegg/redux-store';
+import { reducerActionsGenerator, stateHookGenerator } from './hooks';
+const defaultMapper = state => state;
+export function useApiTokensState(stateMapper = defaultMapper) {
+  return stateHookGenerator(stateMapper, 'apiTokensState');
 }
-export const useApiTokensActions = () => {
-  return useStore().stateActions.auth.apiTokensActions;
-};
+export const useApiTokensActions = () => reducerActionsGenerator(apiTokensActions, apiTokensReducers);

package/auth/customLogin.d.ts

@@ -1,7 +1,10 @@
-import { CustomLoginState, CustomLoginActions } from '@frontegg/redux-store';
+import { CustomLoginActions } from '@frontegg/redux-store';
+import { CustomLoginState } from '@frontegg/types';
+export declare type CustomLoginStateMapper<S> = (state: CustomLoginState) => S;
 export declare function useCustomLoginState(): CustomLoginState;
+export declare function useCustomLoginState<S>(stateMapper: CustomLoginStateMapper<S>): S;
 export declare const useCustomLoginActions: () => CustomLoginActions;
 export declare const useCustomLoginTheme: () => {
-    customLoginTheme: any;
+    customLoginTheme: import("@frontegg/types").LoginBoxThemeOptions | undefined;
     getCustomLoginThemeValue: (path?: string | undefined) => any;
 };

package/auth/customLogin.js

@@ -1,17 +1,18 @@
-import { useCallback } from 'react';
+import { customLoginActions, customLoginReducers } from '@frontegg/redux-store';
+import { reducerActionsGenerator, stateHookGenerator } from './hooks';
 import getValue from 'get-value';
-import { useStore } from '../FronteggStoreContext';
-import { useSnapshot } from 'valtio/react';
-export function useCustomLoginState() {
-  const state = useStore().store.auth.customLoginState;
-  return useSnapshot(state);
+import { useCallback } from 'react';
+const defaultMapper = state => state;
+export function useCustomLoginState(stateMapper = defaultMapper) {
+  return stateHookGenerator(stateMapper, 'customLoginState');
 }
-export const useCustomLoginActions = () => {
-  return useStore().stateActions.auth.customLoginActions;
+export const useCustomLoginActions = () => reducerActionsGenerator(customLoginActions, customLoginReducers);
+const themeMapper = state => {
+  var _state$tenantMetadata, _state$tenantMetadata2, _state$tenantMetadata3;
+  return (_state$tenantMetadata = state.tenantMetadata) == null ? void 0 : (_state$tenantMetadata2 = _state$tenantMetadata.configuration) == null ? void 0 : (_state$tenantMetadata3 = _state$tenantMetadata2.themeV2) == null ? void 0 : _state$tenantMetadata3.loginBox;
 };
 export const useCustomLoginTheme = () => {
-  var _useCustomLoginState$, _useCustomLoginState$2, _useCustomLoginState$3;
-  const customLoginTheme = (_useCustomLoginState$ = useCustomLoginState().tenantMetadata) == null ? void 0 : (_useCustomLoginState$2 = _useCustomLoginState$.configuration) == null ? void 0 : (_useCustomLoginState$3 = _useCustomLoginState$2.themeV2) == null ? void 0 : _useCustomLoginState$3.loginBox;
+  const customLoginTheme = useCustomLoginState(themeMapper);
   const getCustomLoginThemeValue = useCallback(path => {
     return path && customLoginTheme ? getValue(customLoginTheme, path) : customLoginTheme;
   }, [customLoginTheme]);

package/auth/entitlements.d.ts

@@ -1,22 +1,22 @@
+import { Entitlement, EntitledToOptions } from '@frontegg/redux-store';
 import { CustomAttributes } from '@frontegg/entitlements-javascript-commons';
-import { EntitledToOptions, Entitlement } from '@frontegg/redux-store';
 /**
- @param key feature key
- @param customAttributes user attributes
- @returns if the user is entitled to the given feature and attributes. Attaching the justification if not
- */
+  @param key feature key
+  @param customAttributes user attributes
+  @returns if the user is entitled to the given feature and attributes. Attaching the justification if not
+*/
 export declare const useFeatureEntitlements: (key: string, customAttributes?: Record<string, string | number | boolean | Date> | undefined) => Entitlement;
 /**
- @param key permission key
- @param customAttributes user attributes
- @returns if the user is entitled to the given permission and attributes. Attaching the justification if not
- */
+  @param key permission key
+  @param customAttributes user attributes
+  @returns if the user is entitled to the given permission and attributes. Attaching the justification if not
+*/
 export declare const usePermissionEntitlements: (key: string, customAttributes?: Record<string, string | number | boolean | Date> | undefined) => Entitlement;
 /**
- @param entitledToOptions including permission or feature key
- @param customAttributes user attributes
- @returns if the user is entitled to the given feature or permission and attributes (check only one). Attaching the justification if not
- */
+  @param entitledToOptions including permission or feature key
+  @param customAttributes user attributes
+  @returns if the user is entitled to the given feature or permission and attributes (check only one). Attaching the justification if not
+*/
 export declare const useEntitlements: (options: EntitledToOptions, customAttributes?: Record<string, string | number | boolean | Date> | undefined) => Entitlement;
 /**
  @param entitledToOptions including permission or feature key
@@ -27,7 +27,7 @@ export declare const useEntitlementsActions: () => {
 };
 /**
  @returns if the option to use entitlements is enabled
- */
+  */
 export declare const useEntitlementsOptions: () => {
     isEntitlementsEnabled: boolean;
     isEntitledTo: (options: EntitledToOptions, customAttributes?: Record<string, string | number | boolean | Date> | undefined) => Entitlement;

package/auth/entitlements.js

@@ -1,27 +1,23 @@
+import { getPermissionEntitlements, getFeatureEntitlements, getEntitlements } from '@frontegg/redux-store';
 import { FeatureFlags, USE_ENTITLEMENTS_V2_ENDPOINT_FF } from '@frontegg/rest-api';
-import { useAuthUserOrNull } from './hooks';
+import { useAuth } from './hooks';
 import { useMemo } from 'react';
 import { useRootState, useShadowDom } from '../common';
 import { useFeatureFlags } from '../flags';
-import { useStore } from '../FronteggStoreContext';
-import { useSnapshot } from 'valtio/react';
-import { getEntitlements, getFeatureEntitlements, getPermissionEntitlements } from '@frontegg/redux-store';
 
 /**
  * @returns entitlemenets state as stored in the user
  */
-const useEntitlementsState = () => {
-  var _useSnapshot$user$ent, _useSnapshot$user;
-  const state = useStore().store.auth;
-  return (_useSnapshot$user$ent = (_useSnapshot$user = useSnapshot(state).user) == null ? void 0 : _useSnapshot$user.entitlements) != null ? _useSnapshot$user$ent : {};
-};
+const useEntitlementsState = () => useAuth(({
+  user
+}) => user == null ? void 0 : user.entitlements);
 
 /**
  * @returns user state
  */
-const useUserState = () => {
-  return useAuthUserOrNull() || undefined;
-};
+const useUserState = () => useAuth(({
+  user
+}) => user);
 
 /**
  * @param customAttributes user attributes
@@ -46,10 +42,10 @@ const useEntitlementsQueryData = customAttributes => {
 };
 
 /**
- @param key feature key
- @param customAttributes user attributes
- @returns if the user is entitled to the given feature and attributes. Attaching the justification if not
- */
+  @param key feature key
+  @param customAttributes user attributes
+  @returns if the user is entitled to the given feature and attributes. Attaching the justification if not
+*/
 export const useFeatureEntitlements = (key, customAttributes) => {
   const {
     entitlements,
@@ -60,10 +56,10 @@ export const useFeatureEntitlements = (key, customAttributes) => {
 };
 
 /**
- @param key permission key
- @param customAttributes user attributes
- @returns if the user is entitled to the given permission and attributes. Attaching the justification if not
- */
+  @param key permission key
+  @param customAttributes user attributes
+  @returns if the user is entitled to the given permission and attributes. Attaching the justification if not
+*/
 export const usePermissionEntitlements = (key, customAttributes) => {
   const {
     entitlements,
@@ -74,10 +70,10 @@ export const usePermissionEntitlements = (key, customAttributes) => {
 };
 
 /**
- @param entitledToOptions including permission or feature key
- @param customAttributes user attributes
- @returns if the user is entitled to the given feature or permission and attributes (check only one). Attaching the justification if not
- */
+  @param entitledToOptions including permission or feature key
+  @param customAttributes user attributes
+  @returns if the user is entitled to the given feature or permission and attributes (check only one). Attaching the justification if not
+*/
 export const useEntitlements = (options, customAttributes) => {
   const {
     entitlements,
@@ -112,7 +108,7 @@ export const useEntitlementsActions = () => {
 
 /**
  @returns if the option to use entitlements is enabled
- */
+  */
 export const useEntitlementsOptions = () => {
   var _entitlementsOptions$;
   const {

package/auth/forgotPassword.d.ts

@@ -1,3 +1,5 @@
 import { ForgotPasswordState, ForgotPasswordActions } from '@frontegg/redux-store';
+export declare type ForgotPasswordStateMapper<S> = (state: ForgotPasswordState) => S;
 export declare function useForgotPasswordState(): ForgotPasswordState;
+export declare function useForgotPasswordState<S>(stateMapper: ForgotPasswordStateMapper<S>): S;
 export declare const useForgotPasswordActions: () => ForgotPasswordActions;

package/auth/forgotPassword.js

@@ -1,9 +1,7 @@
-import { useStore } from '../FronteggStoreContext';
-import { useSnapshot } from 'valtio/react';
-export function useForgotPasswordState() {
-  const state = useStore().store.auth.forgotPasswordState;
-  return useSnapshot(state);
+import { forgotPasswordReducers, forgotPasswordActions } from '@frontegg/redux-store';
+import { reducerActionsGenerator, stateHookGenerator } from './hooks';
+const defaultMapper = state => state;
+export function useForgotPasswordState(stateMapper = defaultMapper) {
+  return stateHookGenerator(stateMapper, 'forgotPasswordState');
 }
-export const useForgotPasswordActions = () => {
-  return useStore().stateActions.auth.forgotPasswordActions;
-};
+export const useForgotPasswordActions = () => reducerActionsGenerator(forgotPasswordActions, forgotPasswordReducers);

package/auth/groups.d.ts

@@ -1,5 +1,9 @@
 import { GroupsState, GroupsActions, GroupsDialogsState, GroupsDialogsActions } from '@frontegg/redux-store';
+export declare type GroupsStateMapper<S> = (state: GroupsState) => S;
 export declare function useGroupsState(): GroupsState;
+export declare function useGroupsState<S>(stateMapper: GroupsStateMapper<S>): S;
 export declare const useGroupsActions: () => GroupsActions;
+export declare type GroupsDialogsStateMapper<S> = (state: GroupsDialogsState) => S;
 export declare function useGroupsDialogsState(): GroupsDialogsState;
+export declare function useGroupsDialogsState<S>(stateMapper: GroupsDialogsStateMapper<S>): S;
 export declare const useGroupsDialogsActions: () => GroupsDialogsActions;

package/auth/groups.js

@@ -1,14 +1,15 @@
-import { useStore } from '../FronteggStoreContext';
-import { useSnapshot } from 'valtio/react';
-export function useGroupsState() {
-  return useSnapshot(useStore().store.auth.groupsState);
+import { groupsActions, groupsReducers, groupsDialogsActions, groupsDialogsReducers } from '@frontegg/redux-store';
+import { reducerActionsGenerator, stateHookGenerator } from './hooks';
+const defaultMapper = state => state;
+export function useGroupsState(stateMapper = defaultMapper) {
+  return stateHookGenerator(stateMapper, 'groupsState');
 }
-export const useGroupsActions = () => {
-  return useStore().stateActions.auth.groupsActions;
-};
-export function useGroupsDialogsState() {
-  return useSnapshot(useStore().store.auth.groupsDialogsState);
+export const useGroupsActions = () => reducerActionsGenerator(groupsActions, groupsReducers);
+
+//dialogs
+
+const defaultDialogsMapper = state => state;
+export function useGroupsDialogsState(stateMapper = defaultDialogsMapper) {
+  return stateHookGenerator(stateMapper, 'groupsDialogsState');
 }
-export const useGroupsDialogsActions = () => {
-  return useStore().stateActions.auth.groupsDialogsActions;
-};
+export const useGroupsDialogsActions = () => reducerActionsGenerator(groupsDialogsActions, groupsDialogsReducers);