Add banners to the password reset page.

Fix bug with headers being sent twice on password reset fail.

controllers/passwordReset.js

@@ -30,9 +30,7 @@ module.exports = {
                         link: `${process.env.SITE}/reset/${merchant._id}/${merchant.verifyId}`
                     })
                 };
-                mailgun.messages().send(mailgunData, (err, body)=>{
-                    console.log(err);
-                });
+                mailgun.messages().send(mailgunData, (err, body)=>{});
 
                 return merchant.save();
             })
@@ -41,14 +39,21 @@ module.exports = {
                 return res.redirect("/");
             })
             .catch((err)=>{
-                console.log(err);
                 req.session.error = "ERROR: UNABLE TO RESET PASSWORD AT THIS TIME";
                 return res.redirect("/");
             });
     },
 
     enterPassword: function(req, res){
-        return res.render("passwordResetPages/password", {id: req.params.id, code: req.params.code});
+        let error = {};
+        if(req.session.error){
+            error = req.session.error;
+            req.session.error = undefined;
+        }else{
+            error = null;
+        }
+
+        return res.render("passwordResetPages/password", {id: req.params.id, code: req.params.code, error: error});
     },
 
     resetPassword: function(req, res){
@@ -59,6 +64,16 @@ module.exports = {
                     return res.redirect("/");
                 }
 
+                if(req.body.password !== req.body.confirmPassword){
+                    req.session.error = "PASSWORDS DO NOT MATCH";
+                    return res.redirect(`/reset/${merchant._id}/${merchant.verifyId}`);
+                }
+
+                if(req.body.password.length < 10){
+                    req.session.error = "PASSWORD MUST CONTAIN AT LEAST 10 CHARACTERS";
+                    return res.redirect(`/reset/${merchant._id}/${merchant.verifyId}`);
+                }
+
                 const salt = bcrypt.genSaltSync(10);
                 const hash = bcrypt.hashSync(req.body.password, salt);
 
@@ -68,12 +83,14 @@ module.exports = {
                 return merchant.save();
             })
             .then((merchant)=>{
-                req.session.error = "PASSWORD SUCCESSFULLY UPDATED.  PLEASE LOG IN";
-                return res.redirect("/");
+                if(merchant !== undefined){
+                    req.session.error = "PASSWORD SUCCESSFULLY UPDATED.  PLEASE LOG IN";
+                    return res.redirect("/");
+                }
             })
             .catch((err)=>{
                 req.session.error = "ERROR: UNABLE TO UPDATE YOUR PASSWORD AT THIS TIME";
                 return res.redirect("/");
-            })
+            });
     }
 }

controllers/recipeData.js

@@ -127,7 +127,6 @@ module.exports = {
 
                 merchant.save()
                     .catch((err)=>{
-                        console.log(err);
                         return res.json("ERROR: UNABLE TO SAVE DATA");
                     })
 

views/passwordResetPages/password.ejs

@@ -32,6 +32,11 @@
             document.getElementById("helpLink").style.display = "block";
             document.getElementById("privacyPolicyLink").style.display = "block";
             document.getElementById("termsLink").style.display = "block";
+
+            const error = <%- JSON.stringify(error) %>;
+            if(error){
+                banner.createError(error);
+            }
         </script>
     </body>
 </html>