From 89ee552a12e42a072bc125cec2ec77e7099dc353 Mon Sep 17 00:00:00 2001
From: Michael Q Larson <michaelqlarson@gmail.com>
Date: Sun, 22 Mar 2015 22:22:52 -0700
Subject: [PATCH] start adding error handling to passport

---
 config/passport.js | 53 +++++++++++++++++++++++++---------------------
 1 file changed, 29 insertions(+), 24 deletions(-)

diff --git a/config/passport.js b/config/passport.js
index af46f12713..1961f88cca 100644
--- a/config/passport.js
+++ b/config/passport.js
@@ -29,6 +29,7 @@ passport.use(new LocalStrategy({ usernameField: 'email' }, function(email, passw
   User.findOne({ email: email }, function(err, user) {
     if (!user) return done(null, false, { message: 'Email ' + email + ' not found'});
     user.comparePassword(password, function(err, isMatch) {
+      if (err) { return done(err); }
       if (isMatch) {
         return done(null, user);
       } else {
@@ -58,6 +59,7 @@ passport.use(new LocalStrategy({ usernameField: 'email' }, function(email, passw
 passport.use(new FacebookStrategy(secrets.facebook, function(req, accessToken, refreshToken, profile, done) {
   if (req.user) {
     User.findOne({ facebook: profile.id }, function(err, existingUser) {
+      if (err) { return done(err); }
       if (existingUser) {
         req.flash('errors', { msg: 'There is already a Facebook account that belongs to you. Sign in with that account or delete it, then link it with your current account.' });
         done(err);
@@ -77,8 +79,10 @@ passport.use(new FacebookStrategy(secrets.facebook, function(req, accessToken, r
     });
   } else {
     User.findOne({ facebook: profile.id }, function(err, existingUser) {
+      if (err) { return done(err); }
       if (existingUser) return done(null, existingUser);
       User.findOne({ email: profile._json.email }, function(err, existingEmailUser) {
+        if (err) { return done(err); }
         if (existingEmailUser) {
           req.flash('errors', { msg: 'There is already an account using this email address. Sign in to that account and link it with Facebook manually from Account Settings.' });
           done(err);
@@ -92,30 +96,31 @@ passport.use(new FacebookStrategy(secrets.facebook, function(req, accessToken, r
           user.profile.picture = 'https://graph.facebook.com/' + profile.id + '/picture?type=large';
           user.profile.location = (profile._json.location) ? profile._json.location.name : '';
           user.save(function(err) {
-            done(err, user);
-          });
-          var transporter = nodemailer.createTransport({
-            service: 'Mandrill',
-            auth: {
-              user: secrets.mandrill.user,
-              pass: secrets.mandrill.password
-            }
-          });
-          var mailOptions = {
-            to: user.email,
-            from: 'Team@freecodecamp.com',
-            subject: 'Welcome to Free Code Camp!',
-            text: [
-              'Greetings from San Francisco!\n\n',
-              'Thank you for joining our community.\n',
-              'Feel free to email us at this address if you have any questions about Free Code Camp.\n',
-              "And if you have a moment, check out our blog: blog.freecodecamp.com.\n",
-              'Good luck with the challenges!\n\n',
-              '- the Volunteer Camp Counselor Team'
-            ].join('')
-          };
-          transporter.sendMail(mailOptions, function(err) {
-            if (err) { return err; }
+            if (err) { return done(err); }
+            var transporter = nodemailer.createTransport({
+              service: 'Mandrill',
+              auth: {
+                user: secrets.mandrill.user,
+                pass: secrets.mandrill.password
+              }
+            });
+            var mailOptions = {
+              to: user.email,
+              from: 'Team@freecodecamp.com',
+              subject: 'Welcome to Free Code Camp!',
+              text: [
+                'Greetings from San Francisco!\n\n',
+                'Thank you for joining our community.\n',
+                'Feel free to email us at this address if you have any questions about Free Code Camp.\n',
+                "And if you have a moment, check out our blog: blog.freecodecamp.com.\n",
+                'Good luck with the challenges!\n\n',
+                '- the Volunteer Camp Counselor Team'
+              ].join('')
+            };
+            transporter.sendMail(mailOptions, function(err) {
+              if (err) { return done(err); }
+              done(null, user);
+            });
           });
         }
       });