@frontegg/redux-store 7.15.0 → 7.16.0

package/auth/AcceptInvitationState/actions.d.ts

@@ -1,9 +1,10 @@
 import { FronteggState, RestApi, SharedActions } from '../../interfaces';
 import { AcceptInvitationState } from './interfaces';
-import { IAcceptInvitation } from '@frontegg/rest-api';
+import { IAcceptInvitation, IAcceptInvitationWithOTC } from '@frontegg/rest-api';
 declare const _default: (store: FronteggState, api: RestApi, sharedActions: SharedActions) => {
     setAcceptInvitationState: (state: Partial<AcceptInvitationState>) => void;
     resetAcceptInvitationState: () => void;
     acceptInvitation: (payload: IAcceptInvitation) => Promise<void>;
+    acceptInvitationWithOTC: (payload: IAcceptInvitationWithOTC) => Promise<void>;
 };
 export default _default;

package/auth/AcceptInvitationState/actions.js

@@ -33,9 +33,34 @@ export default ((store, api, sharedActions) => {
       });
     }
   };
+  const acceptInvitationWithOTC = async payload => {
+    if (!payload.token || !payload.userId || !payload.code) {
+      setAcceptInvitationState({
+        error: undefined,
+        step: AcceptInvitationStep.invalid
+      });
+      return;
+    }
+    try {
+      setAcceptInvitationState({
+        error: undefined,
+        step: AcceptInvitationStep.pending
+      });
+      await api.auth.acceptInvitationWithOTC(payload);
+      setAcceptInvitationState({
+        step: AcceptInvitationStep.success
+      });
+    } catch (e) {
+      setAcceptInvitationState({
+        step: AcceptInvitationStep.failed,
+        error: errorHandler(e)
+      });
+    }
+  };
   return {
     setAcceptInvitationState,
     resetAcceptInvitationState,
-    acceptInvitation
+    acceptInvitation,
+    acceptInvitationWithOTC
   };
 });

package/auth/ActivateAccountState/actions.d.ts

@@ -1,6 +1,6 @@
 import { FronteggState, WithCallback, SharedActions, RestApi } from '../../interfaces';
 import { IGetActivateAccountStrategy, IGetActivateAccountStrategyResponse, IResendActivationEmail } from '@frontegg/rest-api';
-import { ActivateAccountState, IActivateAccountPayload, IPreActivateAccount } from './interfaces';
+import { ActivateAccountState, IActivateAccountPayload, IActivateAccountWithOTCPayload, IPreActivateAccount } from './interfaces';
 declare const _default: (store: FronteggState, api: RestApi, sharedActions: SharedActions) => {
     setActivateState: (state: Partial<ActivateAccountState>) => void;
     resetActivateState: () => void;
@@ -9,5 +9,6 @@ declare const _default: (store: FronteggState, api: RestApi, sharedActions: Shar
     preActivateAccount: (payload: IPreActivateAccount) => Promise<void>;
     getActivateAccountStrategy: (payload: WithCallback<IGetActivateAccountStrategy, IGetActivateAccountStrategyResponse>) => Promise<void>;
     resendActivationEmail: (payload: WithCallback<IResendActivationEmail>) => Promise<void>;
+    activateAccountWithCode: (_payload: WithCallback<IActivateAccountWithOTCPayload>) => Promise<void>;
 };
 export default _default;

package/auth/ActivateAccountState/actions.js

@@ -1,9 +1,12 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
-const _excluded = ["callback", "events"],
-  _excluded2 = ["user"],
-  _excluded3 = ["callback"],
-  _excluded4 = ["callback"];
+const _excluded = ["user"],
+  _excluded2 = ["callback", "events"],
+  _excluded3 = ["user"],
+  _excluded4 = ["callback", "events"],
+  _excluded5 = ["user"],
+  _excluded6 = ["callback"],
+  _excluded7 = ["callback"];
 import { initialState } from './state';
 import { ContextHolder } from '@frontegg/rest-api';
 import { errorHandler, delay, deepResetState } from '../../helpers';
@@ -59,12 +62,61 @@ export default ((store, api, sharedActions) => {
       });
     }
   };
