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

package/dist/components/headerHo/HeaderHo.js

@@ -259,7 +259,9 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
         activateMenu = _this$props3.activateMenu,
         activeMenu = _this$props3.activeMenu,
         withoutLoginSignupButton = _this$props3.withoutLoginSignupButton,
-        useRelativePathForMenu = _this$props3.useRelativePathForMenu;
+        useRelativePathForMenu = _this$props3.useRelativePathForMenu,
+        isLoginModalOpen = _this$props3.isLoginModalOpen,
+        setIsLoginModalOpen = _this$props3.setIsLoginModalOpen;
       var _this$context2 = this.context,
         getUser = _this$context2.getUser,
         _this$context2$user = _this$context2.user,
@@ -290,19 +292,22 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
       }), /*#__PURE__*/_react.default.createElement(_LoginModal.default, {
         isActionLoading: isActionLoading,
         popupError: this.state.popupError,
-        isModalOpen: isModalOpen.login,
+        isModalOpen: isModalOpen.login || isLoginModalOpen,
         onModalClose: function onModalClose() {
           _this2.setOpenModalStatus('login', false);
+          setIsLoginModalOpen && setIsLoginModalOpen(false);
           _this2.clearPopupError();
           _this2.setIsActionLoading(undefined);
         },
         onModalSwitch: function onModalSwitch() {
           _this2.switchOpenModal('login', 'signUp');
+          setIsLoginModalOpen && setIsLoginModalOpen(false);
           _this2.clearPopupError();
           _this2.setIsActionLoading(undefined);
         },
         onForgotPassword: function onForgotPassword() {
           _this2.switchOpenModal('login', 'forgot');
+          setIsLoginModalOpen && setIsLoginModalOpen(false);
           _this2.clearPopupError();
           _this2.setIsActionLoading(undefined);
         },
@@ -328,35 +333,36 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
                   return loginUser(email, password);
                 case 10:
                   _this2.setOpenModalStatus('login', false);
+                  setIsLoginModalOpen && setIsLoginModalOpen(false);
                   _this2.clearPopupError();
                   _this2.setIsActionLoading(undefined);
                   //await getUser()
-                  _context.next = 25;
+                  _context.next = 26;
                   break;
-                case 15:
-                  _context.prev = 15;
+                case 16:
+                  _context.prev = 16;
                   _context.t0 = _context["catch"](3);
                   errorMessage = _context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.message; //handle switch modal correctly
                   if (!((_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.code) === 'auth/multi-factor-auth-required')) {
-                    _context.next = 23;
+                    _context.next = 24;
                     break;
                   }
                   _this2.switchOpenModal('login', 'enter2fa');
                   _this2.clearPopupError();
                   _this2.setIsActionLoading(undefined);
                   return _context.abrupt("return");
-                case 23:
+                case 24:
                   if (errorMessage) {
                     _this2.setPopupError('login', errorMessage);
                   } else {
                     _this2.setPopupError('login', "Oops. Something's not right there. Try again?");
                   }
                   _this2.setIsActionLoading(undefined);
-                case 25:
+                case 26:
                 case "end":
                   return _context.stop();
               }
-            }, _callee, null, [[3, 15]]);
+            }, _callee, null, [[3, 16]]);
           }));
           return function (_x) {
             return _ref3.apply(this, arguments);

package/dist/context/Auth.js

@@ -99,6 +99,17 @@ var Auth = /*#__PURE__*/function () {
         });
       });
     }
+  }, {
+    key: "requestUpdateEmail",
+    value: function requestUpdateEmail(data) {
+      return new Promise(function (resolve, reject) {
+        _axios.default.post("user/requestUpdateEmail", data).then(function (response) {
+          resolve(response.data);
+        }).catch(function (err) {
+          reject(err);
+        });
+      });
+    }
   }, {
     key: "checkPrivateInvestor",
     value: function checkPrivateInvestor(data) {
@@ -121,6 +132,17 @@ var Auth = /*#__PURE__*/function () {
         });
       });
     }
