github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-07 20:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #198 from sharelatex/ho-mandrill

Browse source 
add mandrill as email option
This commit is contained in:
Henry Oswald 2017-12-11 11:15:40 +00:00 committed by GitHub
commit d92405c3b5
3 changed files with 366 additions and 453 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
services/web/app/coffee/Features/Email/EmailSender.coffee
View file

@ -4,6 +4,7 @@ Settings = require('settings-sharelatex')
nodemailer = require("nodemailer") nodemailer = require("nodemailer")
sesTransport = require('nodemailer-ses-transport') sesTransport = require('nodemailer-ses-transport')
sgTransport = require('nodemailer-sendgrid-transport') sgTransport = require('nodemailer-sendgrid-transport')
mandrillTransport = require('nodemailer-mandrill-transport')
rateLimiter = require('../../infrastructure/RateLimiter') rateLimiter = require('../../infrastructure/RateLimiter')
_ = require("underscore") _ = require("underscore")
@ -17,22 +18,22 @@ client =
sendMail: (options, callback = (err,status) ->) -> sendMail: (options, callback = (err,status) ->) ->
logger.log options:options, "Would send email if enabled." logger.log options:options, "Would send email if enabled."
callback() callback()
if Settings?.email?.parameters?.AWSAccessKeyID? or Settings?.email?.driver == 'ses' if Settings?.email?.parameters?.AWSAccessKeyID? or Settings?.email?.driver == 'ses'
logger.log "using aws ses for email" logger.log "using aws ses for email"
nm_client = nodemailer.createTransport(sesTransport(Settings.email.parameters)) nm_client = nodemailer.createTransport(sesTransport(Settings.email.parameters))
else if Settings?.email?.parameters?.sendgridApiKey? else if Settings?.email?.parameters?.sendgridApiKey?
logger.log "using sendgrid for email" logger.log "using sendgrid for email"
nm_client = nodemailer.createTransport(sgTransport({auth:{api_key:Settings?.email?.parameters?.sendgridApiKey}})) nm_client = nodemailer.createTransport(sgTransport({auth:{api_key:Settings?.email?.parameters?.sendgridApiKey}}))
else if Settings?.email.parameters.MandrillApiKey?
logger.log "using mandril for email"
nm_client = nodemailer.createTransport(mandrillTransport({auth:{apiKey:Settings?.email.parameters.MandrillApiKey}}))
else if Settings?.email?.parameters? else if Settings?.email?.parameters?
smtp = _.pick(Settings?.email?.parameters, "host", "port", "secure", "auth", "ignoreTLS")
logger.log "using smtp for email" logger.log "using smtp for email"
smtp = _.pick(Settings?.email?.parameters, "host", "port", "secure", "auth", "ignoreTLS")
nm_client = nodemailer.createTransport(smtp) nm_client = nodemailer.createTransport(smtp)
else else
nm_client = client
logger.warn "Email transport and/or parameters not defined. No emails will be sent." logger.warn "Email transport and/or parameters not defined. No emails will be sent."
nm_client = client
if nm_client? if nm_client?
client = nm_client client = nm_client

807
services/web/npm-shrinkwrap.json generated
View file

File diff suppressed because it is too large Load diff

1
services/web/package.json
View file

@ -56,6 +56,7 @@
"multer": "^0.1.8", "multer": "^0.1.8",
"node-html-encoder": "0.0.2", "node-html-encoder": "0.0.2",
"nodemailer": "2.1.0", "nodemailer": "2.1.0",
"nodemailer-mandrill-transport": "^1.2.0",
"nodemailer-sendgrid-transport": "^0.2.0", "nodemailer-sendgrid-transport": "^0.2.0",
"nodemailer-ses-transport": "^1.3.0", "nodemailer-ses-transport": "^1.3.0",
"optimist": "0.6.1", "optimist": "0.6.1",