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

add debug stuff

Browse Source
This commit is contained in:
Michael Q Larson
2014-12-07 20:56:02 -08:00
parent 2777259af9
commit 64f12f8ee1
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
config/passport.js
View File

@ -23,20 +23,21 @@ passport.deserializeUser(function(id, done) {
}); });
function sendWelcomeEmail(user) { function sendWelcomeEmail(user) {
var transporter = nodemailer.createTransport({ console.log('=================================================================================CALL===============================');
service: 'Mandrill', //var transporter = nodemailer.createTransport({
auth: { // service: 'Mandrill',
user: secrets.mandrill.user, // auth: {
pass: secrets.mandrill.password // user: secrets.mandrill.user,
} // pass: secrets.mandrill.password
}); // }
var mailOptions = { //});
to: user.email, //var mailOptions = {
from: 'Team@freecodecamp.com', // to: user.email,
subject: 'Welcome to Free Code Camp ' + user.name + '!', // from: 'Team@freecodecamp.com',
text: 'Hello,\n\n' + // subject: 'Welcome to Free Code Camp ' + user.name + '!',
'Welcome to Free Code Camp!' // text: 'Hello,\n\n' +
}; // 'Welcome to Free Code Camp!'
//};
} }
/** /**
@ -272,6 +273,9 @@ passport.use(new GoogleStrategy(secrets.google, function(req, accessToken, refre
User.findOne({ google: profile.id }, function(err, existingUser) { User.findOne({ google: profile.id }, function(err, existingUser) {
if (existingUser) return done(null, existingUser); if (existingUser) return done(null, existingUser);
User.findOne({ email: profile._json.email }, function(err, existingEmailUser) { User.findOne({ email: profile._json.email }, function(err, existingEmailUser) {
console.log('debug');
console.log(existingEmailUser);
console.log('debug');
var user = existingEmailUser || new User; var user = existingEmailUser || new User;
user.email = user.email || profile._json.email; user.email = user.email || profile._json.email;
user.google = profile.id; user.google = profile.id;