@stokr/components-library 2.0.0-beta.4 → 2.0.0-beta.6

package/dist/components/Modal/Modal.styles.js

@@ -32,7 +32,7 @@ exports.Dimmer = Dimmer;
 var Box = _styledComponents.default.div.withConfig({
   displayName: "Modalstyles__Box",
   componentId: "sc-9hc271-2"
-})(["display:inline-block;vertical-align:middle;position:relative;left:0;top:0;width:100%;background-color:", ";font-size:10px;text-align:left;box-shadow:0 2px 20px 0 rgba(0,0,0,0.1);", " ", " ", " ", " ", ""], _colors.default.white, function (props) {
+})(["display:inline-block;vertical-align:middle;position:relative;left:0;top:0;width:100%;background-color:", ";font-size:10px;text-align:left;box-shadow:0 2px 20px 0 rgba(0,0,0,0.1);", " ", " ", " ", " @media screen and (max-width:767px){min-height:100vh;}@media screen and (max-width:490px){min-height:100vh;}", ""], _colors.default.white, function (props) {
   return props.fullscreen && "\n    height: 90vh;\n  ";
 }, function (props) {
   return props.kyc && "\n    width: 100vw;\n    height: 100vh;\n    max-width: 1024px!important;\n    max-height: 768px!important;\n  ";
@@ -70,7 +70,10 @@ exports.ModalInnerWithBorder = ModalInnerWithBorder;
 var ModalInner = _styledComponents.default.div.withConfig({
   displayName: "Modalstyles__ModalInner",
   componentId: "sc-9hc271-5"
-})(["width:100%;height:100%;padding:40px ", ";display:flex;flex-direction:column;", " ", " ", " ", " ", " ", " ", " ", " ", ""], (0, _grid.default)(1), function (props) {
+})(["width:100%;height:100%;padding:40px ", ";display:flex;flex-direction:column;@media screen and (max-width:767px){height:", ";}", " ", " ", " ", " ", " ", " ", " ", " ", ""], (0, _grid.default)(1), function (_ref2) {
+  var isMobile = _ref2.isMobile;
+  return isMobile && '100vh';
+}, function (props) {
   return props.center && "\n    text-align: center;\n  ";
 }, function (props) {
   return props.background && "\n    background-color: ".concat(_colors.default.grey, ";\n  ");

package/dist/components/TermsModal/TermsModal.js

@@ -35,7 +35,7 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 var StyledPrivacyText = _styledComponents.default.div.withConfig({
   displayName: "TermsModal__StyledPrivacyText",
   componentId: "sc-1x5p4y6-0"
-})(["width:100%;p{color:", ";font-size:16px;line-height:1.5;font-weight:300;margin:0;padding-bottom:10px;font-style:normal;font-stretch:normal;letter-spacing:0.6px;}a{text-decoration:none;color:", ";font-weight:300;}}h4{font-size:17.2px !important;font-weight:700 !important;line-height:1.28571em;letter-spacing:normal;position:relative;margin-top:29px;margin-bottom:16px;}table{border-collapse:collapse;margin:32px 0;font-size:16px;tr{td:first-child{width:", ";text-align:center;}td:last-child{width:", ";}}td,th{border:1px solid #2e2e2e;padding:10px;li{margin-bottom:0;}}}ul{list-style-type:disclosure-closed;list-style:none;margin:0;padding:0;}li{padding:0 0 0 32px;color:", ";font-size:0.75rem;letter-spacing:normal;line-height:1.31rem;font-weight:200;margin-bottom:16px;position:relative;font-size:16px !important;font-weight:300;font-style:normal;font-stretch:normal;line-height:1.5 !important;letter-spacing:0.6px;a{word-break:break-all !important;}&:before{content:'';position:absolute;width:10px;height:10px;background:#0050ca;border-radius:100px;left:0;top:3px;margin-top:0.4rem;}}"], _theme.default.cBlack, _theme.default.cBlack, function (props) {
+})(["&&{width:100%;p{color:", ";font-size:16px;line-height:1.5;font-weight:300;margin:0;padding-bottom:10px;font-style:normal;font-stretch:normal;letter-spacing:0.6px;}a{text-decoration:none;color:", ";font-weight:300;word-break:break-all !important;}h4{font-size:17.2px !important;font-weight:700 !important;line-height:1.28571em;letter-spacing:normal;position:relative;margin-top:29px;margin-bottom:16px;}table{border-collapse:collapse;margin:32px 0;font-size:16px;tr{td:first-child{width:", ";text-align:center;}td:last-child{width:", ";}}td,th{border:1px solid #2e2e2e;padding:10px;li{margin-bottom:0;}}}ul{list-style-type:disclosure-closed;list-style:none;margin:0;padding:0;}li{padding:0 0 0 32px;color:", ";font-size:0.75rem;letter-spacing:normal;line-height:1.31rem;font-weight:200;margin-bottom:16px;position:relative;font-size:16px !important;font-weight:300;font-style:normal;font-stretch:normal;line-height:1.5 !important;letter-spacing:0.6px;a{word-break:break-all !important;}&:before{content:'';position:absolute;width:10px;height:10px;background:#0050ca;border-radius:100px;left:0;top:3px;margin-top:0.4rem;}}}"], _theme.default.cBlack, _theme.default.cBlack, function (props) {
   return props.thirdParties ? '30%' : '40%';
 }, function (props) {
   return props.thirdParties ? '70%' : '60%';

package/dist/components/headerHo/HeaderHo.js

@@ -274,7 +274,8 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
         waitingFor2fa = _this$context2.waitingFor2fa,
         firebaseError = _this$context2.firebaseError,
         loginUserWithTotp = _this$context2.loginUserWithTotp,
-        createUser = _this$context2.createUser;
+        createUser = _this$context2.createUser,
+        handleResetPassword = _this$context2.handleResetPassword;
       return /*#__PURE__*/_react.default.createElement(Outer, {
         fixed: fixed
       }, /*#__PURE__*/_react.default.createElement(_Header.default, {
@@ -683,41 +684,35 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
         },
         onFormSend: /*#__PURE__*/function () {
           var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(_ref10) {
-            var password, isUsingQueryParam, token;
+            var password;
             return _regeneratorRuntime().wrap(function _callee6$(_context6) {
               while (1) switch (_context6.prev = _context6.next) {
                 case 0:
                   password = _ref10.password;
                   _this2.clearPopupError();
                   _this2.setIsActionLoading('resetPassword');
-                  isUsingQueryParam = window.location.href.includes('?token=');
-                  if (isUsingQueryParam) {
-                    token = window.location.href.split('reset-password?token=')[1].split('&')[0];
-                  } else {
-                    token = window.location.href.split('reset-password/')[1].split('/')[0];
-                  }
-                  _context6.prev = 5;
-                  _context6.next = 8;
-                  return (0, _auth.default)('resetPass', {
-                    password: password,
-                    token: token
-                  });
-                case 8:
+
+                  //https://stokr.info/manage-user?mode=resetPassword&oobCode=PT_AyRFYWXwDe0Ols12TOKSiGQUSdb6mM4DKDLwHGdQAAAGMgUUaEQ&apiKey=AIzaSyBBp_3Romnfv--YpUuV0mJgDymvSp3oq0c&continueUrl=https%3A%2F%2Fstokr.info&lang=en
+                  //localhost:3001/manage-user?mode=resetPassword&oobCode=PT_AyRFYWXwDe0Ols12TOKSiGQUSdb6mM4DKDLwHGdQAAAGMgUUaEQ&apiKey=AIzaSyBBp_3Romnfv--YpUuV0mJgDymvSp3oq0c&continueUrl=https%3A%2F%2Fstokr.info&lang=en
+                  _context6.prev = 3;
+                  _context6.next = 6;
+                  return handleResetPassword(password);
+                case 6:
                   _this2.switchOpenModal('resetPassword', 'confirmReset');
                   _this2.setIsActionLoading(undefined);
-                  _context6.next = 17;
+                  _context6.next = 15;
                   break;
-                case 12:
-                  _context6.prev = 12;
-                  _context6.t0 = _context6["catch"](5);
+                case 10:
+                  _context6.prev = 10;
+                  _context6.t0 = _context6["catch"](3);
                   console.log(_context6.t0);
-                  _this2.setPopupError('resetPassword', 'Something went wrong.');
+                  _this2.setPopupError('resetPassword', (_context6.t0 === null || _context6.t0 === void 0 ? void 0 : _context6.t0.message) || 'Something went wrong.');
                   _this2.setIsActionLoading(undefined);
-                case 17:
+                case 15:
                 case "end":
                   return _context6.stop();
               }
-            }, _callee6, null, [[5, 12]]);
+            }, _callee6, null, [[3, 10]]);
           }));
           return function (_x5) {
             return _ref11.apply(this, arguments);

package/dist/context/Auth.js

@@ -100,6 +100,30 @@ var Auth = /*#__PURE__*/function () {
         });
       });
     }
+  }, {
+    key: "handleResetPassword",
+    value: function handleResetPassword(actionCode, newPassword, continueUrl) {
+      return new Promise(function (resolve, reject) {
+        // Verify the password reset code is valid.
+        (0, _auth.verifyPasswordResetCode)(_firebaseConfig.auth, actionCode).then(function (email) {
+          var accountEmail = email;
+          (0, _auth.confirmPasswordReset)(_firebaseConfig.auth, actionCode, newPassword).then(function (resp) {
+            // Password reset has been confirmed and new password updated.
+
+            _firebaseConfig.auth.signInWithEmailAndPassword(accountEmail, newPassword);
+            resolve(accountEmail);
+          }).catch(function (error) {
+            // Error occurred during confirmation. The code might have expired or the
+            // password is too weak.
+            reject(error);
+          });
+        }).catch(function (error) {
+          // Invalid or expired action code. Ask user to try to reset the password
+          // again.
+          reject(error);
+        });
+      });
+    }
   }, {
     key: "getUser",
     value: function getUser() {

package/dist/context/AuthContext.js

@@ -517,7 +517,7 @@ var AuthProviderClass = /*#__PURE__*/function (_Component) {
     })));
     _defineProperty(_assertThisInitialized(_this), "replaceLocationPathName", function () {
       var pathname = _this.props.location.pathname;
-      if (pathname === '/login' || pathname === '/signup' || pathname.includes('/reset-password')) {
+      if (pathname === '/login' || pathname === '/signup') {
         _this.props.navigate('/');
       }
     });
@@ -692,105 +692,152 @@ var AuthProviderClass = /*#__PURE__*/function (_Component) {
         return _ref13.apply(this, arguments);
       };
     }());
