@frontegg/redux-store 6.155.0-alpha.3 → 6.155.0-alpha.5

package/auth/LoginState/sagas/afterAuthNavigation.saga.d.ts

@@ -3,13 +3,15 @@ import { User } from '../../interfaces';
 interface AfterAuthNavigationUtilOptions {
     customLoginAuthenticatedUrl?: string;
     forceStepUpUrl?: string;
+    shouldStepUpDuringLogin?: boolean;
 }
 /**
  * Utility to share after auth navigation flow between login and step up
  * @param resetStateAction reset state action
  * @param customLoginAuthenticatedUrl custom login authenticated url if exists
+ * @param shouldStepUpDuringLogin true when it's login after step up flow
  */
-export declare function afterAuthNavigationUtil(resetStateAction: () => Action, { customLoginAuthenticatedUrl, forceStepUpUrl }?: AfterAuthNavigationUtilOptions): Generator<import("redux-saga/effects").CallEffect<true> | import("redux-saga/effects").CallEffect<string>, void, string>;
+export declare function afterAuthNavigationUtil(resetStateAction: () => Action, { customLoginAuthenticatedUrl, forceStepUpUrl, shouldStepUpDuringLogin }?: AfterAuthNavigationUtilOptions): Generator<import("redux-saga/effects").CallEffect<true> | import("redux-saga/effects").CallEffect<string>, void, string | undefined>;
 /**
  * After auth navigation for login flow
  * Handling also step up scenario when user silently logout to continue to step up

package/auth/LoginState/sagas/afterAuthNavigation.saga.js

@@ -2,7 +2,7 @@ import { ContextHolder } from '@frontegg/rest-api';
 import { delay, put, select, call } from 'redux-saga/effects';
 import { loadCustomLoginRoutes } from '../../CustomLoginState/saga';
 import { actions } from '../../reducer';
-import { getPathAndSearchParamsFromUrl, getRedirectUrl } from '../utils';
+import { getPathAndSearchParamsFromUrl, getRedirectUrl, isAbsoluteUrl } from '../utils';
 import { FRONTEGG_AFTER_AUTH_REDIRECT_URL } from '../../../constants';
 import { isSteppedUp } from '../../StepUpState';
 import { SHOULD_STEP_UP_KEY } from '../../StepUpState/consts';
@@ -43,20 +43,32 @@ function* getUrlForAfterAuthNavigation(customLoginAuthenticatedUrl) {
  * Utility to share after auth navigation flow between login and step up
  * @param resetStateAction reset state action
  * @param customLoginAuthenticatedUrl custom login authenticated url if exists
+ * @param shouldStepUpDuringLogin true when it's login after step up flow
  */
 export function* afterAuthNavigationUtil(resetStateAction, {
   customLoginAuthenticatedUrl,
-  forceStepUpUrl
+  forceStepUpUrl,
+  shouldStepUpDuringLogin
 } = {}) {
   const onRedirectTo = ContextHolder.onRedirectTo;
-  let redirectUrl;
+  let redirectUrl = undefined;
   if (forceStepUpUrl) {
     // scenario to get to here: invalid max age, try to step up -> logout, login with magic code/link -> redirect to step up page for email code as the second factor
     // we don't want to remove the FRONTEGG_AFTER_AUTH_REDIRECT_URL when we are in the step up flow
     redirectUrl = forceStepUpUrl;
   } else {
     var _window;
-    redirectUrl = yield call(getUrlForAfterAuthNavigation, customLoginAuthenticatedUrl);
+    if (shouldStepUpDuringLogin) {
+      // getUrlForAfterAuthNavigation give priority to the redirectUrl
+      // avoiding use of getUrlForAfterAuthNavigation because we don't want to use the redirectUrl for magic link for example
+      const localStorageRedirectUrl = window.localStorage.getItem(FRONTEGG_AFTER_AUTH_REDIRECT_URL);
+      if (localStorageRedirectUrl && !isAbsoluteUrl(localStorageRedirectUrl)) {
+        redirectUrl = localStorageRedirectUrl;
+      }
+    }
+    if (!redirectUrl) {
+      redirectUrl = yield call(getUrlForAfterAuthNavigation, customLoginAuthenticatedUrl);
+    }
     (_window = window) == null ? void 0 : _window.localStorage.removeItem(FRONTEGG_AFTER_AUTH_REDIRECT_URL);
   }
   yield delay(200);
@@ -103,7 +115,8 @@ export function* afterAuthNavigation() {
     });
   }
   yield call(afterAuthNavigationUtil, actions.resetLoginState, {
-    customLoginAuthenticatedUrl: customLoginURL
+    customLoginAuthenticatedUrl: customLoginURL,
+    shouldStepUpDuringLogin: !!shouldStepUp
   });
 }
 

