resolved conflict

1 files changed, 7 insertions, 8 deletions

diff --git a/routes/index.js b/routes/index.js
index 717533b..f44b175 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -159,35 +159,34 @@ router.get('/signup', function(req, res, next) {
     res.render('signup', {csrfToken: req.csrfToken(), success: req.session.success, errors: req.session.errors});
 });
 
-router.post('/signup', passport.authenticate('local_signup', {
+
+/*router.post('/signup', passport.authenticate('local_signup', {
     successRedirect: '/user_profile',
     failureRedirect: '/signup',
     failureFlash: true
-}));
+}));*/
 
-/*router.post('/signup', function(req, res, next) {
+router.post('/signup', function(req, res, next) {
     req.check('email', 'Invalid email address').isEmail();
-    req.check('password', "Password is invalid").isLength({min: 4}).equals(req.body.confirmPassword);
+    req.check('password', "Password is invalid").isLength({min: 6}).equals(req.body.confirmPassword);
     // password has to be at least 4 characters long
 
     var errors = req.validationErrors();
     if (errors) {
         req.session.errors = errors;
         req.session.success = false;
-        console.log("got here");
         res.redirect('/signup');
     } else {
-        req.session.success = true;
         console.log("GOT SUCCESS");
         passport.authenticate('local_signup', {
             successRedirect: '/user_profile',
             failureRedirect: '/signup',
             failureFlash: true
-        });
+        })(req, res);
     }
     //res.redirect('/signup');
 
-});*/
+});
 
 /*router.post('/signup', passport.authenticate('local.signup', {
     sucessRedirect: '/profile',