@stokr/components-library 2.3.41-beta.8 → 2.3.42-beta

package/dist/components/headerHo/HeaderHo.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.HeaderHo = void 0;
 var _react = _interopRequireWildcard(require("react"));
-var _jsCookie = _interopRequireDefault(require("js-cookie"));
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
 var sc = _interopRequireWildcard(require("../../constants/style"));
 var _RegisterModal = _interopRequireDefault(require("../RegisterModal/RegisterModal"));
@@ -23,6 +22,8 @@ var _fetchDataPublic = _interopRequireDefault(require("../../api/fetchDataPublic
 var _AuthContext = require("../../context/AuthContext");
 var _withRouter = require("../../utils/withRouter");
 var _customHooks = require("../../utils/customHooks");
+var _auth2 = require("firebase/auth");
+var _firebaseConfig = require("../../firebase-config");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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); }
 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; }
@@ -92,7 +93,8 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
         message: undefined
       },
       isActionLoading: undefined,
-      termsData: undefined
+      termsData: undefined,
+      isResettingExpiredToken: false
     });
     _defineProperty(_assertThisInitialized(_this), "checkForModals", function () {
       var _this$props = _this.props,
@@ -171,6 +173,8 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
       _this.setState(function (prevState) {
         return _objectSpread(_objectSpread({}, prevState), {}, {
           isModalOpen: _objectSpread(_objectSpread({}, isModalOpen), {}, _defineProperty({}, modalId, status))
+        }, modalId === 'forgot' && !status && {
+          isResettingExpiredToken: false
         });
       });
     });
@@ -271,8 +275,6 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
         this.props.navigate('/login');
         this.props.navigate(0);
       }
-
-      // Run after page loaded
       if (!isFetchingUser) {
         this.checkForModals();
       }
@@ -285,7 +287,8 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
         isModalOpen = _this$state.isModalOpen,
         userInfo = _this$state.userInfo,
         isActionLoading = _this$state.isActionLoading,
-        termsData = _this$state.termsData;
+        termsData = _this$state.termsData,
+        isResettingExpiredToken = _this$state.isResettingExpiredToken;
       var _this$props3 = this.props,
         fixed = _this$props3.fixed,
         activateMenu = _this$props3.activateMenu,
@@ -637,11 +640,18 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
         popupError: this.state.popupError,
         popupSuccess: this.state.popupSuccess,
         isModalOpen: isModalOpen.forgot,
