Merge pull request #465 from sharelatex/sk-hide-email-errors

If sending email fails, return a generic error.
This commit is contained in:
James Allen 2017-03-28 13:16:43 +01:00 committed by GitHub
commit f53234271f
2 changed files with 6 additions and 3 deletions

View file

@ -72,6 +72,7 @@ module.exports =
client.sendMail options, (err, res)->
if err?
logger.err err:err, "error sending message"
err = new Error('Cannot send email')
else
logger.log "Message sent to #{options.to}"
callback(err)

View file

@ -51,17 +51,19 @@ describe "EmailSender", ->
it "should set the properties on the email to send", (done)->
@sesClient.sendMail.callsArgWith(1)
@sender.sendEmail @opts, =>
@sender.sendEmail @opts, (err) =>
expect(err).to.not.exist
args = @sesClient.sendMail.args[0][0]
args.html.should.equal @opts.html
args.to.should.equal @opts.to
args.subject.should.equal @opts.subject
done()
it "should return the error", (done)->
it "should return a non-specific error", (done)->
@sesClient.sendMail.callsArgWith(1, "error")
@sender.sendEmail {}, (err)=>
err.should.equal "error"
err.should.exist
err.toString().should.equal 'Error: Cannot send email'
done()