@frontegg/redux-store 5.18.1 → 5.20.0

package/auth/ActivateState/index.d.ts

@@ -1,5 +1,5 @@
 import { IActivateAccount, IGetActivateAccountStrategy, IGetActivateAccountStrategyResponse, IResendActivationEmail } from '@frontegg/rest-api';
-import { ActivateAccountState, ActivateAccountStrategyState } from './interfaces';
+import { ActivateAccountState, ActivateAccountStrategyState, IPreActivateAccount } from './interfaces';
 import { WithCallback } from '../../interfaces';
 declare const activateState: ActivateAccountState;
 declare const reducers: {
@@ -106,6 +106,7 @@ declare const reducers: {
 };
 declare const actions: {
     activateAccount: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[WithCallback<IActivateAccount, boolean>], WithCallback<IActivateAccount, boolean>, string, never, never>;
+    preActivateAccount: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[IPreActivateAccount], IPreActivateAccount, string, never, never>;
     getActivateAccountStrategy: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[WithCallback<IGetActivateAccountStrategy, IGetActivateAccountStrategyResponse>], WithCallback<IGetActivateAccountStrategy, IGetActivateAccountStrategyResponse>, string, never, never>;
     resendActivationEmail: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[IResendActivationEmail], IResendActivationEmail, string, never, never>;
 };
@@ -118,6 +119,7 @@ declare type DispatchedActions = {
     resetActivateState: () => void;
     setActivateStrategyState: (state: Partial<ActivateAccountStrategyState>) => void;
     activateAccount: (payload: WithCallback<IActivateAccount>) => void;
+    preActivateAccount: (payload: IPreActivateAccount) => void;
     resendActivationEmail: (payload: IResendActivationEmail) => void;
     getActivateAccountStrategy: (payload: WithCallback<IGetActivateAccountStrategy, IGetActivateAccountStrategyResponse>) => void;
 };

package/auth/ActivateState/interfaces.d.ts

@@ -3,7 +3,8 @@ import { WithStatus } from '../../interfaces';
 export declare enum ActivateAccountStep {
     'activating' = "activating",
     'success' = "success",
-    'resend' = "resend"
+    'resend' = "resend",
+    'activatingForm' = "activatingForm"
 }
 export interface ActivateAccountState {
     loading: boolean;
@@ -12,6 +13,10 @@ export interface ActivateAccountState {
     resentEmail: boolean;
     activationStrategy: ActivateAccountStrategyState;
 }
+export declare type IPreActivateAccount = {
+    userId: string;
+    token: string;
+};
 export declare type ActivateAccountStrategyState = WithStatus & {
     strategy?: IGetActivateAccountStrategyResponse;
 };

package/auth/index.d.ts

@@ -223,6 +223,7 @@ declare const _default: {
         loadPasswordConfig: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[(import("@frontegg/rest-api").IGetUserPasswordConfig | undefined)?], import("@frontegg/rest-api").IGetUserPasswordConfig | undefined, string, never, never>;
         acceptInvitation: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[import("@frontegg/rest-api").IAcceptInvitation], import("@frontegg/rest-api").IAcceptInvitation, string, never, never>;
         activateAccount: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[import("../interfaces").WithCallback<import("@frontegg/rest-api").IActivateAccount, boolean>], import("../interfaces").WithCallback<import("@frontegg/rest-api").IActivateAccount, boolean>, string, never, never>;
+        preActivateAccount: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[import("./ActivateState/interfaces").IPreActivateAccount], import("./ActivateState/interfaces").IPreActivateAccount, string, never, never>;
         getActivateAccountStrategy: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[import("../interfaces").WithCallback<import("@frontegg/rest-api").IGetActivateAccountStrategy, import("@frontegg/rest-api").IGetActivateAccountStrategyResponse>], import("../interfaces").WithCallback<import("@frontegg/rest-api").IGetActivateAccountStrategy, import("@frontegg/rest-api").IGetActivateAccountStrategyResponse>, string, never, never>;
         resendActivationEmail: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[import("@frontegg/rest-api").IResendActivationEmail], import("@frontegg/rest-api").IResendActivationEmail, string, never, never>;
         loadSocialLoginsConfiguration: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>;

package/auth/index.js

@@ -86,6 +86,7 @@ var ActivateAccountStep;
     ActivateAccountStep["activating"] = "activating";
     ActivateAccountStep["success"] = "success";
     ActivateAccountStep["resend"] = "resend";
+    ActivateAccountStep["activatingForm"] = "activatingForm";
 })(ActivateAccountStep || (ActivateAccountStep = {}));
 
 const activateState = {
@@ -103,6 +104,7 @@ const reducers$d = {
 };
 const actions$e = {
     activateAccount: createAction(`${authStoreName}/activateAccount`, (payload) => ({ payload })),
+    preActivateAccount: createAction(`${authStoreName}/preActivateAccount`, (payload) => ({ payload })),
     getActivateAccountStrategy: createAction(`${authStoreName}/getActivateAccountStrategy`, (payload) => ({ payload })),
     resendActivationEmail: createAction(`${authStoreName}/resendActivationEmail`, (payload) => ({
         payload,
@@ -916,8 +918,8 @@ function* refreshToken() {
         else {
             yield put(actions.setTenantsState({ tenants, loading: false }));
             yield put(actions.setState({ user, isAuthenticated: true }));
-            if ([routes.loginUrl, routes.socialLoginCallbackUrl, routes.signUpUrl, routes.oidcRedirectUrl, routes.samlCallbackUrl].some(url => url && window.location.pathname.endsWith(url)) ||
-                (window.location.pathname.endsWith(routes.activateUrl) && user.verified)) {
+            if ([routes.loginUrl, routes.socialLoginCallbackUrl, routes.signUpUrl, routes.oidcRedirectUrl, routes.samlCallbackUrl]
+                .some(url => url && window.location.pathname.endsWith(url))) {
                 if (loginState.isNewUser && routes.signUpSuccessUrl && routes.socialLoginCallbackUrl === window.location.pathname) {
                     onRedirectTo(routes.signUpSuccessUrl, { refresh: routes.signUpSuccessUrl.startsWith('http') });
                 }
@@ -2111,6 +2113,23 @@ function* forgotPasswordSagas() {
     yield takeLeading(actions.loadPasswordConfig, loadPasswordConfig);
 }
 
+function* preActivateAccount({ payload: { userId, token } }) {
+    yield put(actions.setActivateState({ loading: true, step: ActivateAccountStep.activating }));
+    try {
+        const { isAuthenticated } = yield select((state) => state.auth);
+        if (isAuthenticated) {
+            yield put(actions.silentLogout());
+        }
+        const strategy = yield call(api.auth.getActivateAccountStrategy, { userId, token });
+        yield put(actions.setActivateStrategyState({ strategy, loading: false, error: undefined }));
+        if (strategy.shouldSetPassword) {
+            yield put(actions.setActivateState({ loading: false, step: ActivateAccountStep.activatingForm }));
+        }
+    }
+    catch (e) {
+        yield put(actions.setActivateState({ loading: false, error: e.message }));
+    }
+}
 function* activateAccount(_a) {
     var _b = _a.payload, { callback } = _b, payload = __rest(_b, ["callback"]);
     yield put(actions.setActivateState({ loading: true }));
@@ -2123,8 +2142,10 @@ function* activateAccount(_a) {
             return;
         }
         if (isMfaRequired(data)) {
+            yield put(actions.setActivateState({ step: ActivateAccountStep.success }));
             const mfaRequiredState = yield getMfaRequiredState(data);
             yield put(actions.setState(mfaRequiredState));
+            yield delay$1(1000);
             onRedirectTo(routes.loginUrl, { preserveQueryParams: true });
         }
         else {
@@ -2166,6 +2187,7 @@ function* resendActivationEmailFunction({ payload }) {
 }
 function* activateSagas() {
     yield takeLeading(actions.activateAccount, activateAccount);
+    yield takeLeading(actions.preActivateAccount, preActivateAccount);
     yield takeLeading(actions.getActivateAccountStrategy, getActivateAccountStrategy);
     yield takeLeading(actions.resendActivationEmail, resendActivationEmailFunction);
 }

package/auth/reducer.d.ts

@@ -197,6 +197,7 @@ declare const actions: {
     loadPasswordConfig: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[(import("@frontegg/rest-api").IGetUserPasswordConfig | undefined)?], import("@frontegg/rest-api").IGetUserPasswordConfig | undefined, string, never, never>;
     acceptInvitation: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[import("@frontegg/rest-api").IAcceptInvitation], import("@frontegg/rest-api").IAcceptInvitation, string, never, never>;
     activateAccount: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[import("../interfaces").WithCallback<import("@frontegg/rest-api").IActivateAccount, boolean>], import("../interfaces").WithCallback<import("@frontegg/rest-api").IActivateAccount, boolean>, string, never, never>;
+    preActivateAccount: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[import(".").IPreActivateAccount], import(".").IPreActivateAccount, string, never, never>;
     getActivateAccountStrategy: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[import("../interfaces").WithCallback<import("@frontegg/rest-api").IGetActivateAccountStrategy, import("@frontegg/rest-api").IGetActivateAccountStrategyResponse>], import("../interfaces").WithCallback<import("@frontegg/rest-api").IGetActivateAccountStrategy, import("@frontegg/rest-api").IGetActivateAccountStrategyResponse>, string, never, never>;
     resendActivationEmail: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[import("@frontegg/rest-api").IResendActivationEmail], import("@frontegg/rest-api").IResendActivationEmail, string, never, never>;
     loadSocialLoginsConfiguration: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>;

package/node/auth/index.js

@@ -88,6 +88,7 @@ exports.ActivateAccountStep = void 0;
     ActivateAccountStep["activating"] = "activating";
     ActivateAccountStep["success"] = "success";
     ActivateAccountStep["resend"] = "resend";
+    ActivateAccountStep["activatingForm"] = "activatingForm";
 })(exports.ActivateAccountStep || (exports.ActivateAccountStep = {}));
 
 const activateState = {
@@ -105,6 +106,7 @@ const reducers$d = {
 };
 const actions$e = {
     activateAccount: toolkit.createAction(`${constants.authStoreName}/activateAccount`, (payload) => ({ payload })),
+    preActivateAccount: toolkit.createAction(`${constants.authStoreName}/preActivateAccount`, (payload) => ({ payload })),
     getActivateAccountStrategy: toolkit.createAction(`${constants.authStoreName}/getActivateAccountStrategy`, (payload) => ({ payload })),
     resendActivationEmail: toolkit.createAction(`${constants.authStoreName}/resendActivationEmail`, (payload) => ({
         payload,
@@ -918,8 +920,8 @@ function* refreshToken() {
         else {
             yield effects.put(actions.setTenantsState({ tenants, loading: false }));
             yield effects.put(actions.setState({ user, isAuthenticated: true }));
-            if ([routes.loginUrl, routes.socialLoginCallbackUrl, routes.signUpUrl, routes.oidcRedirectUrl, routes.samlCallbackUrl].some(url => url && window.location.pathname.endsWith(url)) ||
-                (window.location.pathname.endsWith(routes.activateUrl) && user.verified)) {
+            if ([routes.loginUrl, routes.socialLoginCallbackUrl, routes.signUpUrl, routes.oidcRedirectUrl, routes.samlCallbackUrl]
+                .some(url => url && window.location.pathname.endsWith(url))) {
                 if (loginState.isNewUser && routes.signUpSuccessUrl && routes.socialLoginCallbackUrl === window.location.pathname) {
                     onRedirectTo(routes.signUpSuccessUrl, { refresh: routes.signUpSuccessUrl.startsWith('http') });
                 }
@@ -2113,6 +2115,23 @@ function* forgotPasswordSagas() {
     yield effects.takeLeading(actions.loadPasswordConfig, loadPasswordConfig);
 }
 
+function* preActivateAccount({ payload: { userId, token } }) {
+    yield effects.put(actions.setActivateState({ loading: true, step: exports.ActivateAccountStep.activating }));
+    try {
+        const { isAuthenticated } = yield effects.select((state) => state.auth);
+        if (isAuthenticated) {
+            yield effects.put(actions.silentLogout());
+        }
+        const strategy = yield effects.call(restApi.api.auth.getActivateAccountStrategy, { userId, token });
+        yield effects.put(actions.setActivateStrategyState({ strategy, loading: false, error: undefined }));
+        if (strategy.shouldSetPassword) {
+            yield effects.put(actions.setActivateState({ loading: false, step: exports.ActivateAccountStep.activatingForm }));
+        }
+    }
+    catch (e) {
+        yield effects.put(actions.setActivateState({ loading: false, error: e.message }));
+    }
+}
 function* activateAccount(_a) {
     var _b = _a.payload, { callback } = _b, payload = tslib.__rest(_b, ["callback"]);
     yield effects.put(actions.setActivateState({ loading: true }));
@@ -2125,8 +2144,10 @@ function* activateAccount(_a) {
             return;
         }
         if (isMfaRequired(data)) {
+            yield effects.put(actions.setActivateState({ step: exports.ActivateAccountStep.success }));
             const mfaRequiredState = yield getMfaRequiredState(data);
             yield effects.put(actions.setState(mfaRequiredState));
+            yield effects.delay(1000);
             onRedirectTo(routes.loginUrl, { preserveQueryParams: true });
         }
         else {
@@ -2168,6 +2189,7 @@ function* resendActivationEmailFunction({ payload }) {
 }
 function* activateSagas() {
     yield effects.takeLeading(actions.activateAccount, activateAccount);
+    yield effects.takeLeading(actions.preActivateAccount, preActivateAccount);
     yield effects.takeLeading(actions.getActivateAccountStrategy, getActivateAccountStrategy);
     yield effects.takeLeading(actions.resendActivationEmail, resendActivationEmailFunction);
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@frontegg/redux-store",
   "libName": "FronteggReduxStore",
-  "version": "5.18.1",
+  "version": "5.20.0",
   "author": "Frontegg LTD",
   "main": "./node/index.js",
   "module": "./index.js",