-    _defineProperty(_assertThisInitialized(_this), "sendWelcomeEmail", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
-      return _regeneratorRuntime().wrap(function _callee14$(_context14) {
-        while (1) switch (_context14.prev = _context14.next) {
+    _defineProperty(_assertThisInitialized(_this), "handleResetPassword", /*#__PURE__*/function () {
+      var _ref14 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(password) {
+        var location, query, oobCode;
+        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
+          while (1) switch (_context14.prev = _context14.next) {
+            case 0:
+              location = _this.props.location;
+              _context14.prev = 1;
+              query = new URLSearchParams(location.search);
+              oobCode = query.get('oobCode');
+              _context14.next = 6;
+              return _Auth.default.handleResetPassword(oobCode, password);
+            case 6:
+              _context14.next = 21;
+              break;
+            case 8:
+              _context14.prev = 8;
+              _context14.t0 = _context14["catch"](1);
+              _context14.t1 = _context14.t0 === null || _context14.t0 === void 0 ? void 0 : _context14.t0.code;
+              _context14.next = _context14.t1 === 'auth/expired-action-code' ? 13 : _context14.t1 === 'auth/invalid-action-code' ? 15 : _context14.t1 === 'auth/user-disabled' ? 17 : 19;
+              break;
+            case 13:
+              _context14.t0.message = 'This link has expired. Please try reseting password again.';
+              return _context14.abrupt("break", 20);
+            case 15:
+              _context14.t0.message = 'This link is invalid. Please try reseting password again.';
+              return _context14.abrupt("break", 20);
+            case 17:
+              _context14.t0.message = 'Your account has been disabled. Please contact our support.';
+              return _context14.abrupt("break", 20);
+            case 19:
+              return _context14.abrupt("break", 20);
+            case 20:
+              throw _context14.t0;
+            case 21:
+            case "end":
+              return _context14.stop();
+          }
+        }, _callee14, null, [[1, 8]]);
+      }));
+      return function (_x16) {
+        return _ref14.apply(this, arguments);
+      };
+    }());
+    _defineProperty(_assertThisInitialized(_this), "sendWelcomeEmail", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15() {
+      return _regeneratorRuntime().wrap(function _callee15$(_context15) {
+        while (1) switch (_context15.prev = _context15.next) {
           case 0:
-            _context14.prev = 0;
-            _context14.next = 3;
+            _context15.prev = 0;
+            _context15.next = 3;
             return _Auth.default.sendWelcomeEmail();
           case 3:
-            _context14.next = 8;
+            _context15.next = 8;
             break;
           case 5:
-            _context14.prev = 5;
-            _context14.t0 = _context14["catch"](0);
-            console.log("Error sending welcome email: ".concat(_context14.t0));
+            _context15.prev = 5;
+            _context15.t0 = _context15["catch"](0);
+            console.log("Error sending welcome email: ".concat(_context15.t0));
             // No need to throw error, let the app continue even if it fails
           case 8:
           case "end":
-            return _context14.stop();
+            return _context15.stop();
         }
-      }, _callee14, null, [[0, 5]]);
+      }, _callee15, null, [[0, 5]]);
     })));
     _defineProperty(_assertThisInitialized(_this), "uploaProofOfAddress", /*#__PURE__*/function () {
-      var _ref15 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(data, ip) {
+      var _ref16 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(data, ip) {
         var user;
-        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
-          while (1) switch (_context15.prev = _context15.next) {
+        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
+          while (1) switch (_context16.prev = _context16.next) {
             case 0:
-              _context15.prev = 0;
-              _context15.next = 3;
+              _context16.prev = 0;
+              _context16.next = 3;
               return _Auth.default.uploaProofOfAddress(data, ip);
             case 3:
-              user = _context15.sent;
+              user = _context16.sent;
               _this.setUser(user);
-              _context15.next = 11;
+              _context16.next = 11;
               break;
             case 7:
-              _context15.prev = 7;
-              _context15.t0 = _context15["catch"](0);
-              console.log("Error uploading proof of address: ".concat(_context15.t0));
-              throw _context15.t0;
-            case 11:
-            case "end":
-              return _context15.stop();
-          }
-        }, _callee15, null, [[0, 7]]);
-      }));
-      return function (_x16, _x17) {
-        return _ref15.apply(this, arguments);
-      };
-    }());
-    _defineProperty(_assertThisInitialized(_this), "validateGreenWalletId", /*#__PURE__*/function () {
-      var _ref16 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(id) {
-        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
-          while (1) switch (_context16.prev = _context16.next) {
-            case 0:
-              _context16.prev = 0;
-              return _context16.abrupt("return", _Auth.default.validateGreenWalletId(id));
-            case 4:
-              _context16.prev = 4;
+              _context16.prev = 7;
               _context16.t0 = _context16["catch"](0);
-              console.log("Error validating Green Wallet ID: ".concat(_context16.t0));
+              console.log("Error uploading proof of address: ".concat(_context16.t0));
               throw _context16.t0;
-            case 8:
+            case 11:
             case "end":
               return _context16.stop();
           }
-        }, _callee16, null, [[0, 4]]);
+        }, _callee16, null, [[0, 7]]);
       }));