+  }, {
+    key: "fetchTrackingUserLastTime",
+    value: function fetchTrackingUserLastTime(data) {
+      return new Promise(function (resolve, reject) {
+        _axios.default.post("tracking-user/getLast", data).then(function (response) {
+          resolve(response.data);
+        }).catch(function (err) {
+          reject(err);
+        });
+      });
+    }
   }, {
     key: "updateUser",
     value: function updateUser(data) {
@@ -143,6 +165,17 @@ var Auth = /*#__PURE__*/function () {
         });
       });
     }
+  }, {
+    key: "createWallet",
+    value: function createWallet(data) {
+      return new Promise(function (resolve, reject) {
+        _axios.default.post("wallets/create", data).then(function (response) {
+          resolve(response.data);
+        }).catch(function (err) {
+          reject(err);
+        });
+      });
+    }
   }, {
     key: "resendActivationEmail",
     value: function resendActivationEmail(data) {
@@ -190,7 +223,7 @@ var Auth = /*#__PURE__*/function () {
           return _regeneratorRuntime().wrap(function _callee2$(_context2) {
             while (1) switch (_context2.prev = _context2.next) {
               case 0:
-                _axios.default.post("greenwallet/validate-gaid", {
+                _axios.default.post("wallets/validate-gaid", {
                   gaid: id
                 }).then(function (response) {
                   resolve(response.data);

package/dist/context/AuthContext.js

@@ -54,6 +54,7 @@ var AuthProviderClass = /*#__PURE__*/function (_Component) {
       waitingFor2fa: false,
       firebaseError: null
     });
+    _defineProperty(_assertThisInitialized(_this), "userRef", /*#__PURE__*/_react.default.createRef(null));
     _defineProperty(_assertThisInitialized(_this), "checkTokenIsValid", function () {
       var redirect = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
       var accessToken = _Auth.default.getAccessToken();
@@ -75,43 +76,44 @@ var AuthProviderClass = /*#__PURE__*/function (_Component) {
               user = _context.sent;
               console.log('🚀 ~ file: AuthContext.js:33 ~ user:', user);
               _Auth.default.setAccessToken(user.accessToken);
+              _axios.default.defaults.headers.common.Authorization = "Bearer ".concat(user.accessToken);
+              _this.setUser(user);
               _this.setState({
-                user: user,
                 isFetchingUser: false
               });
               //if you need user immediatly
               return _context.abrupt("return", user);
-            case 10:
-              _context.prev = 10;
+            case 12:
+              _context.prev = 12;
               _context.t0 = _context["catch"](0);
               console.log('🚀 ~ file: AuthContext.js:56 ~ error:', _context.t0);
               _context.t1 = _context.t0.code;
-              _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;
+              _context.next = _context.t1 === 'auth/multi-factor-auth-required' ? 18 : _context.t1 === 'auth/requires-recent-login' ? 20 : _context.t1 === 'auth/invalid-login-credentials' ? 22 : 24;
               break;
-            case 16:
+            case 18:
               // Initiate your second factor sign-in flow. (See next step.)
               _this.setState({
                 waitingFor2fa: true,
                 firebaseError: _context.t0
               });
               throw _context.t0;
-            case 18:
+            case 20:
               // The user's last sign-in time does not meet the security threshold.
               _this.logoutUser();
-              return _context.abrupt("break", 25);
-            case 20:
+              return _context.abrupt("break", 27);
+            case 22:
               _context.t0.message = 'The credentials are not correct. Try again?';
               throw _context.t0;
-            case 22:
+            case 24:
               console.log({
                 error: _context.t0
               }); // Handle other errors, such as wrong passwords.
               throw _context.t0;
-            case 25:
+            case 27:
             case "end":
               return _context.stop();
           }
-        }, _callee, null, [[0, 10]]);
+        }, _callee, null, [[0, 12]]);
       }));
       return function (_x, _x2) {
         return _ref.apply(this, arguments);
@@ -127,7 +129,7 @@ var AuthProviderClass = /*#__PURE__*/function (_Component) {
               //console.log(enrolledFactors);
               selectedIndex = 0;
               _context2.t0 = mfaResolver.hints[selectedIndex].factorId;
-              _context2.next = _context2.t0 === _auth.TotpMultiFactorGenerator.FACTOR_ID ? 5 : _context2.t0 === _auth.PhoneMultiFactorGenerator.FACTOR_ID ? 22 : 23;
+              _context2.next = _context2.t0 === _auth.TotpMultiFactorGenerator.FACTOR_ID ? 5 : _context2.t0 === _auth.PhoneMultiFactorGenerator.FACTOR_ID ? 23 : 24;
               break;
             case 5:
               otpFromAuthenticator = verificationCode; // OTP typed by the user.
@@ -139,32 +141,31 @@ var AuthProviderClass = /*#__PURE__*/function (_Component) {
               userCredential = _context2.sent;
               user = userCredential.user;
               _Auth.default.setAccessToken(user.accessToken);
-              _this.setState({
-                user: user
-              });
+              _axios.default.defaults.headers.common.Authorization = "Bearer ".concat(user.accessToken);
+              _this.setUser(user);
               console.log('🚀 ~sucess login 2FA:');
               // Successfully signed in!
-              _context2.next = 21;
+              _context2.next = 22;
               break;
-            case 17:
-              _context2.prev = 17;
+            case 18:
+              _context2.prev = 18;
               _context2.t1 = _context2["catch"](7);
               // Invalid or expired OTP.
               console.log({
                 error: _context2.t1
               });
               throw _context2.t1;
-            case 21:
-              return _context2.abrupt("break", 24);
             case 22:
-              return _context2.abrupt("break", 24);
+              return _context2.abrupt("break", 25);
             case 23:
-              return _context2.abrupt("break", 24);
+              return _context2.abrupt("break", 25);
             case 24:
+              return _context2.abrupt("break", 25);
+            case 25:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, null, [[7, 17]]);
+        }, _callee2, null, [[7, 18]]);
       }));
       return function (_x3, _x4) {
         return _ref2.apply(this, arguments);
@@ -331,9 +332,8 @@ var AuthProviderClass = /*#__PURE__*/function (_Component) {
     _defineProperty(_assertThisInitialized(_this), "logoutUser", function () {
       var redirect = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
       _Auth.default.logout();
-      _this.setState({
-        user: null
-      });
+      delete _axios.default.defaults.headers.common.Authorization;
+      _this.setUser(null);
       if (redirect) {
         window.location.href = "https://".concat(process.env.REACT_APP_WEBSITE_DOMAIN);
       }
@@ -364,8 +364,8 @@ var AuthProviderClass = /*#__PURE__*/function (_Component) {
               customValidateGetUser && customValidateGetUser(user);
               userAvatar = "".concat(process.env.REACT_APP_PHOTO_API_URL, "/media/picture/view/").concat(user._id);
               _this.checkUserPhoto(userAvatar);
+              _this.setUser(user);
               _this.setState({
-                user: user,
                 isFetchingUser: false
               });
 
@@ -374,19 +374,19 @@ var AuthProviderClass = /*#__PURE__*/function (_Component) {
 
               //if you need user info immediately after call (before setState is executed), you can use this
               return _context7.abrupt("return", user);
-            case 18:
-              _context7.prev = 18;
+            case 19:
+              _context7.prev = 19;
               _context7.t0 = _context7["catch"](4);
               _this.setState({
                 isFetchingUser: false
               });
               console.log("Error in getUser: ".concat(_context7.t0));
               throw _context7.t0;
-            case 23:
+            case 24:
             case "end":
               return _context7.stop();
           }
-        }, _callee7, null, [[4, 18]]);
+        }, _callee7, null, [[4, 19]]);
       }));
       return function (_x10) {
         return _ref7.apply(this, arguments);
@@ -510,9 +510,7 @@ var AuthProviderClass = /*#__PURE__*/function (_Component) {
             case 3:
               _yield$Auth$updateUse = _context10.sent;
               user = _yield$Auth$updateUse.user;
-              _this.setState({
-                user: user
-              });
+              _this.setUser(user);
               _context10.next = 12;
               break;
             case 8:
@@ -703,9 +701,7 @@ var AuthProviderClass = /*#__PURE__*/function (_Component) {
               return _Auth.default.uploaProofOfAddress(data, ip);
             case 3:
               user = _context15.sent;
-              _this.setState({
-                user: user
-              });
+              _this.setUser(user);
               _context15.next = 11;
               break;
             case 7:
@@ -745,11 +741,74 @@ var AuthProviderClass = /*#__PURE__*/function (_Component) {
         return _ref16.apply(this, arguments);
       };
     }());
+    _defineProperty(_assertThisInitialized(_this), "createWallet", /*#__PURE__*/function () {
+      var _ref17 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(data) {
+        var wallet;
+        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);
+            case 3:
+              wallet = _context17.sent;
+              return _context17.abrupt("return", wallet);
+            case 7:
+              _context17.prev = 7;
+              _context17.t0 = _context17["catch"](0);
+              console.log("Error creating wallet: ".concat(_context17.t0));
+              throw _context17.t0;
+            case 11:
+            case "end":
+              return _context17.stop();
+          }
+        }, _callee17, null, [[0, 7]]);
+      }));
+      return function (_x20) {
+        return _ref17.apply(this, arguments);
+      };
+    }());
     _defineProperty(_assertThisInitialized(_this), "setUser", function (user) {
+      _this.userRef.current = user;
       _this.setState({
         user: user
       });
     });
