@stokr/components-library 2.3.41-beta.11 → 2.3.41-beta.13

package/dist/components/ResetPasswordModal/ResetPasswordModal.js

@@ -66,6 +66,10 @@ var ResetPasswordModal = function ResetPasswordModal(_ref) {
     _useState8 = _slicedToArray(_useState7, 2),
     activationSuccess = _useState8[0],
     setActivationSuccess = _useState8[1];
+  var _useState9 = (0, _react.useState)(false),
+    _useState10 = _slicedToArray(_useState9, 2),
+    passwordResetSuccess = _useState10[0],
+    setPasswordResetSuccess = _useState10[1];
   var location = (0, _reactRouterDom.useLocation)();
   var initialValues = {
     password: '',
@@ -83,6 +87,18 @@ var ResetPasswordModal = function ResetPasswordModal(_ref) {
   var emailValidationSchema = Yup.object().shape({
     email: Yup.string().required("Oops, this can't be blank").matches(/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/, 'Please enter a valid email address')
   });
+
+  // close modal after successful reset
+  (0, _react.useEffect)(function () {
+    if (passwordResetSuccess) {
+      var timer = setTimeout(function () {
+        onModalClose();
+      }, 1500);
+      return function () {
+        return clearTimeout(timer);
+      };
+    }
+  }, [passwordResetSuccess, onModalClose]);
   var checkTokenExpiration = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var search, query, oobCode, result;
@@ -90,47 +106,44 @@ var ResetPasswordModal = function ResetPasswordModal(_ref) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             if (location) {
-              _context.next = 5;
+              _context.next = 4;
               break;
             }
-            console.log('Location null ?! ');
             setIsTokenExpired(true);
             setIsCheckingToken(false);
             return _context.abrupt("return");
-          case 5:
-            _context.prev = 5;
+          case 4:
+            _context.prev = 4;
             search = location.search;
             query = new URLSearchParams(search);
             oobCode = query.get('oobCode');
-            console.log('oobCode from URL params: ', oobCode);
             if (oobCode) {
-              _context.next = 15;
+              _context.next = 12;
               break;
             }
-            console.log('oobCode was not found at all. value: ', oobCode);
             setIsTokenExpired(true);
             setIsCheckingToken(false);
             return _context.abrupt("return");
-          case 15:
-            _context.next = 17;
+          case 12:
+            _context.next = 14;
             return authContext.checkActivationLinkExpired(oobCode);
-          case 17:
+          case 14:
             result = _context.sent;
             setIsTokenExpired(result.expired);
             setIsCheckingToken(false);
-            _context.next = 27;
+            _context.next = 24;
             break;
-          case 22:
-            _context.prev = 22;
-            _context.t0 = _context["catch"](5);
+          case 19:
+            _context.prev = 19;
+            _context.t0 = _context["catch"](4);
             console.error('Error checking token expiration:', _context.t0);
             setIsTokenExpired(true);
             setIsCheckingToken(false);
-          case 27:
+          case 24:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[5, 22]]);
+      }, _callee, null, [[4, 19]]);
     }));
     return function checkTokenExpiration() {
       return _ref2.apply(this, arguments);
@@ -202,11 +215,11 @@ var ResetPasswordModal = function ResetPasswordModal(_ref) {
       modalTop: true
     }, /*#__PURE__*/_react.default.createElement(_Text.default, null, /*#__PURE__*/_react.default.createElement("h3", null, "THIS INVITE LINK HAS EXPIRED"), /*#__PURE__*/_react.default.createElement("p", null, "To continue, request a new one using your email, and access will be sent shortly."))), /*#__PURE__*/_react.default.createElement(_Modal.ModalInner, {
       modalBot: true
-    }, /*#__PURE__*/_react.default.createElement(_Modal.ModalLinkWrap, null, 'Need to reset your password? ', /*#__PURE__*/_react.default.createElement(_Modal.ModalLink, {
-      to: "/forgot-password",
+    }, /*#__PURE__*/_react.default.createElement(_Modal.ModalLinkWrap, null, 'Already have an account?', /*#__PURE__*/_react.default.createElement(_Modal.ModalLink, {
+      to: "/login",
       as: "button",
       onClick: onModalSwitch
-    }, "Request a new link")))), /*#__PURE__*/_react.default.createElement(_Grid.Column, {
+    }, "Log in")))), /*#__PURE__*/_react.default.createElement(_Grid.Column, {
       part: 8
     }, /*#__PURE__*/_react.default.createElement(_Modal.ModalInner, null, /*#__PURE__*/_react.default.createElement(_formik.Formik, {
       initialValues: {
@@ -276,7 +289,6 @@ var ResetPasswordModal = function ResetPasswordModal(_ref) {
     }, /*#__PURE__*/_react.default.createElement(_Modal.ModalInner, null, /*#__PURE__*/_react.default.createElement(_Text.default, null, /*#__PURE__*/_react.default.createElement("h3", null, "NEW LINK GENERATED"), /*#__PURE__*/_react.default.createElement("p", null, "Your new activation link has been processed successfully. You can now reset your password."))))));
   };
   (0, _react.useEffect)(function () {
-    console.log('Component mounted, checking token');
     checkTokenExpiration();
   }, []);
 
@@ -285,15 +297,9 @@ var ResetPasswordModal = function ResetPasswordModal(_ref) {
     if (activationSuccess) {
       setTimeout(function () {
         setActivationSuccess(false);
-      }, 2000); // Show success message for 2 seconds
+      }, 2000);
     }
   }, [activationSuccess]);
