@stokr/components-library 1.1.8-beta.0 → 1.1.8-beta.2
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/EnterCode.js +3 -2
- package/dist/components/2FA/login-with-otp-flow.js +17 -3
- package/dist/context/Auth.js +6 -12
- package/dist/context/AuthContext.js +9 -0
- package/dist/utils/delete-redirect-cookie-and-navigate.js +1 -4
- package/dist/utils/get-cookie-domain.js +4 -2
- package/package.json +1 -1
|
@@ -26,7 +26,8 @@ var EnterCode = function EnterCode(props) {
|
|
|
26
26
|
popupError = _props$popupError === void 0 ? {} : _props$popupError,
|
|
27
27
|
onFormSend = props.onFormSend,
|
|
28
28
|
onModalSwitch = props.onModalSwitch,
|
|
29
|
-
isModal = props.isModal
|
|
29
|
+
isModal = props.isModal,
|
|
30
|
+
isActionLoading = props.isActionLoading;
|
|
30
31
|
return /*#__PURE__*/_react.default.createElement(Wrapper, _extends({
|
|
31
32
|
isModal: isModal
|
|
32
33
|
}, props), /*#__PURE__*/_react.default.createElement(_Grid.Row, null, /*#__PURE__*/_react.default.createElement(_Grid.Column, {
|
|
@@ -59,7 +60,7 @@ var EnterCode = function EnterCode(props) {
|
|
|
59
60
|
setFieldValue = _ref.setFieldValue,
|
|
60
61
|
setFieldTouched = _ref.setFieldTouched,
|
|
61
62
|
setErrors = _ref.setErrors;
|
|
62
|
-
var submitDisabled = !touched.otpInput || !values.otpInput;
|
|
63
|
+
var submitDisabled = !touched.otpInput || !values.otpInput || isActionLoading === 'enter2fa';
|
|
63
64
|
return /*#__PURE__*/_react.default.createElement(_Form.default, null, /*#__PURE__*/_react.default.createElement(_ComponentWrapper.default, {
|
|
64
65
|
noPadding: true
|
|
65
66
|
}, /*#__PURE__*/_react.default.createElement(_Form.FormField, null, /*#__PURE__*/_react.default.createElement(_OtpInput.default, {
|
|
@@ -167,7 +167,9 @@ var LoginWithOTP = function LoginWithOTP(_ref) {
|
|
|
167
167
|
}()
|
|
168
168
|
}), /*#__PURE__*/_react.default.createElement(_EnterCode.default, {
|
|
169
169
|
isModal: true,
|
|
170
|
+
isActionLoading: isActionLoading,
|
|
170
171
|
isModalOpen: isModalOpen.enter2fa,
|
|
172
|
+
background: withBackground && backgroundProp,
|
|
171
173
|
onModalSwitch: function onModalSwitch() {
|
|
172
174
|
switchOpenModal('enter2fa', 'resetCode');
|
|
173
175
|
},
|
|
@@ -178,13 +180,24 @@ var LoginWithOTP = function LoginWithOTP(_ref) {
|
|
|
178
180
|
while (1) switch (_context2.prev = _context2.next) {
|
|
179
181
|
case 0:
|
|
180
182
|
otpInput = _ref4.otpInput;
|
|
181
|
-
|
|
183
|
+
setIsActionLoading('enter2fa');
|
|
184
|
+
_context2.prev = 2;
|
|
185
|
+
_context2.next = 5;
|
|
182
186
|
return loginUserWithTotp(otpInput, firebaseError);
|
|
183
|
-
case
|
|
187
|
+
case 5:
|
|
188
|
+
_context2.next = 10;
|
|
189
|
+
break;
|
|
190
|
+
case 7:
|
|
191
|
+
_context2.prev = 7;
|
|
192
|
+
_context2.t0 = _context2["catch"](2);
|
|
193
|
+
console.log('🚀 ~ file: login-with-otp-flow.js:129 ~ error:', _context2.t0);
|
|
194
|
+
case 10:
|
|
195
|
+
setIsActionLoading(undefined);
|
|
196
|
+
case 11:
|
|
184
197
|
case "end":
|
|
185
198
|
return _context2.stop();
|
|
186
199
|
}
|
|
187
|
-
}, _callee2);
|
|
200
|
+
}, _callee2, null, [[2, 7]]);
|
|
188
201
|
}));
|
|
189
202
|
return function (_x2) {
|
|
190
203
|
return _ref5.apply(this, arguments);
|
|
@@ -192,6 +205,7 @@ var LoginWithOTP = function LoginWithOTP(_ref) {
|
|
|
192
205
|
}()
|
|
193
206
|
}), /*#__PURE__*/_react.default.createElement(_ResetCode.default, {
|
|
194
207
|
isModalOpen: isModalOpen.resetCode,
|
|
208
|
+
background: withBackground && backgroundProp,
|
|
195
209
|
onModalSwitch: function onModalSwitch() {
|
|
196
210
|
switchOpenModal('resetCode', 'enter2fa');
|
|
197
211
|
}
|
package/dist/context/Auth.js
CHANGED
|
@@ -26,15 +26,12 @@ var Auth = /*#__PURE__*/function () {
|
|
|
26
26
|
_createClass(Auth, null, [{
|
|
27
27
|
key: "setAccessToken",
|
|
28
28
|
value: function setAccessToken(token) {
|
|
29
|
-
this.logout()
|
|
29
|
+
//this.logout()
|
|
30
|
+
|
|
31
|
+
var cookieDomain = (0, _getCookieDomain.default)();
|
|
30
32
|
var inOneHour = 1 / 24;
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
};
|
|
34
|
-
if (process.env.NODE_ENV === 'production') {
|
|
35
|
-
cookieOptions.domain = (0, _getCookieDomain.default)();
|
|
36
|
-
}
|
|
37
|
-
_jsCookie.default.set('STOKR_ACCESS_TOKEN', token, cookieOptions);
|
|
33
|
+
cookieDomain.expires = inOneHour;
|
|
34
|
+
_jsCookie.default.set('STOKR_ACCESS_TOKEN', token, cookieDomain);
|
|
38
35
|
}
|
|
39
36
|
}, {
|
|
40
37
|
key: "getAccessToken",
|
|
@@ -44,10 +41,7 @@ var Auth = /*#__PURE__*/function () {
|
|
|
44
41
|
}, {
|
|
45
42
|
key: "logout",
|
|
46
43
|
value: function logout() {
|
|
47
|
-
var cookieDomain =
|
|
48
|
-
if (process.env.NODE_ENV === 'production') {
|
|
49
|
-
cookieDomain.domain = (0, _getCookieDomain.default)();
|
|
50
|
-
}
|
|
44
|
+
var cookieDomain = (0, _getCookieDomain.default)();
|
|
51
45
|
_jsCookie.default.remove('STOKR_ACCESS_TOKEN', cookieDomain);
|
|
52
46
|
}
|
|
53
47
|
}, {
|
|
@@ -53,6 +53,14 @@ var AuthProviderClass = /*#__PURE__*/function (_Component) {
|
|
|
53
53
|
waitingFor2fa: false,
|
|
54
54
|
firebaseError: null
|
|
55
55
|
});
|
|
56
|
+
_defineProperty(_assertThisInitialized(_this), "checkTokenIsValid", function () {
|
|
57
|
+
var redirect = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
|
|
58
|
+
var accessToken = _Auth.default.getAccessToken();
|
|
59
|
+
if (!accessToken) {
|
|
60
|
+
_this.logoutUser(redirect);
|
|
61
|
+
}
|
|
62
|
+
return !!accessToken;
|
|
63
|
+
});
|
|
56
64
|
_defineProperty(_assertThisInitialized(_this), "loginUser", /*#__PURE__*/function () {
|
|
57
65
|
var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(email, password) {
|
|
58
66
|
var user;
|
|
@@ -654,6 +662,7 @@ var AuthProviderClass = /*#__PURE__*/function (_Component) {
|
|
|
654
662
|
return /*#__PURE__*/_react.default.createElement(AuthContext.Provider, {
|
|
655
663
|
value: _objectSpread(_objectSpread({}, this.state), {}, {
|
|
656
664
|
checkUserIsValid: this.checkUserIsValid,
|
|
665
|
+
checkTokenIsValid: this.checkTokenIsValid,
|
|
657
666
|
checkUserPhoto: this.checkUserPhoto,
|
|
658
667
|
uploadPhoto: this.uploadPhoto,
|
|
659
668
|
deletePhoto: this.deletePhoto,
|
|
@@ -9,10 +9,7 @@ var _getCookieDomain = _interopRequireDefault(require("./get-cookie-domain"));
|
|
|
9
9
|
var _redirectUrl = _interopRequireDefault(require("./redirect-url"));
|
|
10
10
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
11
11
|
var _default = function _default() {
|
|
12
|
-
var cookieDomain =
|
|
13
|
-
if (process.env.NODE_ENV === 'production') {
|
|
14
|
-
cookieDomain.domain = (0, _getCookieDomain.default)();
|
|
15
|
-
}
|
|
12
|
+
var cookieDomain = (0, _getCookieDomain.default)();
|
|
16
13
|
_jsCookie.default.remove('STOKR_INVESTOR_DASHBOARD_REDIRECT', cookieDomain);
|
|
17
14
|
_jsCookie.default.remove('STOKR_INVEST_IN_STO_REDIRECT', cookieDomain);
|
|
18
15
|
window.location.href = _redirectUrl.default;
|
|
@@ -3,8 +3,8 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.default = void 0;
|
|
7
|
-
var
|
|
6
|
+
exports.getCookieDomain = exports.default = void 0;
|
|
7
|
+
var getCookieDomain = function getCookieDomain() {
|
|
8
8
|
var cookieDomain = {};
|
|
9
9
|
|
|
10
10
|
// Cookie for deployed app
|
|
@@ -13,4 +13,6 @@ var _default = function _default() {
|
|
|
13
13
|
}
|
|
14
14
|
return cookieDomain;
|
|
15
15
|
};
|
|
16
|
+
exports.getCookieDomain = getCookieDomain;
|
|
17
|
+
var _default = getCookieDomain;
|
|
16
18
|
exports.default = _default;
|