+  const handleActivationResponse = async ({
+    loginResponse,
+    events,
+    onRedirectTo,
+    routes
+  }) => {
+    const {
+        user
+      } = loginResponse,
+      rest = _objectWithoutPropertiesLoose(loginResponse, _excluded);
+    if (user.redirectLocation) {
+      window.location.href = user.redirectLocation;
+      return;
+    }
+    if (isMfaRequired(user, store.root.appName)) {
+      setActivateState({
+        step: ActivateAccountStep.success
+      });
+      const mfaRequiredState = await actions.getMfaRequiredState(user);
+      actions.setAuthState(mfaRequiredState);
+      await delay(1000);
+      onRedirectTo(routes.loginUrl, {
+        preserveQueryParams: true
+      });
+    } else {
+      var _events$userVerified;
+      setActivateState({
+        step: ActivateAccountStep.success
+      });
+      const userVerifiedPayload = {
+        email: user.email,
+        origin: UserVeirifedOriginTypes.ACTIVATION_LINK,
+        id: user.id,
+        tenantId: user.tenantId,
+        name: user.name,
+        createdAt: new Date()
+      };
+      events == null ? void 0 : (_events$userVerified = events.userVerified) == null ? void 0 : _events$userVerified.call(events, userVerifiedPayload);
+      reportGTMEvent(GTMEventAction.USER_VERIFIED, userVerifiedPayload);
+      actions.afterAuthenticationStateUpdate(_extends({
+        user
+      }, rest), {
+        isAuthenticated: true
+      });
+      await delay(1000);
+      await actions.afterAuthNavigation();
+      resetActivateState();
+    }
+  };
   const activateAccount = async _payload => {
     const {
         callback,
         events
       } = _payload,
-      payload = _objectWithoutPropertiesLoose(_payload, _excluded);
+      payload = _objectWithoutPropertiesLoose(_payload, _excluded2);
     setActivateState({
       loading: true
     });
@@ -75,45 +127,48 @@ export default ((store, api, sharedActions) => {
         {
           user
         } = _await$api$auth$activ,
-        rest = _objectWithoutPropertiesLoose(_await$api$auth$activ, _excluded2);
-      if (user.redirectLocation) {
-        window.location.href = user.redirectLocation;
-        return;
-      }
-      if (isMfaRequired(user, store.root.appName)) {
-        setActivateState({
-          step: ActivateAccountStep.success
-        });
-        const mfaRequiredState = await actions.getMfaRequiredState(user);
-        actions.setAuthState(mfaRequiredState);
-        await delay(1000);
-        onRedirectTo(routes.loginUrl, {
-          preserveQueryParams: true
-        });
-      } else {
-        var _events$userVerified;
-        setActivateState({
-          step: ActivateAccountStep.success
-        });
-        const userVerifiedPayload = {
-          email: user.email,
-          origin: UserVeirifedOriginTypes.ACTIVATION_LINK,
-          id: user.id,
-          tenantId: user.tenantId,
-          name: user.name,
-          createdAt: new Date()
-        };
-        events == null ? void 0 : (_events$userVerified = events.userVerified) == null ? void 0 : _events$userVerified.call(events, userVerifiedPayload);
-        reportGTMEvent(GTMEventAction.USER_VERIFIED, userVerifiedPayload);
-        await actions.afterAuthenticationStateUpdate(_extends({
+        rest = _objectWithoutPropertiesLoose(_await$api$auth$activ, _excluded3);
+      await handleActivationResponse({
+        loginResponse: _extends({
           user
-        }, rest), {
-          isAuthenticated: true
-        });
-        await delay(1000);
-        await actions.afterAuthNavigation();
-        resetActivateState();
-      }
+        }, rest),
+        events,
+        onRedirectTo,
+        routes
+      });
+      callback == null ? void 0 : callback(true);
+    } catch (e) {
+      setActivateState({
+        loading: false,
+        error: errorHandler(e)
+      });
+    }
+  };
+  const activateAccountWithCode = async _payload => {
+    const {
+        callback,
+        events
+      } = _payload,
+      payload = _objectWithoutPropertiesLoose(_payload, _excluded4);
+    setActivateState({
+      loading: true
+    });
+    try {
+      const onRedirectTo = ContextHolder.for(store.root.appName).onRedirectTo;
+      const routes = store.auth.routes;
+      const _await$api$auth$activ2 = await api.auth.activateAccountWithOTC(payload),
+        {
+          user
+        } = _await$api$auth$activ2,
+        rest = _objectWithoutPropertiesLoose(_await$api$auth$activ2, _excluded5);
+      await handleActivationResponse({
+        loginResponse: _extends({
+          user
+        }, rest),
+        events,
+        onRedirectTo,
+        routes
+      });
       callback == null ? void 0 : callback(true);
     } catch (e) {
       setActivateState({
@@ -126,7 +181,7 @@ export default ((store, api, sharedActions) => {
     const {
         callback
       } = payload,
-      params = _objectWithoutPropertiesLoose(payload, _excluded3);
+      params = _objectWithoutPropertiesLoose(payload, _excluded6);
     setActivateStrategyState({
       loading: true
     });
@@ -149,7 +204,7 @@ export default ((store, api, sharedActions) => {
     const {
         callback
       } = payload,
-      body = _objectWithoutPropertiesLoose(payload, _excluded4);
+      body = _objectWithoutPropertiesLoose(payload, _excluded7);
     actions.setTeamLoader({
       key: TeamStateKeys.RESEND_ACTIVATE_LINK,
       value: body.email
@@ -185,6 +240,7 @@ export default ((store, api, sharedActions) => {
     activateAccount,
     preActivateAccount,
     getActivateAccountStrategy,
-    resendActivationEmail
+    resendActivationEmail,
+    activateAccountWithCode
   };
 });

package/auth/ActivateAccountState/interfaces.d.ts

@@ -21,6 +21,9 @@ export type IPreActivateAccount = {
 export interface IActivateAccountPayload extends IActivateAccount {
     events?: CustomEventsOptions;
 }
+export interface IActivateAccountWithOTCPayload extends IActivateAccountPayload {
+    code: string;
+}
 export type ActivateAccountStrategyState = WithStatus & {
     strategy?: IGetActivateAccountStrategyResponse;
 };

package/auth/LoginState/consts.js

@@ -32,5 +32,7 @@ export const defaultFronteggRoutes = {
   hostedLoginRedirectUrl: '/oauth/callback',
   openAppUrl: '/account/redirect',
   unlockAccountUrl: '/account/unlock',
+  activateWithOTCUrl: '/account/activate/code',
+  acceptInvitationWithOTCUrl: '/account/invitation/code',
   mfaMobileAuthenticator: '/account/mfa-mobile-authenticator'
 };

package/auth/interfaces.d.ts

@@ -129,6 +129,10 @@ export type AuthPageRoutes = {
      * the page whither need to redirect in the case when a user want to activate his account
      */
     activateUrl: string;
+    /**
+     * the page whither need to redirect in the case when a user want to activate his account with code
+     */
+    activateWithOTCUrl: string;
     /**
      * the page whither need to redirect in the case when a user want to impersonate another user
      */
@@ -137,6 +141,10 @@ export type AuthPageRoutes = {
      * the page whether you need to redirect in the case when a user want to accept invite to tenant
      */
     acceptInvitationUrl: string;
+    /**
+     * the page whether you need to redirect in the case when a user wants to accept invite to tenant with OTC
+     */
+    acceptInvitationWithOTCUrl: string;
     /**
      * the page in the case a user forgot his account password
      */

package/index.js

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

package/mocks/auth-mocks/acceptInvitationActions.mocks.d.ts

@@ -3,5 +3,6 @@ declare const _default: (store: FronteggState, api: RestApi, actions: SharedActi
     setAcceptInvitationState: (state: Partial<import("../..").AcceptInvitationState>) => void;
     resetAcceptInvitationState: () => void;
     acceptInvitation: (payload: import("@frontegg/rest-api").IAcceptInvitation) => Promise<void>;
+    acceptInvitationWithOTC: (payload: import("@frontegg/rest-api").IAcceptInvitationWithOTC) => Promise<void>;
 };
 export default _default;

package/mocks/auth-mocks/activateAccountActions.mocks.d.ts

@@ -7,5 +7,6 @@ declare const _default: (store: FronteggState, api: RestApi, actions: SharedActi
     preActivateAccount: (payload: import("../..").IPreActivateAccount) => Promise<void>;
     getActivateAccountStrategy: (payload: import("../../interfaces").WithCallback<import("@frontegg/rest-api").IGetActivateAccountStrategy, import("@frontegg/rest-api").IGetActivateAccountStrategyResponse>) => Promise<void>;
     resendActivationEmail: (payload: import("../../interfaces").WithCallback<import("@frontegg/rest-api").IResendActivationEmail>) => Promise<void>;
+    activateAccountWithCode: (_payload: import("../../interfaces").WithCallback<import("../..").IActivateAccountWithOTCPayload>) => Promise<void>;
 };
 export default _default;

package/node/auth/AcceptInvitationState/actions.js

@@ -39,10 +39,35 @@ var _default = (store, api, sharedActions) => {
       });
     }
   };
+  const acceptInvitationWithOTC = async payload => {
+    if (!payload.token || !payload.userId || !payload.code) {
+      setAcceptInvitationState({
+        error: undefined,
+        step: _interfaces.AcceptInvitationStep.invalid
+      });
+      return;
+    }
+    try {
+      setAcceptInvitationState({
+        error: undefined,
+        step: _interfaces.AcceptInvitationStep.pending
+      });
+      await api.auth.acceptInvitationWithOTC(payload);
+      setAcceptInvitationState({
+        step: _interfaces.AcceptInvitationStep.success
+      });
+    } catch (e) {
+      setAcceptInvitationState({
+        step: _interfaces.AcceptInvitationStep.failed,
+        error: (0, _helpers.errorHandler)(e)
+      });
+    }
+  };
   return {
     setAcceptInvitationState,
     resetAcceptInvitationState,
-    acceptInvitation
+    acceptInvitation,
+    acceptInvitationWithOTC
   };
 };
 exports.default = _default;

package/node/auth/ActivateAccountState/actions.js

@@ -15,10 +15,13 @@ var _interfaces2 = require("../interfaces");
 var _gtm = require("../../helpers/gtm");
 var _helpers2 = require("../helpers");
 var _interfaces3 = require("../TeamState/interfaces");
-const _excluded = ["callback", "events"],
-  _excluded2 = ["user"],
-  _excluded3 = ["callback"],
-  _excluded4 = ["callback"];
+const _excluded = ["user"],
+  _excluded2 = ["callback", "events"],
+  _excluded3 = ["user"],
+  _excluded4 = ["callback", "events"],
+  _excluded5 = ["user"],
+  _excluded6 = ["callback"],
+  _excluded7 = ["callback"];
 var _default = (store, api, sharedActions) => {
   const actions = sharedActions;
   const setActivateState = state => {
@@ -66,12 +69,61 @@ var _default = (store, api, sharedActions) => {
       });
     }
   };
+  const handleActivationResponse = async ({
+    loginResponse,
+    events,
+    onRedirectTo,
+    routes
+  }) => {
+    const {
+        user
+      } = loginResponse,
+      rest = (0, _objectWithoutPropertiesLoose2.default)(loginResponse, _excluded);
+    if (user.redirectLocation) {
+      window.location.href = user.redirectLocation;
+      return;
+    }
+    if ((0, _helpers2.isMfaRequired)(user, store.root.appName)) {
+      setActivateState({
+        step: _interfaces.ActivateAccountStep.success
+      });
+      const mfaRequiredState = await actions.getMfaRequiredState(user);
+      actions.setAuthState(mfaRequiredState);
+      await (0, _helpers.delay)(1000);
+      onRedirectTo(routes.loginUrl, {
+        preserveQueryParams: true
+      });
+    } else {
+      var _events$userVerified;
+      setActivateState({
+        step: _interfaces.ActivateAccountStep.success
+      });
+      const userVerifiedPayload = {
+        email: user.email,
+        origin: _interfaces2.UserVeirifedOriginTypes.ACTIVATION_LINK,
+        id: user.id,
+        tenantId: user.tenantId,
+        name: user.name,
+        createdAt: new Date()
+      };
+      events == null ? void 0 : (_events$userVerified = events.userVerified) == null ? void 0 : _events$userVerified.call(events, userVerifiedPayload);
+      (0, _gtm.reportGTMEvent)(_gtm.GTMEventAction.USER_VERIFIED, userVerifiedPayload);
+      actions.afterAuthenticationStateUpdate((0, _extends2.default)({
+        user
+      }, rest), {
+        isAuthenticated: true
+      });
+      await (0, _helpers.delay)(1000);
+      await actions.afterAuthNavigation();
+      resetActivateState();
+    }
+  };
   const activateAccount = async _payload => {
     const {
         callback,
         events
       } = _payload,
-      payload = (0, _objectWithoutPropertiesLoose2.default)(_payload, _excluded);
+      payload = (0, _objectWithoutPropertiesLoose2.default)(_payload, _excluded2);
     setActivateState({
       loading: true
     });
@@ -82,45 +134,48 @@ var _default = (store, api, sharedActions) => {
         {
           user
         } = _await$api$auth$activ,
-        rest = (0, _objectWithoutPropertiesLoose2.default)(_await$api$auth$activ, _excluded2);
-      if (user.redirectLocation) {
-        window.location.href = user.redirectLocation;
-        return;
-      }
-      if ((0, _helpers2.isMfaRequired)(user, store.root.appName)) {
-        setActivateState({
-          step: _interfaces.ActivateAccountStep.success
-        });
-        const mfaRequiredState = await actions.getMfaRequiredState(user);
-        actions.setAuthState(mfaRequiredState);
-        await (0, _helpers.delay)(1000);
-        onRedirectTo(routes.loginUrl, {
-          preserveQueryParams: true
-        });
-      } else {
-        var _events$userVerified;
-        setActivateState({
-          step: _interfaces.ActivateAccountStep.success
-        });
-        const userVerifiedPayload = {
-          email: user.email,
-          origin: _interfaces2.UserVeirifedOriginTypes.ACTIVATION_LINK,
-          id: user.id,
-          tenantId: user.tenantId,
-          name: user.name,
-          createdAt: new Date()
-        };
-        events == null ? void 0 : (_events$userVerified = events.userVerified) == null ? void 0 : _events$userVerified.call(events, userVerifiedPayload);
-        (0, _gtm.reportGTMEvent)(_gtm.GTMEventAction.USER_VERIFIED, userVerifiedPayload);
-        await actions.afterAuthenticationStateUpdate((0, _extends2.default)({
+        rest = (0, _objectWithoutPropertiesLoose2.default)(_await$api$auth$activ, _excluded3);
+      await handleActivationResponse({
+        loginResponse: (0, _extends2.default)({
           user
-        }, rest), {
-          isAuthenticated: true
-        });
-        await (0, _helpers.delay)(1000);
-        await actions.afterAuthNavigation();
-        resetActivateState();
-      }
+        }, rest),
+        events,
+        onRedirectTo,
+        routes
+      });
+      callback == null ? void 0 : callback(true);
+    } catch (e) {
+      setActivateState({
+        loading: false,
+        error: (0, _helpers.errorHandler)(e)
+      });
+    }
+  };
+  const activateAccountWithCode = async _payload => {
+    const {
+        callback,
+        events
+      } = _payload,
+      payload = (0, _objectWithoutPropertiesLoose2.default)(_payload, _excluded4);
+    setActivateState({
+      loading: true
+    });
+    try {
+      const onRedirectTo = _restApi.ContextHolder.for(store.root.appName).onRedirectTo;
+      const routes = store.auth.routes;
+      const _await$api$auth$activ2 = await api.auth.activateAccountWithOTC(payload),
+        {
+          user
+        } = _await$api$auth$activ2,
+        rest = (0, _objectWithoutPropertiesLoose2.default)(_await$api$auth$activ2, _excluded5);
+      await handleActivationResponse({
+        loginResponse: (0, _extends2.default)({
+          user
+        }, rest),
+        events,
+        onRedirectTo,
+        routes
+      });
       callback == null ? void 0 : callback(true);
     } catch (e) {
       setActivateState({
@@ -133,7 +188,7 @@ var _default = (store, api, sharedActions) => {
     const {
         callback
       } = payload,
-      params = (0, _objectWithoutPropertiesLoose2.default)(payload, _excluded3);
+      params = (0, _objectWithoutPropertiesLoose2.default)(payload, _excluded6);
     setActivateStrategyState({
       loading: true
     });
@@ -156,7 +211,7 @@ var _default = (store, api, sharedActions) => {
     const {
         callback
       } = payload,
-      body = (0, _objectWithoutPropertiesLoose2.default)(payload, _excluded4);
+      body = (0, _objectWithoutPropertiesLoose2.default)(payload, _excluded7);
     actions.setTeamLoader({
       key: _interfaces3.TeamStateKeys.RESEND_ACTIVATE_LINK,
       value: body.email
@@ -192,7 +247,8 @@ var _default = (store, api, sharedActions) => {
     activateAccount,
     preActivateAccount,
     getActivateAccountStrategy,
-    resendActivationEmail
+    resendActivationEmail,
+    activateAccountWithCode
   };
 };
 exports.default = _default;

package/node/auth/LoginState/consts.js

@@ -40,6 +40,8 @@ const defaultFronteggRoutes = {
   hostedLoginRedirectUrl: '/oauth/callback',
   openAppUrl: '/account/redirect',
   unlockAccountUrl: '/account/unlock',
+  activateWithOTCUrl: '/account/activate/code',
+  acceptInvitationWithOTCUrl: '/account/invitation/code',
   mfaMobileAuthenticator: '/account/mfa-mobile-authenticator'
 };
 exports.defaultFronteggRoutes = defaultFronteggRoutes;

package/node/index.js

@@ -1,4 +1,4 @@
-/** @license Frontegg v7.15.0
+/** @license Frontegg v7.16.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.15.0",
+  "version": "7.16.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": "3.2.1",
+    "@frontegg/rest-api": "3.2.2",
     "fast-deep-equal": "3.1.3",
     "get-value": "^3.0.1",
     "proxy-compare": "^3.0.0",