@frontegg/react-hooks 6.165.0-alpha.13 → 6.165.0-alpha.14

package/auth/stepUp/consts.d.ts

@@ -0,0 +1,4 @@
+/**
+ * The name of the query param that contains the max age of the step up
+ */
+export declare const STEP_UP_MAX_AGE_PARAM_NAME = "maxAge";

package/auth/stepUp/consts.js

@@ -0,0 +1,4 @@
+/**
+ * The name of the query param that contains the max age of the step up
+ */
+export const STEP_UP_MAX_AGE_PARAM_NAME = 'maxAge';

package/auth/stepUp/interfaces.d.ts

@@ -1,2 +1,14 @@
 import { StepUpState } from '@frontegg/redux-store';
 export declare type StepUpStateMapper<S> = (state: StepUpState) => S;
+/**
+ * Step up options (for stepUp function)
+ */
+export interface StepUpOptions {
+    maxAge?: number;
+}
+/**
+ * useIsSteppedUp hook options
+ */
+export interface UseIsSteppedUpOptions {
+    maxAge?: number;
+}

package/auth/stepUp/stepUp.d.ts

@@ -1,8 +1,17 @@
-import { StepUpState, StepUpActions, IsSteppedUpOptions } from '@frontegg/redux-store';
-import { StepUpStateMapper } from './interfaces';
+import { StepUpState, StepUpActions } from '@frontegg/redux-store';
+import { RedirectOptions } from '@frontegg/rest-api';
+import { StepUpStateMapper, UseIsSteppedUpOptions } from './interfaces';
 export declare function useStepUpState(): StepUpState;
 export declare function useStepUpState<S>(stateMapper: StepUpStateMapper<S>): S;
 export declare const useStepUpActions: () => StepUpActions;
+/**
+ * Redirects to the step up url with the max age param and set the redirect url in the local storage
+ * The redirect url will be used after the step up flow is done
+ * @param stepUpUrl - step up url to redirect to
+ * @param onRedirectTo - redirect to function
+ * @param maxAge - max age of step up
+ */
+export declare const redirectByStepUpUrl: (stepUpUrl: string, onRedirectTo: (path: string, opts?: RedirectOptions | undefined) => void, maxAge?: number | undefined) => void;
 /**
  * @returns max age from the query param as a number or null if not exists
  */
@@ -15,4 +24,4 @@ export declare const useStepUp: () => any;
  * @param options.maxAge - max age of step up
  * @returns true when the user is stepped up, false otherwise
  */
-export declare const useIsSteppedUp: (options?: IsSteppedUpOptions) => boolean;
+export declare const useIsSteppedUp: ({ maxAge }?: UseIsSteppedUpOptions) => boolean;

package/auth/stepUp/stepUp.js

@@ -1,12 +1,29 @@
-import { stepUpReducers, stepUpActions, getSearchParam, isSteppedUp, STEP_UP_MAX_AGE_PARAM_NAME, redirectByStepUpUrl } from '@frontegg/redux-store';
-import { reducerActionsGenerator, stateHookGenerator, useAuth, useAuthRoutes, useAuthUserOrNull, useOnRedirectTo } from '../hooks';
+import { FRONTEGG_AFTER_AUTH_REDIRECT_URL, stepUpReducers, stepUpActions, getSearchParam, isSteppedUp } from '@frontegg/redux-store';
+import { reducerActionsGenerator, stateHookGenerator, useAuthRoutes, useAuthUser, useOnRedirectTo } from '../hooks';
 import { useCallback } from 'react';
+import { STEP_UP_MAX_AGE_PARAM_NAME } from './consts';
 const defaultMapper = state => state;
 export function useStepUpState(stateMapper = defaultMapper) {
   return stateHookGenerator(stateMapper, 'stepUpState');
 }
 export const useStepUpActions = () => reducerActionsGenerator(stepUpActions, stepUpReducers);
 
