Merge branch 'master' of https://github.com/HumairAK/solutions_repo

1 files changed, 6 insertions, 6 deletions

diff --git a/routes/user.js b/routes/user.js
index 39b41d2..014a7d2 100644
--- a/routes/user.js
+++ b/routes/user.js
@@ -49,8 +49,11 @@ router.post('/signup', loggedOut, function(req, res, next) {
     req.check('password', "Password should be between 6 and 12 characters.")
         .notEmpty().withMessage('Password required').isLength({min: 6, max: 12});
     req.check('password', "The confirmation password doesn't match.").equals(req.body.confirmPassword);
-    req.check('phone_num', 'Please enter a valid phone number').isMobilePhone('en-CA').optional();
-    // password has to be at least 4 characters long
+
+    // phone number optional
+    if (req.body.phone_num){
+        req.check('phone_num', 'Please enter a valid phone number').isMobilePhone('en-CA');
+    }
 
     var errors = req.validationErrors();
     if (errors) {
@@ -66,14 +69,11 @@ router.post('/signup', loggedOut, function(req, res, next) {
         })(req, res);
 
     }
-    //res.redirect('/signup');
-
 });
 
 router.post('/signin', loggedOut, function(req, res, next) {
     req.check('usrname', 'Username field is empty.').notEmpty();
     req.check('password', "Password field is empty.").notEmpty();
-    // password has to be at least 4 characters long
 
     var errors = req.validationErrors();
     if (errors) {
@@ -87,9 +87,9 @@ router.post('/signin', loggedOut, function(req, res, next) {
             failureRedirect: '/user/signin',
             failureFlash: true
         })(req, res);
-
     }
 
+
 });
 
 module.exports = router;