package/auth/LoginState/utils.d.ts

@@ -1,5 +1,6 @@
 import { IEmailPasswordlessPreLogin, ILoginResponse, IPasswordlessPreLogin, MFAStrategyEnum, UserMFADevicesResponse } from '@frontegg/rest-api';
 import { MFAStep } from '../MfaState/interfaces';
+export declare const isAbsoluteUrl: (path: string) => boolean;
 export declare const getRedirectUrl: ({ authenticatedUrl, enforceRedirectToSameSite, allowedRedirectOrigins, includeQueryParam, }: {
     authenticatedUrl: string;
     enforceRedirectToSameSite: boolean;

package/auth/LoginState/utils.js

@@ -1,6 +1,6 @@
 import { ContextHolder, MFAStrategyEnum } from '@frontegg/rest-api';
 import { MFAStep } from '../MfaState/interfaces';
-const isAbsoluteUrl = path => {
+export const isAbsoluteUrl = path => {
   try {
     new URL(path);
     return true;

package/auth/StepUpState/generateStepUpSession.saga.js

@@ -59,12 +59,13 @@ function* handleError(error) {
     }));
     return;
   }
-  yield put(actions.logout());
   window.localStorage.setItem(SHOULD_STEP_UP_KEY, 'true');
   const {
     routes
   } = yield select(state => state.auth);
-  ContextHolder.onRedirectTo(routes.loginUrl);
+  ContextHolder.onRedirectTo(routes.logoutUrl, {
+    preserveQueryParams: true
+  });
 }
 
 /**

package/index.js

@@ -1,4 +1,4 @@
-/** @license Frontegg v6.155.0-alpha.3
+/** @license Frontegg v6.155.0-alpha.5
  *
  * 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/LoginState/sagas/afterAuthNavigation.saga.js

@@ -50,20 +50,32 @@ function* getUrlForAfterAuthNavigation(customLoginAuthenticatedUrl) {
  * Utility to share after auth navigation flow between login and step up
  * @param resetStateAction reset state action
  * @param customLoginAuthenticatedUrl custom login authenticated url if exists
+ * @param shouldStepUpDuringLogin true when it's login after step up flow
  */
 function* afterAuthNavigationUtil(resetStateAction, {
   customLoginAuthenticatedUrl,
-  forceStepUpUrl
+  forceStepUpUrl,
+  shouldStepUpDuringLogin
 } = {}) {
   const onRedirectTo = _restApi.ContextHolder.onRedirectTo;
-  let redirectUrl;
+  let redirectUrl = undefined;
   if (forceStepUpUrl) {
     // scenario to get to here: invalid max age, try to step up -> logout, login with magic code/link -> redirect to step up page for email code as the second factor
     // we don't want to remove the FRONTEGG_AFTER_AUTH_REDIRECT_URL when we are in the step up flow
     redirectUrl = forceStepUpUrl;
   } else {
     var _window;
-    redirectUrl = yield (0, _effects.call)(getUrlForAfterAuthNavigation, customLoginAuthenticatedUrl);
+    if (shouldStepUpDuringLogin) {
+      // getUrlForAfterAuthNavigation give priority to the redirectUrl
+      // avoiding use of getUrlForAfterAuthNavigation because we don't want to use the redirectUrl for magic link for example
+      const localStorageRedirectUrl = window.localStorage.getItem(_constants.FRONTEGG_AFTER_AUTH_REDIRECT_URL);
+      if (localStorageRedirectUrl && !(0, _utils.isAbsoluteUrl)(localStorageRedirectUrl)) {
+        redirectUrl = localStorageRedirectUrl;
+      }
+    }
+    if (!redirectUrl) {
+      redirectUrl = yield (0, _effects.call)(getUrlForAfterAuthNavigation, customLoginAuthenticatedUrl);
+    }
     (_window = window) == null ? void 0 : _window.localStorage.removeItem(_constants.FRONTEGG_AFTER_AUTH_REDIRECT_URL);
   }
   yield (0, _effects.delay)(200);
@@ -110,7 +122,8 @@ function* afterAuthNavigation() {
     });
   }
   yield (0, _effects.call)(afterAuthNavigationUtil, _reducer.actions.resetLoginState, {
-    customLoginAuthenticatedUrl: customLoginURL
+    customLoginAuthenticatedUrl: customLoginURL,
+    shouldStepUpDuringLogin: !!shouldStepUp
   });
 }
 