-      return function (_x18) {
+      return function (_x17, _x18) {
         return _ref16.apply(this, arguments);
       };
     }());
-    _defineProperty(_assertThisInitialized(_this), "createWallet", /*#__PURE__*/function () {
-      var _ref17 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(data) {
-        var wallet;
+    _defineProperty(_assertThisInitialized(_this), "validateGreenWalletId", /*#__PURE__*/function () {
+      var _ref17 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(id) {
         return _regeneratorRuntime().wrap(function _callee17$(_context17) {
           while (1) switch (_context17.prev = _context17.next) {
             case 0:
               _context17.prev = 0;
               _context17.next = 3;
-              return _Auth.default.createWallet(data);
+              return _Auth.default.validateGreenWalletId(id);
             case 3:
-              wallet = _context17.sent;
-              return _context17.abrupt("return", wallet);
-            case 7:
-              _context17.prev = 7;
+              return _context17.abrupt("return", _context17.sent);
+            case 6:
+              _context17.prev = 6;
               _context17.t0 = _context17["catch"](0);
-              console.log("Error creating wallet: ".concat(_context17.t0));
+              console.log("Error validating Green Wallet ID: ".concat(_context17.t0));
               throw _context17.t0;
-            case 11:
+            case 10:
             case "end":
               return _context17.stop();
           }
-        }, _callee17, null, [[0, 7]]);
+        }, _callee17, null, [[0, 6]]);
       }));
       return function (_x19) {
         return _ref17.apply(this, arguments);
       };
     }());
