User: custom email headers in verify

common/models/user.js

@@ -283,9 +283,10 @@ User.prototype.verify = function(options, fn) {
       from: options.from,
       subject: options.subject || 'Thanks for Registering',
       text: options.text,
-      html: template(options)
+      html: template(options),
-    }, function(err, email) {
+      headers: options.headers || {}
-      if (err) {
+    }, function (err, email) {
+      if(err) {
         fn(err);
       } else {
         fn(null, {email: email, token: user.verificationToken, uid: user.id});

test/user.test.js

@@ -487,6 +487,38 @@ describe('User', function(){
             if(err) return done(err);
           });
       });
+
+      it('Verify a user\'s email address with custom header', function(done) {
+        User.afterRemote('create', function(ctx, user, next) {
+          assert(user, 'afterRemote should include result');
+          
+          var options = {
+            type: 'email',
+            to: user.email,
+            from: 'noreply@myapp.org',
+            redirect: '/',
+            protocol: ctx.req.protocol,
+            host: ctx.req.get('host'),
+            headers: {'message-id':'custom-header-value'}
+          };
+      
+          user.verify(options, function (err, result) {
+            assert(result.email);
+            assert.equal(result.email.messageId, 'custom-header-value');
+            done();
+          });
+        });
+            
+        request(app)
+          .post('/users')
+          .expect('Content-Type', /json/)
+          .expect(200)
+          .send({email: 'bar@bat.com', password: 'bar'})
+          .end(function(err, res){
+            if(err) return done(err);
+          });
+      });
+
     });
 
     describe('User.confirm(options, fn)', function () {