@stokr/components-library 2.0.0-beta.19 → 2.0.0-beta.20
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.
- package/dist/components/2FA/Connect2FA.js +4 -2
- package/dist/components/2FA/Sucess2FA.js +15 -6
- package/dist/components/2FA/disable-2fa-flow.js +10 -133
- package/dist/components/2FA/main-flow.js +5 -4
- package/dist/components/2FA/main-flow.stories.js +1 -1
- package/dist/components/MainMenu/MainMenu.js +2 -2
- package/dist/components/Switch/Switch.js +8 -5
- package/dist/components/VerifyEmailModal/VerifyEmailModal.js +5 -1
- package/dist/components/headerHo/HeaderHo.js +5 -0
- package/dist/components/headerHo/HeaderHo.stories.js +5 -1
- package/dist/context/AuthContext.js +20 -19
- package/package.json +1 -1
|
@@ -39,7 +39,8 @@ var Connect2FA = function Connect2FA(props) {
|
|
|
39
39
|
}, /*#__PURE__*/_react.default.createElement(_Text.default, {
|
|
40
40
|
small: true
|
|
41
41
|
}, /*#__PURE__*/_react.default.createElement("p", null, "1. Start Google Authenticator or a similar app on your phone"), /*#__PURE__*/_react.default.createElement("p", null, "2. In the app, add a new account and scan the QR code below"), /*#__PURE__*/_react.default.createElement("p", null, "3. Click Continue when you are done"))), totpData && /*#__PURE__*/_react.default.createElement(_ComponentWrapper.default, {
|
|
42
|
-
center: true
|
|
42
|
+
center: true,
|
|
43
|
+
noPaddingHorizontal: true
|
|
43
44
|
}, _reactDeviceDetect.isMobile ? /*#__PURE__*/_react.default.createElement(_TextLink.default, {
|
|
44
45
|
to: "otpauth://totp/".concat(user.email, "?secret=").concat((_totpData$totpSecret = totpData.totpSecret) === null || _totpData$totpSecret === void 0 ? void 0 : _totpData$totpSecret.secretKey, "&issuer=STOKR")
|
|
45
46
|
// onClick={() => {
|
|
@@ -69,7 +70,8 @@ var Connect2FA = function Connect2FA(props) {
|
|
|
69
70
|
paddingRight: 0
|
|
70
71
|
},
|
|
71
72
|
dataBoxStyle: {
|
|
72
|
-
width: '100%'
|
|
73
|
+
width: '100%',
|
|
74
|
+
whiteSpace: 'nowrap'
|
|
73
75
|
}
|
|
74
76
|
})), /*#__PURE__*/_react.default.createElement(_ComponentWrapper.default, {
|
|
75
77
|
noPaddingTop: true,
|
|
@@ -12,24 +12,33 @@ var _Button = _interopRequireDefault(require("../Button/Button.styles"));
|
|
|
12
12
|
var _SectionTitle = _interopRequireDefault(require("../SectionTitle/SectionTitle.styles"));
|
|
13
13
|
var _ComponentWrapper = _interopRequireDefault(require("../ComponentWrapper/ComponentWrapper.styles"));
|
|
14
14
|
var _ComponentScroll = _interopRequireDefault(require("../ComponentScroll/ComponentScroll"));
|
|
15
|
+
var _Grid = require("../Grid/Grid.styles");
|
|
15
16
|
var _Modal = require("../Modal/Modal.styles");
|
|
16
17
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
17
18
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
18
19
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
19
20
|
var Sucess2FA = function Sucess2FA(_ref) {
|
|
20
21
|
var _onClick = _ref.onClick;
|
|
21
|
-
return /*#__PURE__*/_react.default.createElement(_Modal.ModalWrapper, null, /*#__PURE__*/_react.default.createElement(
|
|
22
|
-
|
|
23
|
-
}, /*#__PURE__*/_react.default.createElement(
|
|
24
|
-
|
|
25
|
-
|
|
22
|
+
return /*#__PURE__*/_react.default.createElement(_Modal.ModalWrapper, null, /*#__PURE__*/_react.default.createElement(_Grid.Row, null, /*#__PURE__*/_react.default.createElement(_Grid.Column, {
|
|
23
|
+
part: 8
|
|
24
|
+
}, /*#__PURE__*/_react.default.createElement(_Modal.ModalInner, {
|
|
25
|
+
modalTop: true
|
|
26
|
+
}, /*#__PURE__*/_react.default.createElement(_Text.default, null, /*#__PURE__*/_react.default.createElement("h3", null, "Success"), /*#__PURE__*/_react.default.createElement("p", null, "One step ahead to more secure account"))), /*#__PURE__*/_react.default.createElement(_Modal.ModalInner, {
|
|
27
|
+
modalBot: true
|
|
28
|
+
})), /*#__PURE__*/_react.default.createElement(_Grid.Column, {
|
|
29
|
+
part: 8
|
|
30
|
+
}, /*#__PURE__*/_react.default.createElement(_Modal.ModalInner, null, /*#__PURE__*/_react.default.createElement(_ComponentWrapper.default, {
|
|
31
|
+
noPaddingVertical: true,
|
|
32
|
+
noPaddingHorizontal: true
|
|
33
|
+
}, /*#__PURE__*/_react.default.createElement(_Text.default, null, /*#__PURE__*/_react.default.createElement("p", null, "Congratulations! You have successfully enabled two factor authentication for your account"))), /*#__PURE__*/_react.default.createElement(_ComponentWrapper.default, {
|
|
34
|
+
noPaddingHorizontal: true
|
|
26
35
|
}, /*#__PURE__*/_react.default.createElement(_Button.default, {
|
|
27
36
|
minWidth: "240px",
|
|
28
37
|
onClick: function onClick() {
|
|
29
38
|
// deleteRedirectCookieAndNavigate()
|
|
30
39
|
_onClick();
|
|
31
40
|
}
|
|
32
|
-
}, "Continue"))));
|
|
41
|
+
}, "Continue"))))));
|
|
33
42
|
};
|
|
34
43
|
exports.Sucess2FA = Sucess2FA;
|
|
35
44
|
Sucess2FA.propTypes = {
|
|
@@ -12,7 +12,7 @@ var _ComponentWrapper = _interopRequireDefault(require("../ComponentWrapper/Comp
|
|
|
12
12
|
var _Modal = require("../Modal/Modal");
|
|
13
13
|
var _Text = _interopRequireDefault(require("../Text/Text.styles"));
|
|
14
14
|
var _Button = _interopRequireDefault(require("../Button/Button.styles"));
|
|
15
|
-
var _excluded = ["showFlow", "setShowFlow", "onSuccess"];
|
|
15
|
+
var _excluded = ["showFlow", "setShowFlow", "onSuccess", "onRequiresRecentLoginError"];
|
|
16
16
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
17
17
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
18
18
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
@@ -36,30 +36,16 @@ var Disable2FA = function Disable2FA(_ref) {
|
|
|
36
36
|
var showFlow = _ref.showFlow,
|
|
37
37
|
setShowFlow = _ref.setShowFlow,
|
|
38
38
|
onSuccess = _ref.onSuccess,
|
|
39
|
+
onRequiresRecentLoginError = _ref.onRequiresRecentLoginError,
|
|
39
40
|
props = _objectWithoutProperties(_ref, _excluded);
|
|
40
41
|
var _useContext = (0, _react.useContext)(_AuthContext.AuthContext),
|
|
41
|
-
loginUser = _useContext.loginUser,
|
|
42
|
-
user = _useContext.user,
|
|
43
42
|
unenrollUser2FA = _useContext.unenrollUser2FA;
|
|
44
43
|
var _useState = (0, _react.useState)({
|
|
45
|
-
confirmDisable: false
|
|
46
|
-
login: false,
|
|
47
|
-
enter2fa: false
|
|
44
|
+
confirmDisable: false
|
|
48
45
|
}),
|
|
49
46
|
_useState2 = _slicedToArray(_useState, 2),
|
|
50
47
|
isModalOpen = _useState2[0],
|
|
51
48
|
setIsModalOpen = _useState2[1];
|
|
52
|
-
var _useState3 = (0, _react.useState)(),
|
|
53
|
-
_useState4 = _slicedToArray(_useState3, 2),
|
|
54
|
-
isActionLoading = _useState4[0],
|
|
55
|
-
setIsActionLoading = _useState4[1];
|
|
56
|
-
var _useState5 = (0, _react.useState)({
|
|
57
|
-
popup: undefined,
|
|
58
|
-
message: undefined
|
|
59
|
-
}),
|
|
60
|
-
_useState6 = _slicedToArray(_useState5, 2),
|
|
61
|
-
popupError = _useState6[0],
|
|
62
|
-
setPopupError = _useState6[1];
|
|
63
49
|
(0, _react.useEffect)(function () {
|
|
64
50
|
if (showFlow) {
|
|
65
51
|
setIsModalOpen(_objectSpread(_objectSpread({}, isModalOpen), {}, {
|
|
@@ -67,22 +53,6 @@ var Disable2FA = function Disable2FA(_ref) {
|
|
|
67
53
|
}));
|
|
68
54
|
}
|
|
69
55
|
}, [props.showFlow]);
|
|
70
|
-
var switchOpenModal = function switchOpenModal(prevModalId, nextModalId) {
|
|
71
|
-
var _objectSpread2;
|
|
72
|
-
setIsModalOpen(_objectSpread(_objectSpread({}, isModalOpen), {}, (_objectSpread2 = {}, _defineProperty(_objectSpread2, prevModalId, false), _defineProperty(_objectSpread2, nextModalId, true), _objectSpread2)));
|
|
73
|
-
};
|
|
74
|
-
var handleSetPopupError = function handleSetPopupError(popup, message) {
|
|
75
|
-
setPopupError({
|
|
76
|
-
popup: popup,
|
|
77
|
-
message: message
|
|
78
|
-
});
|
|
79
|
-
};
|
|
80
|
-
var clearPopupError = function clearPopupError() {
|
|
81
|
-
setPopupError({
|
|
82
|
-
popup: undefined,
|
|
83
|
-
message: undefined
|
|
84
|
-
});
|
|
85
|
-
};
|
|
86
56
|
var handleDisableClick = /*#__PURE__*/function () {
|
|
87
57
|
var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
|
|
88
58
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
@@ -94,13 +64,16 @@ var Disable2FA = function Disable2FA(_ref) {
|
|
|
94
64
|
case 3:
|
|
95
65
|
setShowFlow(false);
|
|
96
66
|
onSuccess && onSuccess();
|
|
97
|
-
_context.next =
|
|
67
|
+
_context.next = 11;
|
|
98
68
|
break;
|
|
99
69
|
case 7:
|
|
100
70
|
_context.prev = 7;
|
|
101
71
|
_context.t0 = _context["catch"](0);
|
|
102
|
-
console.log('🚀 ~ file: disable-2fa-flow.js
|
|
103
|
-
|
|
72
|
+
console.log('🚀 ~ file: disable-2fa-flow.js ~ error:', _context.t0);
|
|
73
|
+
if (_context.t0.code === 'auth/requires-recent-login') {
|
|
74
|
+
onRequiresRecentLoginError && onRequiresRecentLoginError();
|
|
75
|
+
}
|
|
76
|
+
case 11:
|
|
104
77
|
case "end":
|
|
105
78
|
return _context.stop();
|
|
106
79
|
}
|
|
@@ -129,103 +102,7 @@ var Disable2FA = function Disable2FA(_ref) {
|
|
|
129
102
|
}
|
|
130
103
|
}, "Cancel"), /*#__PURE__*/_react.default.createElement(_Button.default, {
|
|
131
104
|
onClick: handleDisableClick
|
|
132
|
-
}, "Yes"))))
|
|
133
|
-
isActionLoading: isActionLoading,
|
|
134
|
-
popupError: popupError
|
|
135
|
-
//background={backgroundProp}
|
|
136
|
-
,
|
|
137
|
-
isModalOpen: isModalOpen.login,
|
|
138
|
-
onModalClose: function onModalClose() {
|
|
139
|
-
window.location.href = 'https://stokr.info/';
|
|
140
|
-
},
|
|
141
|
-
onModalSwitch: function onModalSwitch() {
|
|
142
|
-
window.location.href = 'https://stokr.info/signup';
|
|
143
|
-
},
|
|
144
|
-
onForgotPassword: function onForgotPassword() {
|
|
145
|
-
switchOpenModal('login', 'forgot');
|
|
146
|
-
clearPopupError();
|
|
147
|
-
setIsActionLoading(undefined);
|
|
148
|
-
},
|
|
149
|
-
onFormSend: /*#__PURE__*/function () {
|
|
150
|
-
var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref3) {
|
|
151
|
-
var email, password;
|
|
152
|
-
return _regeneratorRuntime().wrap(function _callee2$(_context2) {
|
|
153
|
-
while (1) switch (_context2.prev = _context2.next) {
|
|
154
|
-
case 0:
|
|
155
|
-
email = _ref3.email, password = _ref3.password;
|
|
156
|
-
clearPopupError();
|
|
157
|
-
setIsActionLoading('login');
|
|
158
|
-
_context2.prev = 3;
|
|
159
|
-
if (!(password.length > 128)) {
|
|
160
|
-
_context2.next = 8;
|
|
161
|
-
break;
|
|
162
|
-
}
|
|
163
|
-
handleSetPopupError('login', 'Your password cannot exceed 128 characters');
|
|
164
|
-
setIsActionLoading(undefined);
|
|
165
|
-
return _context2.abrupt("return");
|
|
166
|
-
case 8:
|
|
167
|
-
_context2.next = 10;
|
|
168
|
-
return loginUser(email, password);
|
|
169
|
-
case 10:
|
|
170
|
-
_context2.next = 22;
|
|
171
|
-
break;
|
|
172
|
-
case 12:
|
|
173
|
-
_context2.prev = 12;
|
|
174
|
-
_context2.t0 = _context2["catch"](3);
|
|
175
|
-
_context2.t1 = _context2.t0.code;
|
|
176
|
-
_context2.next = _context2.t1 === 'auth/multi-factor-auth-required' ? 17 : 19;
|
|
177
|
-
break;
|
|
178
|
-
case 17:
|
|
179
|
-
// Initiate your second factor sign-in flow. (See next step.)
|
|
180
|
-
// ...
|
|
181
|
-
switchOpenModal('login', 'enter2fa');
|
|
182
|
-
return _context2.abrupt("break", 21);
|
|
183
|
-
case 19:
|
|
184
|
-
console.log({
|
|
185
|
-
error: _context2.t0
|
|
186
|
-
}); // Handle other errors, such as wrong passwords.
|
|
187
|
-
return _context2.abrupt("break", 21);
|
|
188
|
-
case 21:
|
|
189
|
-
// const errorMessage =
|
|
190
|
-
// error &&
|
|
191
|
-
// error.response &&
|
|
192
|
-
// error.response.data === 'E_AUTH_OBJECTNOTFOUND::User'
|
|
193
|
-
// ? error.response.data
|
|
194
|
-
// : error.response.data.error_description
|
|
195
|
-
|
|
196
|
-
// if (errorMessage === 'E_AUTH_USERNOTACTIVATED') {
|
|
197
|
-
// handleSetPopupError(
|
|
198
|
-
// 'login',
|
|
199
|
-
// "You're not activated. We're sending you an activation email right now.",
|
|
200
|
-
// )
|
|
201
|
-
// } else if (errorMessage === 'E_AUTH_PASSWORDINCORRECT') {
|
|
202
|
-
// handleSetPopupError(
|
|
203
|
-
// 'login',
|
|
204
|
-
// 'The password is not correct. Try again?',
|
|
205
|
-
// )
|
|
206
|
-
// } else if (errorMessage === 'E_AUTH_OBJECTNOTFOUND::User') {
|
|
207
|
-
// handleSetPopupError(
|
|
208
|
-
// 'login',
|
|
209
|
-
// "This email is not registered. Are you sure that's the right one?",
|
|
210
|
-
// )
|
|
211
|
-
// } else {
|
|
212
|
-
// handleSetPopupError(
|
|
213
|
-
// 'login',
|
|
214
|
-
// "Oops. Something's not right there. Try again?",
|
|
215
|
-
// )
|
|
216
|
-
// }
|
|
217
|
-
setIsActionLoading(undefined);
|
|
218
|
-
case 22:
|
|
219
|
-
case "end":
|
|
220
|
-
return _context2.stop();
|
|
221
|
-
}
|
|
222
|
-
}, _callee2, null, [[3, 12]]);
|
|
223
|
-
}));
|
|
224
|
-
return function (_x) {
|
|
225
|
-
return _ref4.apply(this, arguments);
|
|
226
|
-
};
|
|
227
|
-
}()
|
|
228
|
-
}));
|
|
105
|
+
}, "Yes")))));
|
|
229
106
|
};
|
|
230
107
|
exports.Disable2FA = Disable2FA;
|
|
231
108
|
var _default = Disable2FA;
|
|
@@ -88,6 +88,7 @@ var Main2FAFlow = function Main2FAFlow(_ref) {
|
|
|
88
88
|
value1Color: _colors.default.freshGreen,
|
|
89
89
|
value: is2FAEnabled ? 'enabled' : 'disabled',
|
|
90
90
|
revertToPrevious: true,
|
|
91
|
+
hideValues: true,
|
|
91
92
|
handleChange: function handleChange(value) {
|
|
92
93
|
if (value === 'enabled') {
|
|
93
94
|
switchOpenFlow('disable2fa', 'enable2fa');
|
|
@@ -95,11 +96,10 @@ var Main2FAFlow = function Main2FAFlow(_ref) {
|
|
|
95
96
|
switchOpenFlow('enable2fa', 'disable2fa');
|
|
96
97
|
}
|
|
97
98
|
}
|
|
98
|
-
})),
|
|
99
|
-
minWidth: "150px"
|
|
100
|
-
}, "change settings"), successMessage && /*#__PURE__*/_react.default.createElement(_ComponentWrapper.default, {
|
|
99
|
+
})), successMessage && /*#__PURE__*/_react.default.createElement(_ComponentWrapper.default, {
|
|
101
100
|
alignVertically: true,
|
|
102
|
-
noPaddingHorizontal: true
|
|
101
|
+
noPaddingHorizontal: true,
|
|
102
|
+
noPaddingTop: true
|
|
103
103
|
}, /*#__PURE__*/_react.default.createElement(_Text.default, {
|
|
104
104
|
small: true,
|
|
105
105
|
success: true
|
|
@@ -122,6 +122,7 @@ var Main2FAFlow = function Main2FAFlow(_ref) {
|
|
|
122
122
|
disable2fa: value
|
|
123
123
|
}));
|
|
124
124
|
},
|
|
125
|
+
onRequiresRecentLoginError: onRequiresRecentLoginError,
|
|
125
126
|
onSuccess: function onSuccess() {
|
|
126
127
|
setis2FAEnabled(false);
|
|
127
128
|
setsuccessMessage('You successfully disabled two factor authentication');
|
|
@@ -28,7 +28,7 @@ var _default = {
|
|
|
28
28
|
};
|
|
29
29
|
exports.default = _default;
|
|
30
30
|
var Template = function Template(args) {
|
|
31
|
-
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_reactRouterDom.BrowserRouter, null, /*#__PURE__*/_react.default.createElement(_AuthContext.AuthProvider, null, /*#__PURE__*/_react.default.createElement(_global.default, null), /*#__PURE__*/_react.default.createElement(_mainFlow.default, args))));
|
|
31
|
+
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_reactRouterDom.BrowserRouter, null, /*#__PURE__*/_react.default.createElement(_AuthContext.AuthProvider, null, /*#__PURE__*/_react.default.createElement(_global.default, null), /*#__PURE__*/_react.default.createElement(_mainFlow.default, args), /*#__PURE__*/_react.default.createElement("p", null, "some text"))));
|
|
32
32
|
};
|
|
33
33
|
var MainFlow = Template.bind({});
|
|
34
34
|
exports.MainFlow = MainFlow;
|
|
@@ -83,12 +83,12 @@ var MainMenu = /*#__PURE__*/function (_PureComponent) {
|
|
|
83
83
|
_createClass(MainMenu, [{
|
|
84
84
|
key: "componentDidMount",
|
|
85
85
|
value: function componentDidMount() {
|
|
86
|
-
window.addEventListener('scroll', this.onScroll, true)
|
|
86
|
+
// window.addEventListener('scroll', this.onScroll, true)
|
|
87
87
|
}
|
|
88
88
|
}, {
|
|
89
89
|
key: "componentWillUnmount",
|
|
90
90
|
value: function componentWillUnmount() {
|
|
91
|
-
window.removeEventListener('scroll', this.onScroll, true)
|
|
91
|
+
// window.removeEventListener('scroll', this.onScroll, true)
|
|
92
92
|
}
|
|
93
93
|
}, {
|
|
94
94
|
key: "render",
|
|
@@ -25,7 +25,8 @@ var Switch = function Switch(props) {
|
|
|
25
25
|
dark = props.dark,
|
|
26
26
|
revertToPrevious = props.revertToPrevious,
|
|
27
27
|
value1Color = props.value1Color,
|
|
28
|
-
value2Color = props.value2Color
|
|
28
|
+
value2Color = props.value2Color,
|
|
29
|
+
hideValues = props.hideValues;
|
|
29
30
|
var _useState = (0, _react.useState)(),
|
|
30
31
|
_useState2 = _slicedToArray(_useState, 2),
|
|
31
32
|
value = _useState2[0],
|
|
@@ -46,7 +47,7 @@ var Switch = function Switch(props) {
|
|
|
46
47
|
};
|
|
47
48
|
return /*#__PURE__*/_react.default.createElement(_Switch.Container, {
|
|
48
49
|
mobile: mobile
|
|
49
|
-
}, /*#__PURE__*/_react.default.createElement(_Switch.Value, {
|
|
50
|
+
}, !hideValues && /*#__PURE__*/_react.default.createElement(_Switch.Value, {
|
|
50
51
|
active: value === value1,
|
|
51
52
|
onClick: function onClick() {
|
|
52
53
|
return setValue(value1);
|
|
@@ -59,7 +60,7 @@ var Switch = function Switch(props) {
|
|
|
59
60
|
dark: dark,
|
|
60
61
|
value1Color: value1Color,
|
|
61
62
|
value2Color: value2Color
|
|
62
|
-
}), /*#__PURE__*/_react.default.createElement(_Switch.Value, {
|
|
63
|
+
}), !hideValues && /*#__PURE__*/_react.default.createElement(_Switch.Value, {
|
|
63
64
|
active: value === value2,
|
|
64
65
|
onClick: function onClick() {
|
|
65
66
|
return setValue(value2);
|
|
@@ -74,11 +75,13 @@ Switch.propTypes = {
|
|
|
74
75
|
value2: _propTypes.default.string.isRequired,
|
|
75
76
|
handleChange: _propTypes.default.func.isRequired,
|
|
76
77
|
mobile: _propTypes.default.bool,
|
|
77
|
-
dark: _propTypes.default.bool
|
|
78
|
+
dark: _propTypes.default.bool,
|
|
79
|
+
hideValues: _propTypes.default.bool
|
|
78
80
|
};
|
|
79
81
|
Switch.defaultProps = {
|
|
80
82
|
mobile: false,
|
|
81
|
-
dark: false
|
|
83
|
+
dark: false,
|
|
84
|
+
hideValues: false
|
|
82
85
|
};
|
|
83
86
|
var _default = Switch;
|
|
84
87
|
exports.default = _default;
|
|
@@ -67,7 +67,8 @@ var RenderErrorModal = function RenderErrorModal(props) {
|
|
|
67
67
|
isActionLoading = props.isActionLoading,
|
|
68
68
|
popupError = props.popupError,
|
|
69
69
|
popupSuccess = props.popupSuccess,
|
|
70
|
-
onResend = props.onResend
|
|
70
|
+
onResend = props.onResend,
|
|
71
|
+
onModalSwitch = props.onModalSwitch;
|
|
71
72
|
var _useCooldown = (0, _customHooks.useCooldown)(60),
|
|
72
73
|
isDisabled = _useCooldown.isDisabled,
|
|
73
74
|
secondsRemaining = _useCooldown.secondsRemaining,
|
|
@@ -76,6 +77,9 @@ var RenderErrorModal = function RenderErrorModal(props) {
|
|
|
76
77
|
|
|
77
78
|
//send activation email automatically if link is expired
|
|
78
79
|
_react.default.useEffect(function () {
|
|
80
|
+
if ((error === null || error === void 0 ? void 0 : error.code) === 'auth/invalid-action-code') {
|
|
81
|
+
onModalSwitch && onModalSwitch();
|
|
82
|
+
}
|
|
79
83
|
if (error !== null && error !== void 0 && error.email && !isDisabled) {
|
|
80
84
|
startCooldown();
|
|
81
85
|
onResend({
|
|
@@ -744,6 +744,11 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
|
|
|
744
744
|
continueUrl: 'https://signup.stokr.info/',
|
|
745
745
|
error: verifyEmailError,
|
|
746
746
|
isSuccess: !!!verifyEmailError,
|
|
747
|
+
onModalSwitch: function onModalSwitch() {
|
|
748
|
+
_this2.switchOpenModal('verifyEmail', 'login');
|
|
749
|
+
_this2.clearPopupError();
|
|
750
|
+
_this2.setIsActionLoading(undefined);
|
|
751
|
+
},
|
|
747
752
|
onModalClose: function onModalClose() {
|
|
748
753
|
_this2.setOpenModalStatus('verifyEmail', false);
|
|
749
754
|
_this2.clearPopupSuccess();
|
|
@@ -27,7 +27,11 @@ var _default = {
|
|
|
27
27
|
};
|
|
28
28
|
exports.default = _default;
|
|
29
29
|
var Template = function Template(args) {
|
|
30
|
-
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_global.default, null), /*#__PURE__*/_react.default.createElement(_reactRouterDom.BrowserRouter, null, /*#__PURE__*/_react.default.createElement(_AuthContext.AuthProvider, null, /*#__PURE__*/_react.default.createElement(_HeaderHo.default, args)
|
|
30
|
+
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_global.default, null), /*#__PURE__*/_react.default.createElement(_reactRouterDom.BrowserRouter, null, /*#__PURE__*/_react.default.createElement(_AuthContext.AuthProvider, null, /*#__PURE__*/_react.default.createElement(_HeaderHo.default, args), /*#__PURE__*/_react.default.createElement("div", {
|
|
31
|
+
style: {
|
|
32
|
+
height: '100vh'
|
|
33
|
+
}
|
|
34
|
+
}))));
|
|
31
35
|
};
|
|
32
36
|
var HeaderHoOverview = Template.bind({});
|
|
33
37
|
exports.HeaderHoOverview = HeaderHoOverview;
|
|
@@ -77,12 +77,6 @@ var AuthProviderClass = /*#__PURE__*/function (_Component) {
|
|
|
77
77
|
case 3:
|
|
78
78
|
user = _context.sent;
|
|
79
79
|
console.log('🚀 ~ file: AuthContext.js:50 ~ user:', user);
|
|
80
|
-
if (user.emailVerified) {
|
|
81
|
-
_context.next = 7;
|
|
82
|
-
break;
|
|
83
|
-
}
|
|
84
|
-
throw new Error("You're not activated. Please check your email address to verify your account.");
|
|
85
|
-
case 7:
|
|
86
80
|
_Auth.default.setAccessToken(user.accessToken);
|
|
87
81
|
_this.setState({
|
|
88
82
|
firebaseUser: user,
|
|
@@ -90,37 +84,37 @@ var AuthProviderClass = /*#__PURE__*/function (_Component) {
|
|
|
90
84
|
});
|
|
91
85
|
//if you need user immediatly
|
|
92
86
|
return _context.abrupt("return", user);
|
|
93
|
-
case
|
|
94
|
-
_context.prev =
|
|
87
|
+
case 10:
|
|
88
|
+
_context.prev = 10;
|
|
95
89
|
_context.t0 = _context["catch"](0);
|
|
96
90
|
console.log('🚀 ~ file: AuthContext.js:56 ~ error:', _context.t0);
|
|
97
91
|
_context.t1 = _context.t0.code;
|
|
98
|
-
_context.next = _context.t1 === 'auth/multi-factor-auth-required' ?
|
|
92
|
+
_context.next = _context.t1 === 'auth/multi-factor-auth-required' ? 16 : _context.t1 === 'auth/requires-recent-login' ? 18 : _context.t1 === 'auth/invalid-login-credentials' ? 20 : 22;
|
|
99
93
|
break;
|
|
100
|
-
case
|
|
94
|
+
case 16:
|
|
101
95
|
// Initiate your second factor sign-in flow. (See next step.)
|
|
102
96
|
_this.setState({
|
|
103
97
|
waitingFor2fa: true,
|
|
104
98
|
firebaseError: _context.t0
|
|
105
99
|
});
|
|
106
100
|
throw _context.t0;
|
|
107
|
-
case
|
|
101
|
+
case 18:
|
|
108
102
|
// The user's last sign-in time does not meet the security threshold.
|
|
109
103
|
_this.logoutUser();
|
|
110
|
-
return _context.abrupt("break",
|
|
111
|
-
case
|
|
104
|
+
return _context.abrupt("break", 25);
|
|
105
|
+
case 20:
|
|
112
106
|
_context.t0.message = 'The credentials are not correct. Try again?';
|
|
113
107
|
throw _context.t0;
|
|
114
|
-
case
|
|
108
|
+
case 22:
|
|
115
109
|
console.log({
|
|
116
110
|
error: _context.t0
|
|
117
111
|
}); // Handle other errors, such as wrong passwords.
|
|
118
112
|
throw _context.t0;
|
|
119
|
-
case
|
|
113
|
+
case 25:
|
|
120
114
|
case "end":
|
|
121
115
|
return _context.stop();
|
|
122
116
|
}
|
|
123
|
-
}, _callee, null, [[0,
|
|
117
|
+
}, _callee, null, [[0, 10]]);
|
|
124
118
|
}));
|
|
125
119
|
return function (_x, _x2) {
|
|
126
120
|
return _ref.apply(this, arguments);
|
|
@@ -281,7 +275,7 @@ var AuthProviderClass = /*#__PURE__*/function (_Component) {
|
|
|
281
275
|
_context5.next = 6;
|
|
282
276
|
break;
|
|
283
277
|
case 12:
|
|
284
|
-
_context5.next =
|
|
278
|
+
_context5.next = 18;
|
|
285
279
|
break;
|
|
286
280
|
case 14:
|
|
287
281
|
_context5.prev = 14;
|
|
@@ -290,7 +284,7 @@ var AuthProviderClass = /*#__PURE__*/function (_Component) {
|
|
|
290
284
|
error: _context5.t0
|
|
291
285
|
});
|
|
292
286
|
throw _context5.t0;
|
|
293
|
-
case
|
|
287
|
+
case 18:
|
|
294
288
|
case "end":
|
|
295
289
|
return _context5.stop();
|
|
296
290
|
}
|
|
@@ -445,6 +439,10 @@ var AuthProviderClass = /*#__PURE__*/function (_Component) {
|
|
|
445
439
|
if (!user) {
|
|
446
440
|
throw new Error('User is not defined');
|
|
447
441
|
}
|
|
442
|
+
if (!(user !== null && user !== void 0 && user.emailVerified) && !window.location.href.includes('signup.')) {
|
|
443
|
+
window.location.href = "https://signup.".concat(process.env.REACT_APP_WEBSITE_DOMAIN, "/resend-activation-email");
|
|
444
|
+
return false;
|
|
445
|
+
}
|
|
448
446
|
if (!(user !== null && user !== void 0 && user.country) && (user === null || user === void 0 ? void 0 : user.user_type) === 'investor' && !window.location.href.includes('signup.')) {
|
|
449
447
|
window.location.href = "https://signup.".concat(process.env.REACT_APP_WEBSITE_DOMAIN, "/welcome");
|
|
450
448
|
return false;
|
|
@@ -690,7 +688,10 @@ var AuthProviderClass = /*#__PURE__*/function (_Component) {
|
|
|
690
688
|
_this.setState({
|
|
691
689
|
isVerifyingEmail: false
|
|
692
690
|
});
|
|
693
|
-
|
|
691
|
+
|
|
692
|
+
//proceed to signup flow immediately after success
|
|
693
|
+
window.location.href = "https://signup.".concat(process.env.REACT_APP_WEBSITE_DOMAIN, "/welcome");
|
|
694
|
+
// this.getUser()
|
|
694
695
|
_context13.next = 27;
|
|
695
696
|
break;
|
|
696
697
|
case 11:
|