+/**
+ * Redirects to the step up url with the max age param and set the redirect url in the local storage
+ * The redirect url will be used after the step up flow is done
+ * @param stepUpUrl - step up url to redirect to
+ * @param onRedirectTo - redirect to function
+ * @param maxAge - max age of step up
+ */
+export const redirectByStepUpUrl = (stepUpUrl, onRedirectTo, maxAge) => {
+  const encodedRedirectUrl = window.location.pathname + window.location.search;
+  const maxAgePart = maxAge !== undefined ? `?${STEP_UP_MAX_AGE_PARAM_NAME}=${maxAge}` : '';
+  window.localStorage.setItem(FRONTEGG_AFTER_AUTH_REDIRECT_URL, encodedRedirectUrl);
+  onRedirectTo(`${stepUpUrl}${maxAgePart}`, {
+    refresh: false
+  });
+};
+
 /**
  * @returns max age from the query param as a number or null if not exists
  */
@@ -22,27 +39,28 @@ export const useStepUp = () => {
   const {
     stepUpUrl
   } = useAuthRoutes();
-  const {
-    hostedLoginBox
-  } = useAuth();
-  const {
-    stepUpHostedLogin
-  } = useStepUpActions();
   const onRedirectTo = useOnRedirectTo();
   return useCallback(options => {
-    if (hostedLoginBox) {
-      stepUpHostedLogin(options || {});
-      return;
-    }
     redirectByStepUpUrl(stepUpUrl, onRedirectTo, options == null ? void 0 : options.maxAge);
-  }, [stepUpUrl, onRedirectTo, stepUpHostedLogin, hostedLoginBox]);
+  }, [stepUpUrl, onRedirectTo]);
 };
 
 /**
  * @param options.maxAge - max age of step up
  * @returns true when the user is stepped up, false otherwise
  */