+    _defineProperty(_assertThisInitialized(_this), "fetchLastTime", /*#__PURE__*/function () {
+      var _ref18 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(projectName, page, userId) {
+        var filterBody, response;
+        return _regeneratorRuntime().wrap(function _callee18$(_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
+            case 0:
+              _context18.prev = 0;
+              filterBody = {
+                projectName: projectName,
+                page: page
+              };
+              if (userId) {
+                filterBody.userId = userId;
+              }
+              _context18.next = 5;
+              return _Auth.default.fetchTrackingUserLastTime({
+                filter: filterBody
+              });
+            case 5:
+              response = _context18.sent;
+              return _context18.abrupt("return", response);
+            case 9:
+              _context18.prev = 9;
+              _context18.t0 = _context18["catch"](0);
+              console.log(' error', _context18.t0);
+            case 12:
+            case "end":
+              return _context18.stop();
+          }
+        }, _callee18, null, [[0, 9]]);
+      }));
+      return function (_x21, _x22, _x23) {
+        return _ref18.apply(this, arguments);
+      };
+    }());
     return _this;
   }
   _createClass(AuthProviderClass, [{
@@ -775,6 +834,7 @@ var AuthProviderClass = /*#__PURE__*/function (_Component) {
       var children = this.props.children;
       return /*#__PURE__*/_react.default.createElement(AuthContext.Provider, {
         value: _objectSpread(_objectSpread({}, this.state), {}, {
+          userRef: this.userRef,
           checkUserIsValid: this.checkUserIsValid,
           checkTokenIsValid: this.checkTokenIsValid,
           checkUserPhoto: this.checkUserPhoto,
@@ -795,6 +855,9 @@ var AuthProviderClass = /*#__PURE__*/function (_Component) {
           resendActivationEmail: this.resendActivationEmail,
           uploaProofOfAddress: this.uploaProofOfAddress,
           validateGreenWalletId: this.validateGreenWalletId,
+          fetchLastTime: this.fetchLastTime,
+          createWallet: this.createWallet,
+          requestUpdateEmail: _Auth.default.requestUpdateEmail,
           setUser: this.setUser
         })
       }, children);

package/package.json

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