+    _defineProperty(_assertThisInitialized(_this), "createWallet", /*#__PURE__*/function () {
+      var _ref18 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(data) {
+        var wallet;
+        return _regeneratorRuntime().wrap(function _callee18$(_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
+            case 0:
+              _context18.prev = 0;
+              _context18.next = 3;
+              return _Auth.default.createWallet(data);
+            case 3:
+              wallet = _context18.sent;
+              return _context18.abrupt("return", wallet);
+            case 7:
+              _context18.prev = 7;
+              _context18.t0 = _context18["catch"](0);
+              console.log("Error creating wallet: ".concat(_context18.t0));
+              throw _context18.t0;
+            case 11:
+            case "end":
+              return _context18.stop();
+          }
+        }, _callee18, null, [[0, 7]]);
+      }));
+      return function (_x20) {
+        return _ref18.apply(this, arguments);
+      };
+    }());
     _defineProperty(_assertThisInitialized(_this), "setUser", function (user) {
       //there are a few cases where we need user object in event handlers (that don't have access to updated state)
       //that's why we store it in a ref
@@ -800,12 +847,12 @@ var AuthProviderClass = /*#__PURE__*/function (_Component) {
       });
     });
     _defineProperty(_assertThisInitialized(_this), "fetchLastTime", /*#__PURE__*/function () {
-      var _ref18 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(projectName, page, userId) {
+      var _ref19 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(projectName, page, userId) {
         var filterBody, response;
-        return _regeneratorRuntime().wrap(function _callee18$(_context18) {
-          while (1) switch (_context18.prev = _context18.next) {
+        return _regeneratorRuntime().wrap(function _callee19$(_context19) {
+          while (1) switch (_context19.prev = _context19.next) {
             case 0:
-              _context18.prev = 0;
+              _context19.prev = 0;
               filterBody = {
                 projectName: projectName,
                 page: page
@@ -813,25 +860,25 @@ var AuthProviderClass = /*#__PURE__*/function (_Component) {
               if (userId) {
                 filterBody.userId = userId;
               }
-              _context18.next = 5;
+              _context19.next = 5;
               return _Auth.default.fetchTrackingUserLastTime({
                 filter: filterBody
               });
             case 5:
-              response = _context18.sent;
-              return _context18.abrupt("return", response);
+              response = _context19.sent;
+              return _context19.abrupt("return", response);
             case 9:
-              _context18.prev = 9;
-              _context18.t0 = _context18["catch"](0);
-              console.log(' error', _context18.t0);
+              _context19.prev = 9;
+              _context19.t0 = _context19["catch"](0);
+              console.log(' error', _context19.t0);
             case 12:
             case "end":
-              return _context18.stop();
+              return _context19.stop();
           }
-        }, _callee18, null, [[0, 9]]);
+        }, _callee19, null, [[0, 9]]);
       }));
-      return function (_x20, _x21, _x22) {
-        return _ref18.apply(this, arguments);
+      return function (_x21, _x22, _x23) {
+        return _ref19.apply(this, arguments);
       };
     }());
     return _this;
@@ -879,6 +926,7 @@ var AuthProviderClass = /*#__PURE__*/function (_Component) {
           updatePassword: _Auth.default.updateUserPassword,
           createUser: _Auth.default.createUser,
           updateFirebaseUser: _Auth.default.updateFirebaseUser,
+          handleResetPassword: this.handleResetPassword,
           setUser: this.setUser
         })
       }, children);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stokr/components-library",
-  "version": "2.0.0-beta.4",
+  "version": "2.0.0-beta.6",
   "description": "STOKR - Components Library",
   "main": "dist/index.js",
   "module": "dist/index.js",