Merge pull request #3007 from strongloop/backport/email-template-in-transport

Remove "options.template" from Email payload

Author: bajtos

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);

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: '[email protected]', password: 'pass'})
+          .then(function(user) {
+            return user.verify({
+              type: 'email',
+              from: '[email protected]',
+              mailer: MailerMock,
+            });
+          })
+          .then(function(result) {
+            expect(result.email).to.not.have.property('template');
+          });
+      });
     });
 
     describe('User.confirm(options, fn)', function() {