gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

some more blind tinkering

Browse Source
This commit is contained in:
Michael Q Larson
2014-12-07 21:08:33 -08:00
parent e173b35c2b
commit f1bedbdecf
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
config/passport.js
View File

@ -22,7 +22,7 @@ passport.deserializeUser(function(id, done) {
}); });
}); });
function sendWelcomeEmail(new_user) { function sendWelcomeEmail(u) {
var transporter = nodemailer.createTransport({ var transporter = nodemailer.createTransport({
service: 'Mandrill', service: 'Mandrill',
auth: { auth: {
@ -31,9 +31,9 @@ function sendWelcomeEmail(new_user) {
} }
}); });
var mailOptions = { var mailOptions = {
to: new_user.email, to: u.email,
from: 'Team@freecodecamp.com', from: 'Team@freecodecamp.com',
subject: 'Welcome to Free Code Camp!', subject: 'Welcome to Free Code Camp ' + u.name + '!',
text: 'Hello,\n\n' + text: 'Hello,\n\n' +
'Welcome to Free Code Camp!' 'Welcome to Free Code Camp!'
}; };
@ -279,12 +279,12 @@ passport.use(new GoogleStrategy(secrets.google, function(req, accessToken, refre
user.profile.name = user.profile.name || profile.displayName; user.profile.name = user.profile.name || profile.displayName;
user.profile.gender = user.profile.gender || profile._json.gender; user.profile.gender = user.profile.gender || profile._json.gender;
user.profile.picture = user.profile.picture || profile._json.picture; user.profile.picture = user.profile.picture || profile._json.picture;
user.save(function(err) {
done(err, user);
});
if (!existingEmailUser) { if (!existingEmailUser) {
sendWelcomeEmail(user); sendWelcomeEmail(user);
} }
user.save(function(err) {
done(err, user);
});
}); });
}); });
} }