diff options
| -rw-r--r-- | config/passport.js | 13 | ||||
| -rw-r--r-- | node_simple.js | 2 | ||||
| -rw-r--r-- | routes/index.js | 14 | ||||
| -rw-r--r-- | views/signup.hbs | 23 |
4 files changed, 31 insertions, 21 deletions
diff --git a/config/passport.js b/config/passport.js index 576f088..d63e4fd 100644 --- a/config/passport.js +++ b/config/passport.js @@ -15,11 +15,11 @@ var comparePassword = function (password) { } passport.serializeUser(function (user, done) { - done(null, user.id); + done(null, user); }); -passport.deserializeUser(function(id, done) { - done(err, user); +passport.deserializeUser(function(user, done) { + done(null, user); }); @@ -30,10 +30,13 @@ passport.use('local_signup', new LocalStrategy({ passwordField: 'password', passReqToCallback: true }, function(req, email, password, done){ - req.check('email', 'Invalid email address').notEmpty().isEmail(); + console.log("nothing here"); + /*req.check('email', 'Invalid email address').notEmpty().isEmail(); req.check('password', "Password is invalid").notEmpty().isLength({min: 6}).equals(req.body.confirmPassword); + // password has to be at least 4 characters long + console.log('validation ERrors'); var errors = req.validationErrors(); console.log("IN PASSPORT"); if (errors) { @@ -42,7 +45,7 @@ passport.use('local_signup', new LocalStrategy({ messages.push(error.msg); }); return done(null, false, req.flash('error', messages)); - } + }*/ var hash_pass = encryptPassword(password); var fields = [email, req.body.usrname, req.body.fname, req.body.lname, req.body.univ, req.body.dept, hash_pass, diff --git a/node_simple.js b/node_simple.js index 7f616f7..db65e64 100644 --- a/node_simple.js +++ b/node_simple.js @@ -114,7 +114,7 @@ exports.add_user = function (fields, callbackUser) { }; // find out if this user already exists by checking their email - exports.find_user( fields[0] ,callbackUser, function (result) { + exports.find_user( fields[0] ,callbackUser, function (result, callbackUser) { console.log("inside find_user"); if (result == false) { console.log("no such user found"); diff --git a/routes/index.js b/routes/index.js index 3b2f4fb..381727a 100644 --- a/routes/index.js +++ b/routes/index.js @@ -159,35 +159,33 @@ router.get('/signup', function(req, res, next) { }); -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', diff --git a/views/signup.hbs b/views/signup.hbs index b5fd363..24fad1f 100644 --- a/views/signup.hbs +++ b/views/signup.hbs @@ -3,14 +3,23 @@ <div class="row" id="solutions-main"> <div class="col-md-4 col-md-offset-4 col-sm-6 col-sm-offset-3"> - - {{# if hasErrors}} - <div class="alert alert-danger"> - {{# each messages}} - <p>{{this}}</p> - {{/each}} - </div> + {{# if success }} + <section class="alert alert-success"> + <!-- Change those to banners later --> + <h2>Signup Successful!</h2> + </section> + {{ else }} + {{# if errors }} + <section class="alert alert-danger"> + <ul> + {{# each errors }} + <li>{{ this.msg }}</li> + {{/each}} + </ul> + </section> + {{/if}} {{/if}} + <h2><i class="fa fa-user-plus" aria-hidden="true"></i> Sign Up</h2> <form action="/signup" method="post"> <div class="form-group"> |