Fixed message when someone logs in with facebook using an email that already exists

2 files changed, 3 insertions, 12 deletions

diff --git a/routes/index.js b/routes/index.js
index c87ced9..fe1cdb8 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -280,7 +280,8 @@ router.get('/auth/facebook', passport.authenticate('facebook', { scope: ['email'
 router.get('/auth/facebook/callback',
     passport.authenticate('facebook', {
     successRedirect: '/user/user_profile',
-        failureRedirect: '/user/signin' }));
+        failureRedirect: '/user/signin',
+        failureFlash: true}));
 
 
 
diff --git a/routes/user.js b/routes/user.js
index 56b5321..d2eea37 100644
--- a/routes/user.js
+++ b/routes/user.js
@@ -158,16 +158,6 @@ router.get('/signin', loggedOut, function (req, res, next) {
     });
 });
 
-/** Render/GET verification page. */
-router.get('/verify', function(req, res, next) {
-    if (req.user && req.user.email) {
-        res.render('verification', {noHeader: true, noFooter: true});
-    } else {
-        res.redirect('/user/user_profile');
-    }
-
-});
-
 /** Retrieves infomation from the signup form, form validates and sends it to passport.js to authenticate. */
 router.post('/signup', loggedOut, function(req, res, next) {
     req.assert('fname', 'Please enter a valid first name.').notEmpty().withMessage('First name required.').isAlpha();
@@ -207,7 +197,7 @@ router.post('/signin', loggedOut, function(req, res, next) {
     if (errors) {
         req.session.errors = errors;
         req.session.success = false;
-        res.redirect('/signin');
+        res.redirect('/user/signin');
     } else {
         passport.authenticate('local_signin', {
             successRedirect: '/user/user_profile',