@frontegg/js 6.155.0-alpha.4 → 6.155.0-alpha.6

package/index.js

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

package/node/index.js

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

package/node/version.js

@@ -5,6 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _default = {
-  cdnVersion: '6.155.0-alpha.4'
+  cdnVersion: '6.155.0-alpha.6'
 };
 exports["default"] = _default;

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@frontegg/js",
-  "version": "6.155.0-alpha.4",
+  "version": "6.155.0-alpha.6",
   "main": "./node/index.js",
   "license": "MIT",
   "author": "Frontegg LTD",
   "dependencies": {
     "@babel/runtime": "^7.18.6",
-    "@frontegg/types": "6.155.0-alpha.4"
+    "@frontegg/types": "6.155.0-alpha.6"
   },
   "browserslist": {
     "production": [

package/umd/frontegg.development.js

@@ -1414,7 +1414,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "default": () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({
-  cdnVersion: '6.155.0-alpha.4'
+  cdnVersion: '6.155.0-alpha.6'
 });
 
 /***/ }),
@@ -7567,6 +7567,18 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+/**
+ * @param url
+ * @returns url without the origin if it's the same origin as the current window origin
+ */
+function cleanUrlIfSameOrigin(url) {
+  var _window, _window2;
+  if (!url.startsWith((_window = window) == null ? void 0 : _window.location.origin)) {
+    return url;
+  }
+  return url.replace((_window2 = window) == null ? void 0 : _window2.location.origin, '');
+}
+
 /**
  * @param customLoginAuthenticatedUrl custom login authenticated url if exists
  * @returns the authenticated url to redirect to after auth navigation
@@ -7592,32 +7604,47 @@ function* getUrlForAfterAuthNavigation(customLoginAuthenticatedUrl) {
   if (!finalUrl || [loginUrl, logoutUrl, socialLoginCallbackUrl, activateUrl].includes(finalUrl)) {
     finalUrl = authenticatedUrl;
   }
-  return (0,_utils__WEBPACK_IMPORTED_MODULE_1__.getRedirectUrl)({
+  const redirectUrl = (0,_utils__WEBPACK_IMPORTED_MODULE_1__.getRedirectUrl)({
     authenticatedUrl: finalUrl,
     includeQueryParam,
     enforceRedirectToSameSite,
     allowedRedirectOrigins
   });
+
+  // clean origin if it's the same origin as the current window origin to avoid refresh in afterAuthNavigationUtil
+  return cleanUrlIfSameOrigin(redirectUrl);
 }
 /**
  * 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 = _frontegg_rest_api__WEBPACK_IMPORTED_MODULE_3__.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,redux_saga_effects__WEBPACK_IMPORTED_MODULE_0__.call)(getUrlForAfterAuthNavigation, customLoginAuthenticatedUrl);
-    (_window = window) == null ? void 0 : _window.localStorage.removeItem(_constants__WEBPACK_IMPORTED_MODULE_2__.FRONTEGG_AFTER_AUTH_REDIRECT_URL);
+    var _window3;
+    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__WEBPACK_IMPORTED_MODULE_2__.FRONTEGG_AFTER_AUTH_REDIRECT_URL);
+      if (localStorageRedirectUrl && !(0,_utils__WEBPACK_IMPORTED_MODULE_1__.isAbsoluteUrl)(localStorageRedirectUrl)) {
+        redirectUrl = localStorageRedirectUrl;
+      }
+    }
+    if (!redirectUrl) {
+      redirectUrl = yield (0,redux_saga_effects__WEBPACK_IMPORTED_MODULE_0__.call)(getUrlForAfterAuthNavigation, customLoginAuthenticatedUrl);
+    }
+    (_window3 = window) == null ? void 0 : _window3.localStorage.removeItem(_constants__WEBPACK_IMPORTED_MODULE_2__.FRONTEGG_AFTER_AUTH_REDIRECT_URL);
   }
   yield (0,redux_saga_effects__WEBPACK_IMPORTED_MODULE_0__.delay)(200);
   (0,redux_saga_effects__WEBPACK_IMPORTED_MODULE_0__.put)(resetStateAction());
@@ -7631,7 +7658,7 @@ function* afterAuthNavigationUtil(resetStateAction, {
  * Handling also step up scenario when user silently logout to continue to step up
  */
 function* afterAuthNavigation() {
-  var _window2;
+  var _window4;
   const {
     routes: {
       customLoginAuthenticatedUrl,
@@ -7640,13 +7667,13 @@ function* afterAuthNavigation() {
   } = yield (0,redux_saga_effects__WEBPACK_IMPORTED_MODULE_0__.select)(state => state.auth);
 
   // login with magic code, try to step up, no other mfa, invalid max age, force_enroll -> logout, login with first factor, not-stepped up jwt -> navigate to step up
-  const shouldStepUp = (_window2 = window) == null ? void 0 : _window2.localStorage.getItem(_StepUpState_consts__WEBPACK_IMPORTED_MODULE_4__.SHOULD_STEP_UP_KEY);
+  const shouldStepUp = (_window4 = window) == null ? void 0 : _window4.localStorage.getItem(_StepUpState_consts__WEBPACK_IMPORTED_MODULE_4__.SHOULD_STEP_UP_KEY);
   const user = yield (0,redux_saga_effects__WEBPACK_IMPORTED_MODULE_0__.select)(({
     auth
   }) => auth.user);
   if (shouldStepUp) {
-    var _window3;
-    (_window3 = window) == null ? void 0 : _window3.localStorage.removeItem(_StepUpState_consts__WEBPACK_IMPORTED_MODULE_4__.SHOULD_STEP_UP_KEY);
+    var _window5;
+    (_window5 = window) == null ? void 0 : _window5.localStorage.removeItem(_StepUpState_consts__WEBPACK_IMPORTED_MODULE_4__.SHOULD_STEP_UP_KEY);
   }
   if (stepUpUrl && shouldStepUp && !(0,_StepUpState__WEBPACK_IMPORTED_MODULE_5__.isSteppedUp)(user)) {
     yield (0,redux_saga_effects__WEBPACK_IMPORTED_MODULE_0__.call)(afterAuthNavigationUtil, _reducer__WEBPACK_IMPORTED_MODULE_6__.actions.resetLoginState, {
@@ -7663,7 +7690,8 @@ function* afterAuthNavigation() {
     });
   }
   yield (0,redux_saga_effects__WEBPACK_IMPORTED_MODULE_0__.call)(afterAuthNavigationUtil, _reducer__WEBPACK_IMPORTED_MODULE_6__.actions.resetLoginState, {
-    customLoginAuthenticatedUrl: customLoginURL
+    customLoginAuthenticatedUrl: customLoginURL,
+    shouldStepUpDuringLogin: !!shouldStepUp
   });
 }
 
@@ -8436,6 +8464,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "getRedirectUrl": () => (/* binding */ getRedirectUrl),
 /* harmony export */   "getSearchParam": () => (/* binding */ getSearchParam),
 /* harmony export */   "getSearchParamsFromUrl": () => (/* binding */ getSearchParamsFromUrl),
+/* harmony export */   "isAbsoluteUrl": () => (/* binding */ isAbsoluteUrl),
 /* harmony export */   "isEmailPayload": () => (/* binding */ isEmailPayload),
 /* harmony export */   "isMfaRequired": () => (/* binding */ isMfaRequired),
 /* harmony export */   "isOauthCallbackRoute": () => (/* binding */ isOauthCallbackRoute)
@@ -24342,7 +24371,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ });
 /* harmony import */ var _ThemeOptions__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./ThemeOptions */ "../../dist/@frontegg/types/ThemeOptions/index.js");
 /* harmony import */ var _Metadata__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./Metadata */ "../../dist/@frontegg/types/Metadata/index.js");
-/** @license Frontegg v6.155.0-alpha.4
+/** @license Frontegg v6.155.0-alpha.6
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.