-export const useIsSteppedUp = (options = {}) => {
-  const user = useAuthUserOrNull();
-  return isSteppedUp(user, options);
+export const useIsSteppedUp = ({
+  maxAge
+} = {}) => {
+  const {
+    amr = [],
+    acr = '',
+    auth_time
+  } = useAuthUser();
+  return isSteppedUp({
+    amr,
+    acr,
+    auth_time,
+    maxAge
+  });
 };

package/index.js

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

package/node/auth/stepUp/consts.js

@@ -0,0 +1,11 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.STEP_UP_MAX_AGE_PARAM_NAME = void 0;
+/**
+ * The name of the query param that contains the max age of the step up
+ */
+const STEP_UP_MAX_AGE_PARAM_NAME = 'maxAge';
+exports.STEP_UP_MAX_AGE_PARAM_NAME = STEP_UP_MAX_AGE_PARAM_NAME;

package/node/auth/stepUp/stepUp.js

@@ -3,11 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useStepUpActions = exports.useStepUp = exports.useIsSteppedUp = exports.getMaxAgeFromQueryParam = void 0;
+exports.useStepUpActions = exports.useStepUp = exports.useIsSteppedUp = exports.redirectByStepUpUrl = exports.getMaxAgeFromQueryParam = void 0;
 exports.useStepUpState = useStepUpState;
 var _reduxStore = require("@frontegg/redux-store");
 var _hooks = require("../hooks");
 var _react = require("react");
+var _consts = require("./consts");
 const defaultMapper = state => state;
 function useStepUpState(stateMapper = defaultMapper) {
   return (0, _hooks.stateHookGenerator)(stateMapper, 'stepUpState');
@@ -15,11 +16,28 @@ function useStepUpState(stateMapper = defaultMapper) {
 const useStepUpActions = () => (0, _hooks.reducerActionsGenerator)(_reduxStore.stepUpActions, _reduxStore.stepUpReducers);
 
 /**
- * @returns max age from the query param as a number or null if not exists
+ * Redirects to the step up url with the max age param and set the redirect url in the local storage
+ * The redirect url will be used after the step up flow is done
+ * @param stepUpUrl - step up url to redirect to
+ * @param onRedirectTo - redirect to function
+ * @param maxAge - max age of step up
  */
 exports.useStepUpActions = useStepUpActions;
+const redirectByStepUpUrl = (stepUpUrl, onRedirectTo, maxAge) => {
+  const encodedRedirectUrl = window.location.pathname + window.location.search;
+  const maxAgePart = maxAge !== undefined ? `?${_consts.STEP_UP_MAX_AGE_PARAM_NAME}=${maxAge}` : '';
+  window.localStorage.setItem(_reduxStore.FRONTEGG_AFTER_AUTH_REDIRECT_URL, encodedRedirectUrl);
+  onRedirectTo(`${stepUpUrl}${maxAgePart}`, {
+    refresh: false
+  });
+};
+
+/**
+ * @returns max age from the query param as a number or null if not exists
+ */
+exports.redirectByStepUpUrl = redirectByStepUpUrl;
 const getMaxAgeFromQueryParam = () => {
-  const str = (0, _reduxStore.getSearchParam)(_reduxStore.STEP_UP_MAX_AGE_PARAM_NAME);
+  const str = (0, _reduxStore.getSearchParam)(_consts.STEP_UP_MAX_AGE_PARAM_NAME);
   return str === undefined ? undefined : +str;
 };
 
@@ -31,20 +49,10 @@ const useStepUp = () => {
   const {
     stepUpUrl
   } = (0, _hooks.useAuthRoutes)();
-  const {
-    hostedLoginBox
-  } = (0, _hooks.useAuth)();
-  const {
-    stepUpHostedLogin
-  } = useStepUpActions();
   const onRedirectTo = (0, _hooks.useOnRedirectTo)();
   return (0, _react.useCallback)(options => {
-    if (hostedLoginBox) {
-      stepUpHostedLogin(options || {});
-      return;
-    }
-    (0, _reduxStore.redirectByStepUpUrl)(stepUpUrl, onRedirectTo, options == null ? void 0 : options.maxAge);
-  }, [stepUpUrl, onRedirectTo, stepUpHostedLogin, hostedLoginBox]);
+    redirectByStepUpUrl(stepUpUrl, onRedirectTo, options == null ? void 0 : options.maxAge);
+  }, [stepUpUrl, onRedirectTo]);
 };
 
 /**
@@ -52,8 +60,19 @@ const useStepUp = () => {
  * @returns true when the user is stepped up, false otherwise
  */
 exports.useStepUp = useStepUp;
-const useIsSteppedUp = (options = {}) => {
-  const user = (0, _hooks.useAuthUserOrNull)();
-  return (0, _reduxStore.isSteppedUp)(user, options);
+const useIsSteppedUp = ({
+  maxAge
+} = {}) => {
+  const {
+    amr = [],
+    acr = '',
+    auth_time
+  } = (0, _hooks.useAuthUser)();
+  return (0, _reduxStore.isSteppedUp)({
+    amr,
+    acr,
+    auth_time,
+    maxAge
+  });
 };
 exports.useIsSteppedUp = useIsSteppedUp;

package/node/index.js

@@ -1,4 +1,4 @@
-/** @license Frontegg v6.165.0-alpha.13
+/** @license Frontegg v6.165.0-alpha.14
  *
  * 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.165.0-alpha.13",
+  "version": "6.165.0-alpha.14",
   "main": "./node/index.js",
   "license": "MIT",
   "author": "Frontegg LTD",
   "dependencies": {
     "@babel/runtime": "^7.18.6",
-    "@frontegg/redux-store": "6.165.0-alpha.13",
-    "@frontegg/types": "6.165.0-alpha.13",
+    "@frontegg/redux-store": "6.165.0-alpha.14",
+    "@frontegg/types": "6.165.0-alpha.14",
     "@types/react": "*",
     "get-value": "^3.0.1",
     "react-redux": "^7.x"