greatbody
/
freeCodeCamp
mirror of https://github.com/freeCodeCamp/freeCodeCamp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

add mailer back in

pull/2/head
Michael Q Larson 2014-12-07 21:00:21 -08:00
parent 64f12f8ee1
commit e173b35c2b
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
config/passport.js
View File

@ -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;