From 04e774a748f00993d254671e068fcb58ba567da1 Mon Sep 17 00:00:00 2001 From: nanalelfe Date: Fri, 22 Jul 2016 20:20:04 -0400 Subject: Leftover commits --- routes/user.js | 13 ++++--------- views/partials/header.hbs | 2 +- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/routes/user.js b/routes/user.js index a8e90bb..ccc4f87 100644 --- a/routes/user.js +++ b/routes/user.js @@ -7,7 +7,7 @@ var csrfProtection = csrf(); router.use(csrfProtection); // router is protected -router.get('/logout', function (req, res, next) { +router.get('/logout', loggedIn, function (req, res, next) { req.logout(); res.redirect('/'); }); @@ -17,12 +17,12 @@ router.get('/user_profile', loggedIn, function(req, res, next) { res.render('user_profile_alt'); }); -router.get('/signup', function(req, res, next) { +router.get('/signup', loggedOut, function(req, res, next) { res.render('signup', {csrfToken: req.csrfToken(), success: req.session.success, errors: req.session.errors}); req.session.errors = null; }); -router.get('/signup/failed', function(req, res, next) { +router.get('/signup/failed', loggedOut, function(req, res, next) { var msg = req.flash('error'); res.render('signup', {csrfToken: req.csrfToken(), @@ -31,8 +31,7 @@ router.get('/signup/failed', function(req, res, next) { flashMsg: msg}); }); - -router.get('/signin', function (req, res, next) { +router.get('/signin', loggedOut, function (req, res, next) { var msg = req.flash('error'); res.render('signin', { csrfToken: req.csrfToken(), @@ -42,7 +41,6 @@ router.get('/signin', function (req, res, next) { }); }); - router.post('/signup', loggedOut, function(req, res, next) { req.check('fname', 'Please enter a valid first name.').notEmpty().withMessage('First name required.').isAlpha(); req.check('lname', 'Please enter a valid first name.').notEmpty().withMessage('Last name required.').isAlpha(); @@ -97,8 +95,6 @@ router.post('/signin', loggedOut, function(req, res, next) { module.exports = router; - - function loggedIn(req, res, next) { if (req.isAuthenticated()) { return next(); @@ -106,7 +102,6 @@ function loggedIn(req, res, next) { res.redirect('/'); } - function loggedOut(req, res, next) { if (!req.isAuthenticated()) { return next(); diff --git a/views/partials/header.hbs b/views/partials/header.hbs index 9140302..c9a6e4b 100644 --- a/views/partials/header.hbs +++ b/views/partials/header.hbs @@ -24,7 +24,7 @@