package/node/auth/LoginState/utils.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getSearchParamsFromUrl = exports.getSearchParam = exports.getRedirectUrl = exports.getPathAndSearchParamsFromUrl = exports.getNumberOfMfaDevices = exports.getMfaStepForNotEnrolledUsers = exports.getMfaStepForEnrolledUsers = exports.TENANT_ID_PARAM_KEY = void 0;
+exports.isAbsoluteUrl = exports.getSearchParamsFromUrl = exports.getSearchParam = exports.getRedirectUrl = exports.getPathAndSearchParamsFromUrl = exports.getNumberOfMfaDevices = exports.getMfaStepForNotEnrolledUsers = exports.getMfaStepForEnrolledUsers = exports.TENANT_ID_PARAM_KEY = void 0;
 exports.isEmailPayload = isEmailPayload;
 exports.isOauthCallbackRoute = exports.isMfaRequired = void 0;
 var _restApi = require("@frontegg/rest-api");
@@ -16,6 +16,7 @@ const isAbsoluteUrl = path => {
     return false;
   }
 };
+exports.isAbsoluteUrl = isAbsoluteUrl;
 const isValidRedirectUrl = (redirectUrl, allowedRedirectOrigins) => {
   const currentUrl = new URL(window.location.href);
   const redirectURL = new URL(redirectUrl);

package/node/auth/StepUpState/generateStepUpSession.saga.js

@@ -64,12 +64,13 @@ function* handleError(error) {
     }));
     return;
   }
-  yield (0, _effects.put)(_reducer.actions.logout());
   window.localStorage.setItem(_consts.SHOULD_STEP_UP_KEY, 'true');
   const {
     routes
   } = yield (0, _effects.select)(state => state.auth);
-  _restApi.ContextHolder.onRedirectTo(routes.loginUrl);
+  _restApi.ContextHolder.onRedirectTo(routes.logoutUrl, {
+    preserveQueryParams: true
+  });
 }
 
 /**

package/node/index.js

@@ -1,4 +1,4 @@
-/** @license Frontegg v6.155.0-alpha.3
+/** @license Frontegg v6.155.0-alpha.5
  *
  * 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,6 +1,6 @@
 {
   "name": "@frontegg/redux-store",
-  "version": "6.155.0-alpha.3",
+  "version": "6.155.0-alpha.5",
   "main": "./node/index.js",
   "license": "MIT",
   "author": "Frontegg LTD",