+        isResettingExpiredToken: isResettingExpiredToken,
         onModalClose: function onModalClose() {
           _this2.setOpenModalStatus('forgot', false);
           _this2.clearPopupError();
           _this2.clearPopupSuccess();
           _this2.setIsActionLoading(undefined);
+
+          // if we are in the expired token reset flow, we
+          // also need to close the reset password modal
+          if (isResettingExpiredToken) {
+            _this2.setOpenModalStatus('resetPassword', false);
+          }
         },
         onModalSwitch: function onModalSwitch() {
           _this2.switchOpenModal('forgot', 'login');
@@ -651,34 +661,40 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
         },
         onFormSend: /*#__PURE__*/function () {
           var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(_ref8) {
-            var email;
+            var email, payload;
             return _regeneratorRuntime().wrap(function _callee5$(_context5) {
               while (1) switch (_context5.prev = _context5.next) {
                 case 0:
                   email = _ref8.email;
                   _this2.clearPopupError();
                   _this2.setIsActionLoading('forgot');
-                  _context5.prev = 3;
-                  _context5.next = 6;
-                  return (0, _auth.default)('forgotPass', {
+                  payload = {
                     email: email
-                  });
-                case 6:
+                  };
+                  if (isResettingExpiredToken) {
+                    console.log('isResettingExpiredToken: ', isResettingExpiredToken);
+                    payload.ventureInvite = true;
+                  }
+                  console.log('payload obj: ', payload);
+                  _context5.prev = 6;
+                  _context5.next = 9;
+                  return (0, _auth.default)('forgotPass', payload);
+                case 9:
                   _this2.setPopupSuccess('forgot', "We sent a message to ".concat(email, " (you might need to check your junk or spam folder) \u2014 tap the link inside to create a new password."));
                   _this2.setIsActionLoading(undefined);
-                  _context5.next = 15;
+                  _context5.next = 18;
                   break;
-                case 10:
-                  _context5.prev = 10;
-                  _context5.t0 = _context5["catch"](3);
+                case 13:
+                  _context5.prev = 13;
+                  _context5.t0 = _context5["catch"](6);
                   console.log(_context5.t0);
                   _this2.setPopupError('forgot', 'This email is not registered.');
                   _this2.setIsActionLoading(undefined);
-                case 15:
+                case 18:
                 case "end":
                   return _context5.stop();
               }
-            }, _callee5, null, [[3, 10]]);
+            }, _callee5, null, [[6, 13]]);
           }));
           return function (_x4) {
             return _ref9.apply(this, arguments);
@@ -689,6 +705,11 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
         popupError: this.state.popupError,
         isModalOpen: isModalOpen.resetPassword,
         onModalClose: function onModalClose() {
+          // clean up URL params
+          var url = new URL(window.location);
+          url.searchParams.delete('oobCode');
+          url.searchParams.delete('mode');
+          window.history.replaceState({}, '', url.toString());
           _this2.setOpenModalStatus('resetPassword', false);
           _this2.clearPopupError();
           _this2.setIsActionLoading(undefined);
@@ -731,7 +752,60 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
           return function (_x5) {
             return _ref11.apply(this, arguments);
           };
-        }()
+        }(),
+        onLoad: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+          var location, query, oobCode, url;
+          return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+            while (1) switch (_context7.prev = _context7.next) {
+              case 0:
+                location = _this2.props.location;
+                query = new URLSearchParams(location === null || location === void 0 ? void 0 : location.search);
+                oobCode = query.get('oobCode');
+                if (!(oobCode && oobCode !== '')) {
+                  _context7.next = 16;
+                  break;
+                }
+                _this2.setIsActionLoading('resetPassword');
+                _context7.prev = 5;
+                _context7.next = 8;
+                return (0, _auth2.checkActionCode)(_firebaseConfig.auth, oobCode);
+              case 8:
+                _this2.setIsActionLoading(undefined);
+                _context7.next = 15;
+                break;
+              case 11:
+                _context7.prev = 11;
+                _context7.t0 = _context7["catch"](5);
+                console.log('Password reset code error:', _context7.t0);
+                if ((_context7.t0 === null || _context7.t0 === void 0 ? void 0 : _context7.t0.code) === 'auth/expired-action-code') {
+                  _this2.setState(function (prevState) {
+                    return _objectSpread(_objectSpread({}, prevState), {}, {
+                      isResettingExpiredToken: true
+                    });
+                  });
+
+                  // before switching to Forgot Password modal, we need to clean up
+                  // the URL parameters that keep the reset password modal open.
+                  url = new URL(window.location);
+                  url.searchParams.delete('oobCode');
+                  url.searchParams.delete('mode');
+                  window.history.replaceState({}, '', url.toString());
+
+                  // we use a special version of Forgot Password modal
+                  // adjusted to handle and resend expired tokens.
+                  // isResettingExpiredToken makes it adjust.
+                  _this2.switchOpenModal('resetPassword', 'forgot');
+                } else {
+                  _this2.setPopupError('resetPassword', 'Something went wrong with the password reset link. Please try again.');
+                }
+              case 15:
+                _this2.setIsActionLoading(undefined);
+              case 16:
+              case "end":
+                return _context7.stop();
+            }
+          }, _callee7, null, [[5, 11]]);
+        }))
       }), /*#__PURE__*/_react.default.createElement(_ResetConfirmModal.default, {
         isModalOpen: isModalOpen.confirmReset,
         onModalClose: function onModalClose() {
@@ -768,37 +842,37 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
           _this2.setIsActionLoading(undefined);
         },
         onResend: /*#__PURE__*/function () {
-          var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(values) {
+          var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(values) {
             var email;
-            return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-              while (1) switch (_context7.prev = _context7.next) {
+            return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+              while (1) switch (_context8.prev = _context8.next) {
                 case 0:
                   _this2.clearPopupSuccess();
                   _this2.clearPopupError();
                   _this2.setIsActionLoading('resend');
-                  _context7.prev = 3;
+                  _context8.prev = 3;
                   email = values === null || values === void 0 ? void 0 : values.email;
-                  _context7.next = 7;
+                  _context8.next = 7;
                   return resendActivationEmail(email);
                 case 7:
                   _this2.setPopupSuccess('resend', 'Email sent.');
                   _this2.setIsActionLoading(undefined);
-                  _context7.next = 16;
+                  _context8.next = 16;
                   break;
                 case 11:
-                  _context7.prev = 11;
-                  _context7.t0 = _context7["catch"](3);
-                  console.log(_context7.t0);
-                  _this2.setPopupError('resend', (_context7.t0 === null || _context7.t0 === void 0 ? void 0 : _context7.t0.message) || 'Something went wrong.');
+                  _context8.prev = 11;
+                  _context8.t0 = _context8["catch"](3);
+                  console.log(_context8.t0);
+                  _this2.setPopupError('resend', (_context8.t0 === null || _context8.t0 === void 0 ? void 0 : _context8.t0.message) || 'Something went wrong.');
                   _this2.setIsActionLoading(undefined);
                 case 16:
                 case "end":
-                  return _context7.stop();
+                  return _context8.stop();
               }
-            }, _callee7, null, [[3, 11]]);
+            }, _callee8, null, [[3, 11]]);
           }));
           return function (_x6) {
-            return _ref12.apply(this, arguments);
+            return _ref13.apply(this, arguments);
           };
         }()
       }));

package/dist/constants/globalVariables.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.walletTypes = exports.platformURL = exports.platformDomain = exports.UserTypes = exports.ProjectTypes = exports.ProjectStatus = exports.ProjectStates = void 0;
+exports.walletTypes = exports.platformURL = exports.platformDomain = exports.emailRegex = exports.UserTypes = exports.ProjectTypes = exports.ProjectStatus = exports.ProjectStates = void 0;
 var platformDomain = process.env.REACT_APP_WEBSITE_DOMAIN;
 exports.platformDomain = platformDomain;
 var platformURL = 'https://' + platformDomain;
@@ -37,4 +37,8 @@ var UserTypes = {
   investor: 'investor',
   investor_entity: 'investor_entity'
 };
-exports.UserTypes = UserTypes;
+
+// should be used for all email form validation globally
+exports.UserTypes = UserTypes;
+var emailRegex = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/i;
+exports.emailRegex = emailRegex;