@frontegg/redux-store 7.53.0 → 7.54.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (14) hide show
  1. package/auth/ActivateAccountState/actions.js +10 -2
  2. package/auth/ActivateAccountState/interfaces.d.ts +1 -0
  3. package/auth/ActivateAccountState/state.js +1 -0
  4. package/auth/LoginState/actions/afterAuthNavigation.actions.js +3 -2
  5. package/auth/SignUpState/actions.js +16 -2
  6. package/auth/UnlockAccountState/actions.js +1 -1
  7. package/index.js +1 -1
  8. package/node/auth/ActivateAccountState/actions.js +10 -2
  9. package/node/auth/ActivateAccountState/state.js +1 -0
  10. package/node/auth/LoginState/actions/afterAuthNavigation.actions.js +3 -2
  11. package/node/auth/SignUpState/actions.js +16 -2
  12. package/node/auth/UnlockAccountState/actions.js +1 -1
  13. package/node/index.js +1 -1
  14. package/package.json +2 -2
package/auth/ActivateAccountState/actions.js CHANGED
@@ -118,7 +118,8 @@ export default ((store, api, sharedActions) => {
118
118
  } = _payload,
119
119
  payload = _objectWithoutPropertiesLoose(_payload, _excluded2);
120
120
  setActivateState({
121
- loading: true
121
+ loading: true,
122
+ submitting: true
122
123
  });
123
124
  try {
124
125
  const onRedirectTo = ContextHolder.for(store.root.appName).onRedirectTo;
@@ -128,6 +129,9 @@ export default ((store, api, sharedActions) => {
128
129
  user
129
130
  } = _await$api$auth$activ,
130
131
  rest = _objectWithoutPropertiesLoose(_await$api$auth$activ, _excluded3);
132
+ setActivateState({
133
+ submitting: false
134
+ });
131
135
  await handleActivationResponse({
132
136
  loginResponse: _extends({
133
137
  user
@@ -151,7 +155,8 @@ export default ((store, api, sharedActions) => {
151
155
  } = _payload,
152
156
  payload = _objectWithoutPropertiesLoose(_payload, _excluded4);
153
157
  setActivateState({
154
- loading: true
158
+ loading: true,
159
+ submitting: true
155
160
  });
156
161
  try {
157
162
  const onRedirectTo = ContextHolder.for(store.root.appName).onRedirectTo;
@@ -161,6 +166,9 @@ export default ((store, api, sharedActions) => {
161
166
  user
162
167
  } = _await$api$auth$activ2,
163
168
  rest = _objectWithoutPropertiesLoose(_await$api$auth$activ2, _excluded5);
169
+ setActivateState({
170
+ submitting: false
171
+ });
164
172
  await handleActivationResponse({
165
173
  loginResponse: _extends({
166
174
  user
package/auth/ActivateAccountState/interfaces.d.ts CHANGED
@@ -9,6 +9,7 @@ export declare enum ActivateAccountStep {
9
9
  }
10
10
  export interface ActivateAccountState {
11
11
  loading: boolean;
12
+ submitting: boolean;
12
13
  error?: any;
13
14
  step: ActivateAccountStep;
14
15
  resentEmail: boolean;
package/auth/ActivateAccountState/state.js CHANGED
@@ -3,6 +3,7 @@ import { createProxy } from '../../toolkit/proxy';
3
3
  export const initialState = {
4
4
  step: ActivateAccountStep.activating,
5
5
  loading: false,
6
+ submitting: false,
6
7
  resentEmail: false,
7
8
  activationStrategy: {
8
9
  loading: false
package/auth/LoginState/actions/afterAuthNavigation.actions.js CHANGED
@@ -69,10 +69,11 @@ export default ((store, api, sharedActions) => {
69
69
  loginUrl,
70
70
  logoutUrl,
71
71
  socialLoginCallbackUrl,
72
- activateUrl
72
+ activateUrl,
73
+ activateWithOTCUrl
73
74
  } = routes;
74
75
  let finalUrl = urlFromLocalStorage;
75
- if (!finalUrl || [loginUrl, logoutUrl, socialLoginCallbackUrl, activateUrl].includes(finalUrl)) {
76
+ if (!finalUrl || [loginUrl, logoutUrl, socialLoginCallbackUrl, activateUrl, activateWithOTCUrl].includes(finalUrl)) {
76
77
  finalUrl = authenticatedUrl;
77
78
  }
78
79
  const redirectUrl = getRedirectUrl({
package/auth/SignUpState/actions.js CHANGED
@@ -49,7 +49,8 @@ export default ((store, api, sharedActions) => {
49
49
  tenantId,
50
50
  userId,
51
51
  tenants = [],
52
- activeTenant
52
+ activeTenant,
53
+ activationToken
53
54
  } = await api.auth.signUpUser(
54
55
  //Currently we are not supporting phone number in signup in the backend
55
56
  //Remove this line when we will support it (also make sure when field is optional no empty string is sent)
@@ -71,7 +72,8 @@ export default ((store, api, sharedActions) => {
71
72
  authenticationType: AuthenticationTypes.PASSWORD,
72
73
  id: userId,
73
74
  tenantId,
74
- createdAt: new Date()
75
+ createdAt: new Date(),
76
+ activationToken
75
77
  };
76
78
  events == null ? void 0 : (_events$signUpComplet = events.signUpComplete) == null ? void 0 : _events$signUpComplet.call(events, signUpCompletePayload);
77
79
  reportGTMEvent(GTMEventAction.SIGNUP_COMPLETED, signUpCompletePayload);
@@ -80,6 +82,18 @@ export default ((store, api, sharedActions) => {
80
82
  const mfaRequiredState = await actions.getMfaRequiredState(user, DEFAULT_RETRY_CONFIG, true, payload.email);
81
83
  actions.setAuthState(mfaRequiredState);
82
84
  onRedirectTo(routes.loginUrl);
85
+ } else if (shouldActivate && activationToken) {
86
+ const searchParams = new URLSearchParams({
87
+ userId: userId || '',
88
+ token: activationToken || ''
89
+ });
90
+ const url = `${routes.activateWithOTCUrl}?${searchParams.toString()}`;
91
+ setSignUpState({
92
+ loading: false,
93
+ shouldActivate,
94
+ stage: SignUpStage.SignUpSuccess
95
+ });
96
+ onRedirectTo(url);
83
97
  } else {
84
98
  const tenantsState = store.auth.tenantsState;
85
99
  setSignUpState({
package/auth/UnlockAccountState/actions.js CHANGED
@@ -26,7 +26,7 @@ export default ((store, api, sharedActions) => {
26
26
  error: undefined,
27
27
  unlockAccountSuccess: true
28
28
  });
29
- await delay(1000);
29
+ await delay(5000);
30
30
  onRedirectTo(routes.loginUrl);
31
31
  } catch (e) {
32
32
  setUnlockAccountState({
package/index.js CHANGED
@@ -1,4 +1,4 @@
1
- /** @license Frontegg v7.53.0
1
+ /** @license Frontegg v7.54.0
2
2
  *
3
3
  * This source code is licensed under the MIT license found in the
4
4
  * LICENSE file in the root directory of this source tree.
package/node/auth/ActivateAccountState/actions.js CHANGED
@@ -125,7 +125,8 @@ var _default = (store, api, sharedActions) => {
125
125
  } = _payload,
126
126
  payload = (0, _objectWithoutPropertiesLoose2.default)(_payload, _excluded2);
127
127
  setActivateState({
128
- loading: true
128
+ loading: true,
129
+ submitting: true
129
130
  });
130
131
  try {
131
132
  const onRedirectTo = _restApi.ContextHolder.for(store.root.appName).onRedirectTo;
@@ -135,6 +136,9 @@ var _default = (store, api, sharedActions) => {
135
136
  user
136
137
  } = _await$api$auth$activ,
137
138
  rest = (0, _objectWithoutPropertiesLoose2.default)(_await$api$auth$activ, _excluded3);
139
+ setActivateState({
140
+ submitting: false
141
+ });
138
142
  await handleActivationResponse({
139
143
  loginResponse: (0, _extends2.default)({
140
144
  user
@@ -158,7 +162,8 @@ var _default = (store, api, sharedActions) => {
158
162
  } = _payload,
159
163
  payload = (0, _objectWithoutPropertiesLoose2.default)(_payload, _excluded4);
160
164
  setActivateState({
161
- loading: true
165
+ loading: true,
166
+ submitting: true
162
167
  });
163
168
  try {
164
169
  const onRedirectTo = _restApi.ContextHolder.for(store.root.appName).onRedirectTo;
@@ -168,6 +173,9 @@ var _default = (store, api, sharedActions) => {
168
173
  user
169
174
  } = _await$api$auth$activ2,
170
175
  rest = (0, _objectWithoutPropertiesLoose2.default)(_await$api$auth$activ2, _excluded5);
176
+ setActivateState({
177
+ submitting: false
178
+ });
171
179
  await handleActivationResponse({
172
180
  loginResponse: (0, _extends2.default)({
173
181
  user
package/node/auth/ActivateAccountState/state.js CHANGED
@@ -9,6 +9,7 @@ var _proxy = require("../../toolkit/proxy");
9
9
  const initialState = {
10
10
  step: _interfaces.ActivateAccountStep.activating,
11
11
  loading: false,
12
+ submitting: false,
12
13
  resentEmail: false,
13
14
  activationStrategy: {
14
15
  loading: false
package/node/auth/LoginState/actions/afterAuthNavigation.actions.js CHANGED
@@ -76,10 +76,11 @@ var _default = (store, api, sharedActions) => {
76
76
  loginUrl,
77
77
  logoutUrl,
78
78
  socialLoginCallbackUrl,
79
- activateUrl
79
+ activateUrl,
80
+ activateWithOTCUrl
80
81
  } = routes;
81
82
  let finalUrl = urlFromLocalStorage;
82
- if (!finalUrl || [loginUrl, logoutUrl, socialLoginCallbackUrl, activateUrl].includes(finalUrl)) {
83
+ if (!finalUrl || [loginUrl, logoutUrl, socialLoginCallbackUrl, activateUrl, activateWithOTCUrl].includes(finalUrl)) {
83
84
  finalUrl = authenticatedUrl;
84
85
  }
85
86
  const redirectUrl = (0, _helpers.getRedirectUrl)({
package/node/auth/SignUpState/actions.js CHANGED
@@ -56,7 +56,8 @@ var _default = (store, api, sharedActions) => {
56
56
  tenantId,
57
57
  userId,
58
58
  tenants = [],
59
- activeTenant
59
+ activeTenant,
60
+ activationToken
60
61
  } = await api.auth.signUpUser(
61
62
  //Currently we are not supporting phone number in signup in the backend
62
63
  //Remove this line when we will support it (also make sure when field is optional no empty string is sent)
@@ -78,7 +79,8 @@ var _default = (store, api, sharedActions) => {
78
79
  authenticationType: _interfaces2.AuthenticationTypes.PASSWORD,
79
80
  id: userId,
80
81
  tenantId,
81
- createdAt: new Date()
82
+ createdAt: new Date(),
83
+ activationToken
82
84
  };
83
85
  events == null ? void 0 : (_events$signUpComplet = events.signUpComplete) == null ? void 0 : _events$signUpComplet.call(events, signUpCompletePayload);
84
86
  (0, _gtm.reportGTMEvent)(_gtm.GTMEventAction.SIGNUP_COMPLETED, signUpCompletePayload);
@@ -87,6 +89,18 @@ var _default = (store, api, sharedActions) => {
87
89
  const mfaRequiredState = await actions.getMfaRequiredState(user, _constants.DEFAULT_RETRY_CONFIG, true, payload.email);
88
90
  actions.setAuthState(mfaRequiredState);
89
91
  onRedirectTo(routes.loginUrl);
92
+ } else if (shouldActivate && activationToken) {
93
+ const searchParams = new URLSearchParams({
94
+ userId: userId || '',
95
+ token: activationToken || ''
96
+ });
97
+ const url = `${routes.activateWithOTCUrl}?${searchParams.toString()}`;
98
+ setSignUpState({
99
+ loading: false,
100
+ shouldActivate,
101
+ stage: _interfaces.SignUpStage.SignUpSuccess
102
+ });
103
+ onRedirectTo(url);
90
104
  } else {
91
105
  const tenantsState = store.auth.tenantsState;
92
106
  setSignUpState({
package/node/auth/UnlockAccountState/actions.js CHANGED
@@ -32,7 +32,7 @@ var _default = (store, api, sharedActions) => {
32
32
  error: undefined,
33
33
  unlockAccountSuccess: true
34
34
  });
35
- await (0, _helpers.delay)(1000);
35
+ await (0, _helpers.delay)(5000);
36
36
  onRedirectTo(routes.loginUrl);
37
37
  } catch (e) {
38
38
  setUnlockAccountState({
package/node/index.js CHANGED
@@ -1,4 +1,4 @@
1
- /** @license Frontegg v7.53.0
1
+ /** @license Frontegg v7.54.0
2
2
  *
3
3
  * This source code is licensed under the MIT license found in the
4
4
  * LICENSE file in the root directory of this source tree.
package/package.json CHANGED
@@ -1,13 +1,13 @@
1
1
  {
2
2
  "name": "@frontegg/redux-store",
3
- "version": "7.53.0",
3
+ "version": "7.54.0",
4
4
  "main": "./node/index.js",
5
5
  "license": "MIT",
6
6
  "author": "Frontegg LTD",
7
7
  "dependencies": {
8
8
  "@babel/runtime": "^7.18.6",
9
9
  "@frontegg/entitlements-javascript-commons": "1.1.2",
10
- "@frontegg/rest-api": "7.53.0",
10
+ "@frontegg/rest-api": "7.54.0",
11
11
  "fast-deep-equal": "3.1.3",
12
12
  "get-value": "^3.0.1",
13
13
  "proxy-compare": "^3.0.0",