diff --git a/common/models/user.js b/common/models/user.js index 41ad6232a..7cb72e208 100644 --- a/common/models/user.js +++ b/common/models/user.js @@ -469,6 +469,10 @@ module.exports = function(User) { function setHtmlContentAndSend(html) { options.html = html; + // Remove options.template to prevent rejection by certain + // nodemailer transport plugins. + delete options.template; + Email.send(options, function(err, email) { if (err) { fn(err); diff --git a/test/user.test.js b/test/user.test.js index f3b4b8504..cd764ff5b 100644 --- a/test/user.test.js +++ b/test/user.test.js @@ -1659,6 +1659,24 @@ describe('User', function() { done(); }); }); + + it('removes "options.template" from Email payload', function() { + var MailerMock = { + send: function(options, cb) { cb(null, options); }, + }; + + return User.create({email: 'user@example.com', password: 'pass'}) + .then(function(user) { + return user.verify({ + type: 'email', + from: 'noreply@example.com', + mailer: MailerMock, + }); + }) + .then(function(result) { + expect(result.email).to.not.have.property('template'); + }); + }); }); describe('User.confirm(options, fn)', function() {