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

revert to previous form and attempt to get working later

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

38
config/passport.js
View File

@ -22,22 +22,22 @@ passport.deserializeUser(function(id, done) {
}); });
}); });
function sendWelcomeEmail(u) { //function sendWelcomeEmail(u) {
var transporter = nodemailer.createTransport({ // var transporter = nodemailer.createTransport({
service: 'Mandrill', // service: 'Mandrill',
auth: { // auth: {
user: secrets.mandrill.user, // user: secrets.mandrill.user,
pass: secrets.mandrill.password // pass: secrets.mandrill.password
} // }
}); // });
var mailOptions = { // var mailOptions = {
to: u.email, // to: u.email,
from: 'Team@freecodecamp.com', // from: 'Team@freecodecamp.com',
subject: 'Welcome to Free Code Camp ' + u.name + '!', // 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!'
}; // };
} //}
/** /**
* OAuth Strategy Overview * OAuth Strategy Overview
@ -279,9 +279,9 @@ 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;
if (!existingEmailUser) { //if (!existingEmailUser) {
sendWelcomeEmail(user); // sendWelcomeEmail(user);
} //}
user.save(function(err) { user.save(function(err) {
done(err, user); done(err, user);
}); });