@frontegg/redux-store 7.128.0 → 7.129.0

package/auth/LoginState/actions/afterAuthNavigation.actions.js

@@ -80,15 +80,19 @@ export default ((store, api, sharedActions) => {
       logoutUrl,
       socialLoginCallbackUrl,
       activateUrl,
-      activateWithOTCUrl
+      activateWithOTCUrl,
+      oidcRedirectUrl
     } = routes;
     let finalUrl = urlFromLocalStorage;
     if (!finalUrl || [loginUrl, logoutUrl, socialLoginCallbackUrl, activateUrl, activateWithOTCUrl].includes(finalUrl)) {
       finalUrl = authenticatedUrl;
     }
+
+    // The OIDC callback's query is the IdP's code and state; the user's own query was saved with the URL.
+    const isOidcCallback = !!oidcRedirectUrl && window.location.pathname.endsWith(oidcRedirectUrl);
     const redirectUrl = getRedirectUrl({
       authenticatedUrl: finalUrl,
-      includeQueryParam,
+      includeQueryParam: includeQueryParam && !isOidcCallback,
       enforceRedirectToSameSite,
       allowedRedirectOrigins
     });

package/auth/LoginState/actions/index.js

@@ -32,11 +32,13 @@ import { clearHostedOAuthState } from '../oauthStorage';
 import { SHOULD_STEP_UP_KEY } from '../../StepUpState/consts';
 import { FronteggNativeModule, isEntitlementsDeeplyEqual } from '../../../toolkit';
 import { REQUEST_NAME, UserVerifiedOriginTypes } from '../../interfaces';
-import { authStrategyLoginStepMap } from '../consts';
+import { authStrategyLoginStepMap, defaultOnRedirectTo } from '../consts';
 import { isMfaRequired, isResetPasswordRequired } from '../../helpers';
 import { MFAStep } from '../../MfaState/interfaces';
 import { SamlVendors } from '../../SSOState/interfaces';
 import { DEFAULT_RETRY_CONFIG } from '../../../constants';
+const SSO_REDIRECT_DELAY_MS = 2000;
+const isUsableRedirect = onRedirectTo => typeof onRedirectTo === 'function' && onRedirectTo !== defaultOnRedirectTo;
 export default ((store, api, sharedActions) => {
   const actions = sharedActions;
   const contextHolder = ContextHolder.for(store.root.appName);
@@ -387,6 +389,29 @@ export default ((store, api, sharedActions) => {
       callback == null ? void 0 : callback();
     }
   };
+
+  // v6 parity (takeLeading): a preLogin called while another is in flight is dropped.
+  let preLoginInFlight = false;
+  let latestPreLoginAttempt = 0;
+
+  // Read on use: the login box installs onRedirectTo lazily, logout() clears it and the store default is a no-op.
+  const redirectToFullPage = url => {
+    const onRedirectTo = [store.auth.onRedirectTo, contextHolder.onRedirectTo].find(isUsableRedirect);
+    if (onRedirectTo) {
+      onRedirectTo(url, {
+        refresh: true
+      });
+    } else {
+      window.location.href = url;
+    }
+  };
+  const scheduleSsoRedirect = (ssoRedirectUrl, attempt) => {
+    setTimeout(() => {
+      if (attempt === latestPreLoginAttempt && store.auth.loginState.step === LoginStep.redirectToSSO) {
+        redirectToFullPage(ssoRedirectUrl);
+      }
+    }, SSO_REDIRECT_DELAY_MS);
+  };
   const preLogin = async payload => {
     const {
       email,
@@ -395,11 +420,17 @@ export default ((store, api, sharedActions) => {
       invitationToken,
       callback
     } = payload;
+    if (preLoginInFlight) {
+      callback == null ? void 0 : callback();
+      return;
+    }
+    preLoginInFlight = true;
+    latestPreLoginAttempt += 1;
+    const attempt = latestPreLoginAttempt;
     setLoginState({
       loading: true
     });
     try {
-      const onRedirectTo = store.auth.onRedirectTo;
       const tenantId = getSearchParam(TENANT_ID_PARAM_KEY);
       const preLoginResult = await api.auth.preLoginV2(_extends({}, email ? {
         email
@@ -420,9 +451,7 @@ export default ((store, api, sharedActions) => {
           setLoginState({
             loading: false
           });
-          onRedirectTo(address, {
-            refresh: true
-          });
+          redirectToFullPage(address);
           return;
         }
         let ssoRedirectUrl = address;
@@ -445,11 +474,7 @@ export default ((store, api, sharedActions) => {
             loading: false,
             ssoRedirectUrl
           });
-          setTimeout(() => {
-            onRedirectTo(ssoRedirectUrl, {
-              refresh: true
-            });
-          }, 2000);
+          scheduleSsoRedirect(ssoRedirectUrl, attempt);
         }
       } else {
         await ssoPreloginFailed(_extends({}, username ? {
@@ -473,6 +498,8 @@ export default ((store, api, sharedActions) => {
         invitationToken,
         error: e
       }));
+    } finally {
+      preLoginInFlight = false;
     }
   };
   const postLogin = async payload => {

package/auth/LoginState/consts.d.ts

@@ -6,5 +6,6 @@
 import { AuthStrategyEnum } from '@frontegg/rest-api';
 import { LoginStep } from './interfaces';
 import { AuthPageRoutes } from '../interfaces';
+export declare const defaultOnRedirectTo: () => undefined;
 export declare const authStrategyLoginStepMap: Record<Exclude<AuthStrategyEnum, AuthStrategyEnum.NoLocalAuthentication | AuthStrategyEnum.WebAuthN>, LoginStep>;
 export declare const defaultFronteggRoutes: AuthPageRoutes;

package/auth/LoginState/consts.js

@@ -5,6 +5,7 @@
  */
 import { AuthStrategyEnum } from '@frontegg/rest-api';
 import { LoginStep } from './interfaces';
+export const defaultOnRedirectTo = () => void 0;
 export const authStrategyLoginStepMap = {
   [AuthStrategyEnum.Code]: LoginStep.loginWithOtc,
   [AuthStrategyEnum.EmailAndPassword]: LoginStep.loginWithPassword,

package/auth/index.js

@@ -37,7 +37,7 @@ import { buildTeamActions, createTeamState } from './TeamState';
 import { buildTenantsActions, createTenantsState } from './TenantsState';
 import { buildUsernamesActions, createUsernamesState } from './UsernamesState';
 import { buildUserEmailPolicyActions, createUserEmailPolicyState } from './UsersEmailsPolicyState';
-import { defaultFronteggRoutes } from './LoginState/consts';
+import { defaultFronteggRoutes, defaultOnRedirectTo } from './LoginState/consts';
 import { deepResetState, isProxy } from '../helpers';
 import { buildEntitlementsActions } from './Entitlements';
 import { createProxy } from '../toolkit/proxy';
@@ -91,7 +91,7 @@ export const createAuthState = _overrideState => {
     overrideState = _objectWithoutPropertiesLoose(_ref, _excluded);
   return createProxy(_extends({
     routes: _extends({}, defaultFronteggRoutes, routes),
-    onRedirectTo: () => void 0,
+    onRedirectTo: defaultOnRedirectTo,
     isAuthenticated: false,
     isLoading: true,
     isSSOAuth: false,

package/index.js

@@ -1,4 +1,4 @@
-/** @license Frontegg v7.128.0
+/** @license Frontegg v7.129.0
  *
  * 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/actions/afterAuthNavigation.actions.js

@@ -87,15 +87,19 @@ var _default = (store, api, sharedActions) => {
       logoutUrl,
       socialLoginCallbackUrl,
       activateUrl,
-      activateWithOTCUrl
+      activateWithOTCUrl,
+      oidcRedirectUrl
     } = routes;
     let finalUrl = urlFromLocalStorage;
     if (!finalUrl || [loginUrl, logoutUrl, socialLoginCallbackUrl, activateUrl, activateWithOTCUrl].includes(finalUrl)) {
       finalUrl = authenticatedUrl;
     }
+
+    // The OIDC callback's query is the IdP's code and state; the user's own query was saved with the URL.
+    const isOidcCallback = !!oidcRedirectUrl && window.location.pathname.endsWith(oidcRedirectUrl);
     const redirectUrl = (0, _helpers.getRedirectUrl)({
       authenticatedUrl: finalUrl,
-      includeQueryParam,
+      includeQueryParam: includeQueryParam && !isOidcCallback,
       enforceRedirectToSameSite,
       allowedRedirectOrigins
     });

package/node/auth/LoginState/actions/index.js

@@ -44,6 +44,8 @@ const _excluded = ["callback", "error"],
   _excluded13 = ["callback"],
   _excluded14 = ["callback"],
   _excluded15 = ["callback"];
+const SSO_REDIRECT_DELAY_MS = 2000;
+const isUsableRedirect = onRedirectTo => typeof onRedirectTo === 'function' && onRedirectTo !== _consts2.defaultOnRedirectTo;
 var _default = (store, api, sharedActions) => {
   const actions = sharedActions;
   const contextHolder = _restApi.ContextHolder.for(store.root.appName);
@@ -394,6 +396,29 @@ var _default = (store, api, sharedActions) => {
       callback == null ? void 0 : callback();
     }
   };
+
+  // v6 parity (takeLeading): a preLogin called while another is in flight is dropped.
+  let preLoginInFlight = false;
+  let latestPreLoginAttempt = 0;
+
+  // Read on use: the login box installs onRedirectTo lazily, logout() clears it and the store default is a no-op.
+  const redirectToFullPage = url => {
+    const onRedirectTo = [store.auth.onRedirectTo, contextHolder.onRedirectTo].find(isUsableRedirect);
+    if (onRedirectTo) {
+      onRedirectTo(url, {
+        refresh: true
+      });
+    } else {
+      window.location.href = url;
+    }
+  };
+  const scheduleSsoRedirect = (ssoRedirectUrl, attempt) => {
+    setTimeout(() => {
+      if (attempt === latestPreLoginAttempt && store.auth.loginState.step === _interfaces.LoginStep.redirectToSSO) {
+        redirectToFullPage(ssoRedirectUrl);
+      }
+    }, SSO_REDIRECT_DELAY_MS);
+  };
   const preLogin = async payload => {
     const {
       email,
@@ -402,11 +427,17 @@ var _default = (store, api, sharedActions) => {
       invitationToken,
       callback
     } = payload;
+    if (preLoginInFlight) {
+      callback == null ? void 0 : callback();
+      return;
+    }
+    preLoginInFlight = true;
+    latestPreLoginAttempt += 1;
+    const attempt = latestPreLoginAttempt;
     setLoginState({
       loading: true
     });
     try {
-      const onRedirectTo = store.auth.onRedirectTo;
       const tenantId = (0, _helpers2.getSearchParam)(_helpers2.TENANT_ID_PARAM_KEY);
       const preLoginResult = await api.auth.preLoginV2((0, _extends2.default)({}, email ? {
         email
@@ -427,9 +458,7 @@ var _default = (store, api, sharedActions) => {
           setLoginState({
             loading: false
           });
-          onRedirectTo(address, {
-            refresh: true
-          });
+          redirectToFullPage(address);
           return;
         }
         let ssoRedirectUrl = address;
@@ -452,11 +481,7 @@ var _default = (store, api, sharedActions) => {
             loading: false,
             ssoRedirectUrl
           });
-          setTimeout(() => {
-            onRedirectTo(ssoRedirectUrl, {
-              refresh: true
-            });
-          }, 2000);
+          scheduleSsoRedirect(ssoRedirectUrl, attempt);
         }
       } else {
         await ssoPreloginFailed((0, _extends2.default)({}, username ? {
@@ -480,6 +505,8 @@ var _default = (store, api, sharedActions) => {
         invitationToken,
         error: e
       }));
+    } finally {
+      preLoginInFlight = false;
     }
   };
   const postLogin = async payload => {

package/node/auth/LoginState/consts.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.defaultFronteggRoutes = exports.authStrategyLoginStepMap = void 0;
+exports.defaultOnRedirectTo = exports.defaultFronteggRoutes = exports.authStrategyLoginStepMap = void 0;
 var _restApi = require("@frontegg/rest-api");
 var _interfaces = require("./interfaces");
 /**
@@ -12,6 +12,8 @@ var _interfaces = require("./interfaces");
  * please don't import from redux or from other files that import from redux
  */
 
+const defaultOnRedirectTo = () => void 0;
+exports.defaultOnRedirectTo = defaultOnRedirectTo;
 const authStrategyLoginStepMap = {
   [_restApi.AuthStrategyEnum.Code]: _interfaces.LoginStep.loginWithOtc,
   [_restApi.AuthStrategyEnum.EmailAndPassword]: _interfaces.LoginStep.loginWithPassword,

package/node/auth/index.js

@@ -559,7 +559,7 @@ const createAuthState = _overrideState => {
     overrideState = (0, _objectWithoutPropertiesLoose2.default)(_ref, _excluded);
   return (0, _proxy.createProxy)((0, _extends2.default)({
     routes: (0, _extends2.default)({}, _consts.defaultFronteggRoutes, routes),
-    onRedirectTo: () => void 0,
+    onRedirectTo: _consts.defaultOnRedirectTo,
     isAuthenticated: false,
     isLoading: true,
     isSSOAuth: false,

package/node/index.js

@@ -1,4 +1,4 @@
-/** @license Frontegg v7.128.0
+/** @license Frontegg v7.129.0
  *
  * 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/redux-store",
-  "version": "7.128.0",
+  "version": "7.129.0",
   "main": "./node/index.js",
   "license": "MIT",
   "author": "Frontegg LTD",
   "dependencies": {
     "@babel/runtime": "^7.18.6",
     "@frontegg/entitlements-javascript-commons": "1.1.2",
-    "@frontegg/rest-api": "7.128.0",
+    "@frontegg/rest-api": "7.129.0",
     "fast-deep-equal": "3.1.3",
     "get-value": "^3.0.1",
     "proxy-compare": "^3.0.0",