-  console.log('Render state:', {
-    isTokenExpired: isTokenExpired,
-    isCheckingToken: isCheckingToken,
-    isModalOpen: isModalOpen,
-    activationSuccess: activationSuccess
-  });
   if (!isModalOpen) {
     return null;
   }
@@ -321,16 +327,30 @@ var ResetPasswordModal = function ResetPasswordModal(_ref) {
     onClick: onModalSwitch
   }, "Log in")))), /*#__PURE__*/_react.default.createElement(_Grid.Column, {
     part: 8
-  }, /*#__PURE__*/_react.default.createElement(_Modal.ModalInner, null, /*#__PURE__*/_react.default.createElement(_formik.Formik, {
+  }, /*#__PURE__*/_react.default.createElement(_Modal.ModalInner, null, passwordResetSuccess ? /*#__PURE__*/_react.default.createElement(_Text.default, null, /*#__PURE__*/_react.default.createElement("h3", null, "SUCCESS!"), /*#__PURE__*/_react.default.createElement("p", null, "Your password has been reset successfully."), /*#__PURE__*/_react.default.createElement("p", null, "Proceeding to login...")) : /*#__PURE__*/_react.default.createElement(_formik.Formik, {
     initialValues: initialValues,
     validationSchema: validationSchema,
     onSubmit: function onSubmit(values) {
       var search = location.search;
       var query = new URLSearchParams(search);
       var oobCode = query.get('oobCode');
-      onFormSend(_objectSpread(_objectSpread({}, values), {}, {
+      var promise = onFormSend(_objectSpread(_objectSpread({}, values), {}, {
         oobCode: oobCode
       }));
+
+      // If onFormSend returns a promise, handle it
+      if (promise && typeof promise.then === 'function') {
+        promise.then(function (response) {
+          // Assuming response.success or some equivalent would indicate success
+          // Adjust according to your actual API response
+          setPasswordResetSuccess(true);
+        }).catch(function (err) {
+          console.error('Error during password reset:', err);
+        });
+      } else {
+        // If onFormSend doesn't return a promise, assume it was successful
+        setPasswordResetSuccess(true);
+      }
     }
   }, function (_ref5) {
     var values = _ref5.values,

package/package.json

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