nodemailer - npm Package Compare versions

Comparing version 6.4.6 to 6.4.7

.prettierrc.js

 module.exports = {
     printWidth: 160,
     tabWidth: 4,
-    singleQuote: true
+    singleQuote: true,
+    endOfLine: 'lf',
+    trailingComma: 'none',
+    arrowParens: 'avoid'
 };

CHANGELOG.md

 # CHANGELOG
 
+## 6.4.7 2020-05-28
+
+-   Always set charset=utf-8 for Content-Type headers
+-   Catch error whn using invalid crypto.sign input
+
 ## 6.4.6 2020-03-20
@@ -4,0 +9,0 @@

lib/mail-composer/index.js

@@ -103,8 +103,3 @@ /* eslint no-undefined: 0 */
             } else if (!isMessageNode && attachment.filename !== false) {
-                data.filename =
-                    (attachment.path || attachment.href || '')
-                        .split('/')
-                        .pop()
-                        .split('?')
-                        .shift() || 'attachment-' + (i + 1);
+                data.filename = (attachment.path || attachment.href || '').split('/').pop().split('?').shift() || 'attachment-' + (i + 1);
                 if (data.filename.indexOf('.') < 0) {
@@ -211,3 +206,3 @@ data.filename += '.' + mimeFuncs.detectExtension(data.contentType);
             }
-            text.contentType = 'text/plain' + (!text.encoding && mimeFuncs.isPlainText(text.content) ? '' : '; charset=utf-8');
+            text.contentType = 'text/plain; charset=utf-8';
         }
@@ -226,3 +221,3 @@
             }
-            watchHtml.contentType = 'text/watch-html' + (!watchHtml.encoding && mimeFuncs.isPlainText(watchHtml.content) ? '' : '; charset=utf-8');
+            watchHtml.contentType = 'text/watch-html; charset=utf-8';
         }
@@ -238,3 +233,3 @@
             }
-            amp.contentType = 'text/x-amp-html' + (!amp.encoding && mimeFuncs.isPlainText(amp.content) ? '' : '; charset=utf-8');
+            amp.contentType = 'text/x-amp-html; charset=utf-8';
         }
@@ -268,8 +263,3 @@
             eventObject.filename = false;
-            eventObject.contentType =
-                'text/calendar; charset="utf-8"; method=' +
-                (eventObject.method || 'PUBLISH')
-                    .toString()
-                    .trim()
-                    .toUpperCase();
+            eventObject.contentType = 'text/calendar; charset=utf-8; method=' + (eventObject.method || 'PUBLISH').toString().trim().toUpperCase();
             if (!eventObject.headers) {
@@ -288,3 +278,3 @@ eventObject.headers = {};
             }
-            html.contentType = 'text/html' + (!html.encoding && mimeFuncs.isPlainText(html.content) ? '' : '; charset=utf-8');
+            html.contentType = 'text/html; charset=utf-8';
         }
@@ -291,0 +281,0 @@

lib/xoauth2/index.js

@@ -166,3 +166,8 @@ 'use strict';
             };
-            let token = this.jwtSignRS256(tokenData);
+            let token;
+            try {
+                token = this.jwtSignRS256(tokenData);
+            } catch (err) {
+                return callback(new Error('Can\x27t generate token. Check your auth options'));
+            }
 
@@ -359,6 +364,3 @@ urlOptions = {
         payload = ['{"alg":"RS256","typ":"JWT"}', JSON.stringify(payload)].map(val => this.toBase64URL(val)).join('.');
-        let signature = crypto
-            .createSign('RSA-SHA256')
-            .update(payload)
-            .sign(this.options.privateKey);
+        let signature = crypto.createSign('RSA-SHA256').update(payload).sign(this.options.privateKey);
         return payload + '.' + this.toBase64URL(signature);
@@ -365,0 +367,0 @@ }

package.json

 {
     "name": "nodemailer",
-    "version": "6.4.6",
+    "version": "6.4.7",
     "description": "Easy as cake e-mail sending from your Node.js applications",
@@ -27,6 +27,6 @@ "main": "lib/nodemailer.js",
         "eslint-config-nodemailer": "1.2.0",
-        "eslint-config-prettier": "6.10.0",
+        "eslint-config-prettier": "6.11.0",
         "grunt": "1.1.0",
         "grunt-cli": "1.3.2",
-        "grunt-eslint": "22.0.0",
+        "grunt-eslint": "23.0.0",
         "grunt-mocha-test": "0.13.3",
@@ -36,7 +36,7 @@ "libbase64": "1.2.1",
         "libqp": "1.1.0",
-        "mocha": "7.1.1",
+        "mocha": "7.2.0",
         "nodemailer-ntlm-auth": "1.0.1",
         "proxy": "1.0.1",
         "proxy-test-server": "1.0.0",
-        "sinon": "9.0.1",
+        "sinon": "9.0.2",
         "smtp-server": "3.6.0"
@@ -43,0 +43,0 @@ },

No alert changes

Worsened metrics

Total package byte prevSize

463852

decreased by-0.03%

Lines of code

11372

decreased by-0.04%

No dependency changes