nodemailer 6.0.0 → 6.3.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # CHANGELOG
 
+## 6.2.1 2019-05-24
+
+-   No changes. It is the same as 6.2.0 that was accidentally published as 6.2.1 to npm
+
+## 6.2.0 2019-05-24
+
+-   Added new option for addressparser: `flatten`. If true then ignores group names and returns a single list of all addresses
+
+## 6.1.1 2019-04-20
+
+-   Fixed regression bug with missing smtp `authMethod` property
+
+## 6.1.0 2019-04-06
+
+-   Added new message property `amp` for providing AMP4EMAIL content
+
 ## 6.0.0 2019-03-25
 
 -   SMTPConnection: use removeListener instead of removeAllListeners (xr0master) [ddc4af15]

package/lib/addressparser/index.js

@@ -255,7 +255,9 @@ class Tokenizer {
  * @param {String} str Address field
  * @return {Array} An array of address objects
  */
-function addressparser(str) {
+function addressparser(str, options) {
+    options = options || {};
+
     let tokenizer = new Tokenizer(str);
     let tokens = tokenizer.tokenize();
 
@@ -285,6 +287,21 @@ function addressparser(str) {
         }
     });
 
+    if (options.flatten) {
+        let addresses = [];
+        let walkAddressList = list => {
+            list.forEach(address => {
+                if (address.group) {
+                    return walkAddressList(address.group);
+                } else {
+                    addresses.push(address);
+                }
+            });
+        };
+        walkAddressList(parsedAddresses);
+        return addresses;
+    }
+
     return parsedAddresses;
 }
 

package/lib/mail-composer/index.js

@@ -128,7 +128,8 @@ class MailComposer {
                 };
             } else if (attachment.href) {
                 data.content = {
-                    href: attachment.href
+                    href: attachment.href,
+                    httpHeaders: attachment.httpHeaders
                 };
             } else {
                 data.content = attachment.content || '';
@@ -194,6 +195,7 @@ class MailComposer {
             text,
             html,
             watchHtml,
+            amp,
             icalEvent,
             eventObject;
 
@@ -222,6 +224,17 @@ class MailComposer {
             watchHtml.contentType = 'text/watch-html' + (!watchHtml.encoding && mimeFuncs.isPlainText(watchHtml.content) ? '' : '; charset=utf-8');
         }
 
+        if (this.mail.amp) {
+            if (typeof this.mail.amp === 'object' && (this.mail.amp.content || this.mail.amp.path || this.mail.amp.href || this.mail.amp.raw)) {
+                amp = this.mail.amp;
+            } else {
+                amp = {
+                    content: this.mail.amp
+                };
+            }
+            amp.contentType = 'text/x-amp-html' + (!amp.encoding && mimeFuncs.isPlainText(amp.content) ? '' : '; charset=utf-8');
+        }
+
         // only include the calendar alternative if there are no attachments
         // otherwise you might end up in a blank screen on some clients
         if (this.mail.icalEvent && !(this.mail.attachments && this.mail.attachments.length)) {
@@ -273,6 +286,7 @@ class MailComposer {
         []
             .concat(text || [])
             .concat(watchHtml || [])
+            .concat(amp || [])
             .concat(html || [])
             .concat(eventObject || [])
             .concat(this.mail.alternatives || [])

package/lib/mailer/mail-message.js

@@ -47,7 +47,7 @@ class MailMessage {
     }
 
     resolveAll(callback) {
-        let keys = [[this.data, 'html'], [this.data, 'text'], [this.data, 'watchHtml'], [this.data, 'icalEvent']];
+        let keys = [[this.data, 'html'], [this.data, 'text'], [this.data, 'watchHtml'], [this.data, 'amp'], [this.data, 'icalEvent']];
 
         if (this.data.alternatives && this.data.alternatives.length) {
             this.data.alternatives.forEach((alternative, i) => {
@@ -147,7 +147,7 @@ class MailMessage {
             data.envelope = envelope;
             data.messageId = messageId;
 
-            ['html', 'text', 'watchHtml'].forEach(key => {
+            ['html', 'text', 'watchHtml', 'amp'].forEach(key => {
                 if (data[key] && data[key].content) {
                     if (typeof data[key].content === 'string') {
                         data[key] = data[key].content;

package/lib/mime-node/index.js

@@ -971,7 +971,7 @@ class MimeNode {
                 return contentStream;
             }
             // fetch URL
-            return fetch(content.href);
+            return fetch(content.href, { headers: content.httpHeaders });
         } else {
             // pass string or buffer content as a stream
             contentStream = new PassThrough();

package/lib/smtp-pool/pool-resource.js

@@ -46,7 +46,7 @@ class PoolResource extends EventEmitter {
                             pass: this.options.auth.pass,
                             options: this.options.auth.options
                         },
-                        method: (this.options.auth.method || '').trim().toUpperCase() || false
+                        method: (this.options.auth.method || '').trim().toUpperCase() || this.options.authMethod || false
                     };
             }
         }

package/lib/smtp-transport/index.js

@@ -121,7 +121,7 @@ class SMTPTransport extends EventEmitter {
                         pass: authData.pass,
                         options: authData.options
                     },
-                    method: (authData.method || '').trim().toUpperCase() || false
+                    method: (authData.method || '').trim().toUpperCase() || this.options.authMethod || false
                 };
         }
     }

package/lib/well-known/services.json

@@ -67,10 +67,7 @@
         "aliases": ["Outlook", "Outlook.com", "Hotmail.com"],
         "domains": ["hotmail.com", "outlook.com"],
         "host": "smtp.live.com",
-        "port": 587,
-        "tls": {
-            "ciphers": "SSLv3"
-        }
+        "port": 587
     },
 
     "iCloud": {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "nodemailer",
-    "version": "6.0.0",
+    "version": "6.3.0",
     "description": "Easy as cake e-mail sending from your Node.js applications",
     "main": "lib/nodemailer.js",
     "scripts": {
@@ -23,19 +23,19 @@
         "bunyan": "1.8.12",
         "chai": "4.2.0",
         "eslint-config-nodemailer": "1.2.0",
-        "eslint-config-prettier": "4.1.0",
+        "eslint-config-prettier": "6.0.0",
         "grunt": "1.0.4",
         "grunt-cli": "1.3.2",
-        "grunt-eslint": "21.0.0",
+        "grunt-eslint": "22.0.0",
         "grunt-mocha-test": "0.13.3",
         "libbase64": "1.0.3",
-        "libmime": "4.0.1",
+        "libmime": "4.1.3",
         "libqp": "1.1.0",
-        "mocha": "5.2.0",
+        "mocha": "6.1.4",
         "nodemailer-ntlm-auth": "1.0.1",
         "proxy": "0.2.4",
         "proxy-test-server": "1.0.0",
-        "sinon": "7.3.0",
+        "sinon": "7.3.2",
         "smtp-server": "3.5.0"
     },
     "engines": {