Merge pull request #9008 from erictleung/fix/remove-unnecessary-authentication

Remove unused authentication methods
This commit is contained in:
Stuart Taylor
2016-06-18 00:32:31 +01:00
committed by GitHub
3 changed files with 0 additions and 70 deletions

View File

@ -4,20 +4,6 @@ module.exports = {
sessionSecret: process.env.SESSION_SECRET, sessionSecret: process.env.SESSION_SECRET,
trello: {
key: process.env.TRELLO_KEY,
secret: process.env.TRELLO_SECRET
},
blogger: {
key: process.env.BLOGGER_KEY
},
mandrill: {
user: process.env.MANDRILL_USER,
password: process.env.MANDRILL_PASSWORD
},
facebook: { facebook: {
clientID: process.env.FACEBOOK_ID, clientID: process.env.FACEBOOK_ID,
clientSecret: process.env.FACEBOOK_SECRET, clientSecret: process.env.FACEBOOK_SECRET,

View File

@ -7,16 +7,6 @@ var _ = require('lodash');
var instances = process.env.INSTANCES || 1; var instances = process.env.INSTANCES || 1;
var serverName = process.env.SERVER_NAME || 'server'; var serverName = process.env.SERVER_NAME || 'server';
var maxMemory = process.env.MAX_MEMORY || '390M'; var maxMemory = process.env.MAX_MEMORY || '390M';
var transportOptions = {
type: 'smtp',
service: 'Mandrill',
auth: {
user: process.env.MANDRILL_USER || false,
pass: process.env.MANDRILL_PASSWORD
}
};
var mailReceiver = process.env.MAIL_RECEIVER || false;
pm2.connect(function() { pm2.connect(function() {
pm2.start({ pm2.start({
@ -36,46 +26,3 @@ pm2.connect(function() {
pm2.disconnect(); pm2.disconnect();
}); });
}); });
if (transportOptions.auth.user && mailReceiver) {
console.log('setting up mailer');
var transporter = nodemailer.createTransport(transportOptions);
var compiled = _.template(
'An error has occurred on server ' +
'<% name %>\n' +
'Stack Trace:\n\n\n<%= stack %>\n\n\n' +
'Context:\n\n<%= text %>'
);
pm2.launchBus(function(err, bus) {
if (err) {
return console.error(err);
}
console.log('event bus connected');
bus.on('process:exception', function(data) {
var text;
var stack;
var name;
try {
data.date = moment(data.at || new Date())
.tz('America/Los_Angeles')
.format('MMMM Do YYYY, h:mm:ss a z');
text = JSON.stringify(data, null, 2);
stack = data.data.stack;
name = data.process.name;
} catch (e) {
return e;
}
transporter.sendMail({
to: mailReceiver,
from: 'team@freecodecamp.com',
subject: 'Server exception',
text: compiled({ name: name, text: text, stack: stack })
});
});
});
}

View File

@ -12,9 +12,6 @@ GOOGLE_SECRET=stuff
LINKEDIN_ID=stuff LINKEDIN_ID=stuff
LINKEDIN_SECRET=stuff LINKEDIN_SECRET=stuff
MANDRILL_PASSWORD=stuff
MANDRILL_USER=stuff
TWITTER_KEY=stuff TWITTER_KEY=stuff
TWITTER_SECRET=stuff TWITTER_SECRET=stuff
TWITTER_TOKEN=stuff TWITTER_TOKEN=stuff