Fixes resolveContent with streams overriding data

Author: Warren Choisy

lib/shared/index.js

@@ -327,7 +327,11 @@ module.exports.resolveContent = (data, key, callback) => {
                 }
                 // we can't stream twice the same content, so we need
                 // to replace the stream object with the streaming result
-                data[key] = value;
+                if (data[key].content) {
+                    data[key].content = value;
+                } else {
+                    data[key] = value;
+                }
                 callback(null, value);
             });
         } else if (/^https?:\/\//i.test(content.path || content.href)) {

test/shared/shared-test.js

@@ -200,6 +200,30 @@ describe('Shared Funcs Tests', function () {
             });
         });
 
+        it('should set content from a stream and preserve other properties', function (done) {
+            let mail = {
+                data: {
+                    attachment: {
+                        filename: 'message.html',
+                        content: fs.createReadStream(__dirname + '/fixtures/message.html')
+                    }
+                }
+            };
+            shared.resolveContent(mail.data, 'attachment', function (err, value) {
+                expect(err).to.not.exist;
+                expect(mail).to.deep.equal({
+                    data: {
+                        attachment: {
+                            filename: 'message.html',
+                            content: Buffer.from('<p>Tere, tere</p><p>vana kere!</p>\n')
+                        }
+                    }
+                });
+                expect(value).to.deep.equal(Buffer.from('<p>Tere, tere</p><p>vana kere!</p>\n'));
+                done();
+            });
+        });
+
         it('should return an error', function (done) {
             let mail = {
                 data: {