@frontegg/redux-store 6.129.0-alpha.0 → 6.129.0-alpha.2

package/auth/LoginState/index.d.ts

@@ -25,7 +25,7 @@ declare const reducers: {
             loginState: LoginState;
             activateState: import("..").ActivateAccountState;
             acceptInvitationState: import("..").AcceptInvitationState;
-            forgotPasswordState: import("../ForgotPasswordState/interfaces").ForgotPasswordState;
+            forgotPasswordState: import("..").ForgotPasswordState;
             resetPhoneNumberState: import("..").ResetPhoneNumberState;
             ssoState: import("..").SSOState;
             profileState: import("..").ProfileState;
@@ -71,7 +71,7 @@ declare const reducers: {
         loginState: LoginState;
         activateState: import("..").ActivateAccountState;
         acceptInvitationState: import("..").AcceptInvitationState;
-        forgotPasswordState: import("../ForgotPasswordState/interfaces").ForgotPasswordState;
+        forgotPasswordState: import("..").ForgotPasswordState;
         resetPhoneNumberState: import("..").ResetPhoneNumberState;
         ssoState: import("..").SSOState;
         profileState: import("..").ProfileState;
@@ -107,6 +107,15 @@ declare const actions: {
     requestAuthorize: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[(boolean | undefined)?], boolean, string, never, never>;
     requestAuthorizeSSR: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[FronteggNextJSSession], FronteggNextJSSession, string, never, never>;
     requestHostedLoginAuthorize: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[(Record<string, string> | undefined)?], Record<string, string> | undefined, string, never, never>;
+    requestHostedLoginAuthorizeV2: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[({
+        additionalParams?: Record<string, string> | undefined;
+        shouldRedirectToLogin?: boolean | undefined;
+        firstTime?: boolean | undefined;
+    } | undefined)?], {
+        additionalParams?: Record<string, string> | undefined;
+        shouldRedirectToLogin?: boolean | undefined;
+        firstTime?: boolean | undefined;
+    } | undefined, string, never, never>;
     handleHostedLoginCallback: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[HostedLoginCallback], HostedLoginCallback, string, never, never>;
     afterAuthNavigation: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>;
     preLogin: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[WithCallback<IPreLogin & {
@@ -173,6 +182,11 @@ declare type DispatchedActions = {
     requestAuthorize: (payload?: boolean) => void;
     requestAuthorizeSSR: (payload: FronteggNextJSSession) => void;
     requestHostedLoginAuthorize: (payload?: Record<string, string>) => void;
+    requestHostedLoginAuthorizeV2: (payload?: {
+        additionalParams?: Record<string, string>;
+        shouldRedirectToLogin?: boolean;
+        firstTime?: boolean;
+    }) => void;
     handleHostedLoginCallback: (payload: HostedLoginCallback) => void;
     afterAuthNavigation: () => void;
     preLogin: (payload: WithCallback<IPreLogin & {

package/auth/LoginState/index.js

@@ -25,6 +25,9 @@ const actions = {
   requestHostedLoginAuthorize: createAction(`${authStoreName}/requestHostedLoginAuthorize`, payload => ({
     payload
   })),
+  requestHostedLoginAuthorizeV2: createAction(`${authStoreName}/requestHostedLoginAuthorizeV2`, payload => ({
+    payload
+  })),
   handleHostedLoginCallback: createAction(`${authStoreName}/handleHostedLoginCallback`, payload => ({
     payload
   })),

package/auth/LoginState/saga.js

@@ -37,7 +37,7 @@ import { ResetPhoneNumberStep } from '../ResetPhoneNumberState/interfaces';
 import { base64urlDecode, delay, publicKeyCredentialToJSON } from '../utils';
 import { loadPublicAuthStrategiesPolicy } from '../SecurityPolicyState/saga';
 import { getPasskeysVendorPolicy } from '../PasskeysState/helpers';
-import { getPathAndSearchParamsFromUrl, getRedirectUrl, getSearchParam, TENANT_ID_PARAM_KEY, getMfaStepForEnrolledUsers, getMfaStepForNotEnrolledUsers, isMfaRequired } from './utils';
+import { getPathAndSearchParamsFromUrl, getRedirectUrl, getSearchParam, TENANT_ID_PARAM_KEY, getMfaStepForEnrolledUsers, getMfaStepForNotEnrolledUsers, isMfaRequired, isOauthCallbackRoute } from './utils';
 import { errorHandler } from '../../utils';
 import { authStrategyLoginStepMap } from './consts';
 import { isEntitlementsDeeplyEqual } from '../Entitlements';
@@ -564,6 +564,47 @@ function* refreshOrRequestHostedLoginAuthorize({
     yield requestHostedLoginAuthorize(additionalParams);
   }
 }
+function* refreshOrRequestHostedLoginAuthorizeV2({
+  payload: {
+    additionalParams,
+    shouldRedirectToLogin,
+    firstTime
+  }
+}) {
+  if (firstTime) {
+    const {
+      urlStrategy
+    } = yield select(state => ({
+      urlStrategy: state.root.urlStrategy
+    }));
+    const activeUri = getUri(urlStrategy);
+    yield put(actions.setState({
+      isLoading: true
+    }));
+    if (isOauthCallbackRoute(activeUri)) {
+      return;
+    }
+  }
+  const {
+    disableSilentRefresh
+  } = yield select(state => ({
+    disableSilentRefresh: state.auth.disableSilentRefresh
+  }));
+  try {
+    if (disableSilentRefresh) {
+      throw new Error('silent refresh is disabled');
+    }
+    yield requestHostedLoginSilentAuthorize();
+  } catch (e) {
+    if (!shouldRedirectToLogin) {
+      yield put(actions.setState({
+        isLoading: false
+      }));
+      return;
+    }
+    yield requestHostedLoginAuthorize(additionalParams);
+  }
+}
 function* requestHostedLoginAuthorize(additionalParams) {
   const {
     routes,
@@ -665,9 +706,13 @@ function* handleHostedLoginCallback({
   try {
     const response = yield call(api.auth.exchangeOAuthTokensV2, body);
     yield call(afterAuthenticationStateUpdate, response, {
-      isAuthenticated: true
+      isAuthenticated: true,
+      isLoading: false
     });
   } catch (e) {
+    yield put(actions.setState({
+      isLoading: false
+    }));
     console.error('Failed to exchangeOAuthTokens', e);
   } finally {
     yield afterAuthNavigation();
@@ -1894,6 +1939,7 @@ export function* loginSagas() {
   yield takeLeading(actions.requestAuthorize, requestAuthorize);
   yield takeLeading(actions.requestAuthorizeSSR, requestAuthorizeSSR);
   yield takeLeading(actions.requestHostedLoginAuthorize, refreshOrRequestHostedLoginAuthorize);
+  yield takeLeading(actions.requestHostedLoginAuthorizeV2, refreshOrRequestHostedLoginAuthorizeV2);
   yield takeLeading(actions.handleHostedLoginCallback, handleHostedLoginCallback);
   yield takeLeading(actions.preLogin, preLogin);
   yield takeLeading(actions.postLogin, postLogin);

package/auth/LoginState/utils.d.ts

@@ -24,3 +24,4 @@ export declare const getNumberOfMfaDevices: (mfaDevices: UserMFADevicesResponse)
 };
 export declare const getMfaStepForEnrolledUsers: (mfaDevices: UserMFADevicesResponse) => MFAStep.verify | MFAStep.authenticatorApp | MFAStep.smsVerifyCode;
 export declare const getMfaStepForNotEnrolledUsers: (mfaStrategies: MFAStrategyEnum[]) => MFAStep.verify | MFAStep.authenticatorApp | MFAStep.smsSetPhoneNumber | MFAStep.emailVerifyCode;
+export declare const isOauthCallbackRoute: (activeUri: string) => boolean;

package/auth/LoginState/utils.js

@@ -120,4 +120,7 @@ export const getMfaStepForNotEnrolledUsers = mfaStrategies => {
     }
   }
   return MFAStep.verify;
+};
+export const isOauthCallbackRoute = activeUri => {
+  return activeUri === '/oauth/callback';
 };

package/auth/index.d.ts

@@ -472,6 +472,15 @@ declare const _default: {
         requestAuthorize: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[(boolean | undefined)?], boolean, string, never, never>;
         requestAuthorizeSSR: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[import("./LoginState/interfaces").FronteggNextJSSession], import("./LoginState/interfaces").FronteggNextJSSession, string, never, never>;
         requestHostedLoginAuthorize: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[(Record<string, string> | undefined)?], Record<string, string> | undefined, string, never, never>;
+        requestHostedLoginAuthorizeV2: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[({
+            additionalParams?: Record<string, string> | undefined;
+            shouldRedirectToLogin?: boolean | undefined;
+            firstTime?: boolean | undefined;
+        } | undefined)?], {
+            additionalParams?: Record<string, string> | undefined;
+            shouldRedirectToLogin?: boolean | undefined;
+            firstTime?: boolean | undefined;
+        } | undefined, string, never, never>;
         handleHostedLoginCallback: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[import("./LoginState/interfaces").HostedLoginCallback], import("./LoginState/interfaces").HostedLoginCallback, string, never, never>;
         afterAuthNavigation: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>;
         preLogin: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[import("..").WithCallback<import("@frontegg/rest-api").IPreLogin & {

package/auth/reducer.d.ts

@@ -432,6 +432,15 @@ declare const actions: {
     requestAuthorize: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[(boolean | undefined)?], boolean, string, never, never>;
     requestAuthorizeSSR: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[import(".").FronteggNextJSSession], import(".").FronteggNextJSSession, string, never, never>;
     requestHostedLoginAuthorize: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[(Record<string, string> | undefined)?], Record<string, string> | undefined, string, never, never>;
+    requestHostedLoginAuthorizeV2: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[({
+        additionalParams?: Record<string, string> | undefined;
+        shouldRedirectToLogin?: boolean | undefined;
+        firstTime?: boolean | undefined;
+    } | undefined)?], {
+        additionalParams?: Record<string, string> | undefined;
+        shouldRedirectToLogin?: boolean | undefined;
+        firstTime?: boolean | undefined;
+    } | undefined, string, never, never>;
     handleHostedLoginCallback: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[import(".").HostedLoginCallback], import(".").HostedLoginCallback, string, never, never>;
     afterAuthNavigation: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>;
     preLogin: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[import("..").WithCallback<import("@frontegg/rest-api").IPreLogin & {

package/index.js

@@ -1,4 +1,4 @@
-/** @license Frontegg v6.129.0-alpha.0
+/** @license Frontegg v6.129.0-alpha.2
  *
  * 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/index.js

@@ -40,6 +40,9 @@ const actions = {
   requestHostedLoginAuthorize: (0, _toolkit.createAction)(`${_constants.authStoreName}/requestHostedLoginAuthorize`, payload => ({
     payload
   })),
+  requestHostedLoginAuthorizeV2: (0, _toolkit.createAction)(`${_constants.authStoreName}/requestHostedLoginAuthorizeV2`, payload => ({
+    payload
+  })),
   handleHostedLoginCallback: (0, _toolkit.createAction)(`${_constants.authStoreName}/handleHostedLoginCallback`, payload => ({
     payload
   })),

package/node/auth/LoginState/saga.js

@@ -579,6 +579,47 @@ function* refreshOrRequestHostedLoginAuthorize({
     yield requestHostedLoginAuthorize(additionalParams);
   }
 }
+function* refreshOrRequestHostedLoginAuthorizeV2({
+  payload: {
+    additionalParams,
+    shouldRedirectToLogin,
+    firstTime
+  }
+}) {
+  if (firstTime) {
+    const {
+      urlStrategy
+    } = yield (0, _effects.select)(state => ({
+      urlStrategy: state.root.urlStrategy
+    }));
+    const activeUri = getUri(urlStrategy);
+    yield (0, _effects.put)(_reducer.actions.setState({
+      isLoading: true
+    }));
+    if ((0, _utils2.isOauthCallbackRoute)(activeUri)) {
+      return;
+    }
+  }
+  const {
+    disableSilentRefresh
+  } = yield (0, _effects.select)(state => ({
+    disableSilentRefresh: state.auth.disableSilentRefresh
+  }));
+  try {
+    if (disableSilentRefresh) {
+      throw new Error('silent refresh is disabled');
+    }
+    yield requestHostedLoginSilentAuthorize();
+  } catch (e) {
+    if (!shouldRedirectToLogin) {
+      yield (0, _effects.put)(_reducer.actions.setState({
+        isLoading: false
+      }));
+      return;
+    }
+    yield requestHostedLoginAuthorize(additionalParams);
+  }
+}
 function* requestHostedLoginAuthorize(additionalParams) {
   const {
     routes,
@@ -680,9 +721,13 @@ function* handleHostedLoginCallback({
   try {
     const response = yield (0, _effects.call)(_restApi.api.auth.exchangeOAuthTokensV2, body);
     yield (0, _effects.call)(afterAuthenticationStateUpdate, response, {
-      isAuthenticated: true
+      isAuthenticated: true,
+      isLoading: false
     });
   } catch (e) {
+    yield (0, _effects.put)(_reducer.actions.setState({
+      isLoading: false
+    }));
     console.error('Failed to exchangeOAuthTokens', e);
   } finally {
     yield afterAuthNavigation();
@@ -1909,6 +1954,7 @@ function* loginSagas() {
   yield (0, _effects.takeLeading)(_reducer.actions.requestAuthorize, requestAuthorize);
   yield (0, _effects.takeLeading)(_reducer.actions.requestAuthorizeSSR, requestAuthorizeSSR);
   yield (0, _effects.takeLeading)(_reducer.actions.requestHostedLoginAuthorize, refreshOrRequestHostedLoginAuthorize);
+  yield (0, _effects.takeLeading)(_reducer.actions.requestHostedLoginAuthorizeV2, refreshOrRequestHostedLoginAuthorizeV2);
   yield (0, _effects.takeLeading)(_reducer.actions.handleHostedLoginCallback, handleHostedLoginCallback);
   yield (0, _effects.takeLeading)(_reducer.actions.preLogin, preLogin);
   yield (0, _effects.takeLeading)(_reducer.actions.postLogin, postLogin);

package/node/auth/LoginState/utils.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isMfaRequired = exports.getSearchParamsFromUrl = exports.getSearchParam = exports.getRedirectUrl = exports.getPathAndSearchParamsFromUrl = exports.getNumberOfMfaDevices = exports.getMfaStepForNotEnrolledUsers = exports.getMfaStepForEnrolledUsers = exports.TENANT_ID_PARAM_KEY = void 0;
+exports.isOauthCallbackRoute = exports.isMfaRequired = exports.getSearchParamsFromUrl = exports.getSearchParam = exports.getRedirectUrl = exports.getPathAndSearchParamsFromUrl = exports.getNumberOfMfaDevices = exports.getMfaStepForNotEnrolledUsers = exports.getMfaStepForEnrolledUsers = exports.TENANT_ID_PARAM_KEY = void 0;
 var _restApi = require("@frontegg/rest-api");
 var _interfaces = require("../MfaState/interfaces");
 const isAbsoluteUrl = path => {
@@ -135,4 +135,8 @@ const getMfaStepForNotEnrolledUsers = mfaStrategies => {
   }
   return _interfaces.MFAStep.verify;
 };
-exports.getMfaStepForNotEnrolledUsers = getMfaStepForNotEnrolledUsers;
+exports.getMfaStepForNotEnrolledUsers = getMfaStepForNotEnrolledUsers;
+const isOauthCallbackRoute = activeUri => {
+  return activeUri === '/oauth/callback';
+};
+exports.isOauthCallbackRoute = isOauthCallbackRoute;

package/node/index.js

@@ -1,4 +1,4 @@
-/** @license Frontegg v6.129.0-alpha.0
+/** @license Frontegg v6.129.0-alpha.2
  *
  * 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.129.0-alpha.0",
+  "version": "6.129.0-alpha.2",
   "main": "./node/index.js",
   "license": "MIT",
   "author": "Frontegg LTD",