From e173b35c2be0d26872863d54b6ea6ff5948964bd Mon Sep 17 00:00:00 2001 From: Michael Q Larson Date: Sun, 7 Dec 2014 21:00:21 -0800 Subject: [PATCH] add mailer back in --- config/passport.js | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/config/passport.js b/config/passport.js index 01f61b5219..414090a298 100644 --- a/config/passport.js +++ b/config/passport.js @@ -22,22 +22,21 @@ passport.deserializeUser(function(id, done) { }); }); -function sendWelcomeEmail(user) { - console.log('=================================================================================CALL==============================='); - //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 ' + user.name + '!', - // text: 'Hello,\n\n' + - // 'Welcome to Free Code Camp!' - //}; +function sendWelcomeEmail(new_user) { + var transporter = nodemailer.createTransport({ + service: 'Mandrill', + auth: { + user: secrets.mandrill.user, + pass: secrets.mandrill.password + } + }); + var mailOptions = { + to: new_user.email, + from: 'Team@freecodecamp.com', + subject: 'Welcome to Free Code Camp!', + text: 'Hello,\n\n' + + 'Welcome to Free Code Camp!' + }; } /** @@ -273,9 +272,6 @@ passport.use(new GoogleStrategy(secrets.google, function(req, accessToken, refre User.findOne({ google: profile.id }, function(err, existingUser) { if (existingUser) return done(null, existingUser); User.findOne({ email: profile._json.email }, function(err, existingEmailUser) { - console.log('debug'); - console.log(existingEmailUser); - console.log('debug'); var user = existingEmailUser || new User; user.email = user.email || profile._json.email; user.google = profile.id;