diff --git a/node_modules/nodemailer/CHANGELOG.md b/node_modules/nodemailer/CHANGELOG.md index 0cf17c5e..dd70c91f 100644 --- a/node_modules/nodemailer/CHANGELOG.md +++ b/node_modules/nodemailer/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG +## 6.4.16 2020-11-12 + +- Applied updated prettier formating rules + ## 6.4.15 2020-11-06 - Minor changes in header key casing diff --git a/node_modules/nodemailer/lib/dkim/message-parser.js b/node_modules/nodemailer/lib/dkim/message-parser.js index 124002e9..8ee93d23 100644 --- a/node_modules/nodemailer/lib/dkim/message-parser.js +++ b/node_modules/nodemailer/lib/dkim/message-parser.js @@ -146,10 +146,7 @@ class MessageParser extends Transform { return lines .filter(line => line.trim()) .map(line => ({ - key: line - .substr(0, line.indexOf(':')) - .trim() - .toLowerCase(), + key: line.substr(0, line.indexOf(':')).trim().toLowerCase(), line })); } diff --git a/node_modules/nodemailer/lib/fetch/cookies.js b/node_modules/nodemailer/lib/fetch/cookies.js index 3fbd9885..917b840a 100644 --- a/node_modules/nodemailer/lib/fetch/cookies.js +++ b/node_modules/nodemailer/lib/fetch/cookies.js @@ -110,10 +110,7 @@ class Cookies { .split(';') .forEach(cookiePart => { let valueParts = cookiePart.split('='); - let key = valueParts - .shift() - .trim() - .toLowerCase(); + let key = valueParts.shift().trim().toLowerCase(); let value = valueParts.join('=').trim(); let domain; diff --git a/node_modules/nodemailer/lib/fetch/index.js b/node_modules/nodemailer/lib/fetch/index.js index ca7874e9..62ffb370 100644 --- a/node_modules/nodemailer/lib/fetch/index.js +++ b/node_modules/nodemailer/lib/fetch/index.js @@ -10,7 +10,7 @@ const packageData = require('../../package.json'); const MAX_REDIRECTS = 5; -module.exports = function(url, options) { +module.exports = function (url, options) { return fetch(url, options); }; @@ -33,11 +33,7 @@ function fetch(url, options) { let fetchRes = options.fetchRes; let parsed = urllib.parse(url); - let method = - (options.method || '') - .toString() - .trim() - .toUpperCase() || 'GET'; + let method = (options.method || '').toString().trim().toUpperCase() || 'GET'; let finished = false; let cookies; let body; @@ -115,11 +111,7 @@ function fetch(url, options) { headers['Content-Length'] = body.length; } // if method is not provided, use POST instead of GET - method = - (options.method || '') - .toString() - .trim() - .toUpperCase() || 'POST'; + method = (options.method || '').toString().trim().toUpperCase() || 'POST'; } let req; diff --git a/node_modules/nodemailer/lib/mailer/mail-message.js b/node_modules/nodemailer/lib/mailer/mail-message.js index 787ffe73..16adb7ce 100644 --- a/node_modules/nodemailer/lib/mailer/mail-message.js +++ b/node_modules/nodemailer/lib/mailer/mail-message.js @@ -64,12 +64,7 @@ class MailMessage { if (this.data.attachments && this.data.attachments.length) { this.data.attachments.forEach((attachment, i) => { if (!attachment.filename) { - attachment.filename = - (attachment.path || attachment.href || '') - .split('/') - .pop() - .split('?') - .shift() || 'attachment-' + (i + 1); + attachment.filename = (attachment.path || attachment.href || '').split('/').pop().split('?').shift() || 'attachment-' + (i + 1); if (attachment.filename.indexOf('.') < 0) { attachment.filename += '.' + mimeFuncs.detectExtension(attachment.contentType); } diff --git a/node_modules/nodemailer/lib/mime-funcs/mime-types.js b/node_modules/nodemailer/lib/mime-funcs/mime-types.js index 85f7be69..64fa081e 100644 --- a/node_modules/nodemailer/lib/mime-funcs/mime-types.js +++ b/node_modules/nodemailer/lib/mime-funcs/mime-types.js @@ -2063,11 +2063,7 @@ module.exports = { } let parsed = path.parse(filename); - let extension = (parsed.ext.substr(1) || parsed.name || '') - .split('?') - .shift() - .trim() - .toLowerCase(); + let extension = (parsed.ext.substr(1) || parsed.name || '').split('?').shift().trim().toLowerCase(); let value = defaultMimeType; if (extensions.has(extension)) { @@ -2084,10 +2080,7 @@ module.exports = { if (!mimeType) { return defaultExtension; } - let parts = (mimeType || '') - .toLowerCase() - .trim() - .split('/'); + let parts = (mimeType || '').toLowerCase().trim().split('/'); let rootType = parts.shift().trim(); let subType = parts.join('/').trim(); diff --git a/node_modules/nodemailer/lib/nodemailer.js b/node_modules/nodemailer/lib/nodemailer.js index 85a7fa4c..8f63e42e 100644 --- a/node_modules/nodemailer/lib/nodemailer.js +++ b/node_modules/nodemailer/lib/nodemailer.js @@ -13,16 +13,11 @@ const packageData = require('../package.json'); const ETHEREAL_API = (process.env.ETHEREAL_API || 'https://api.nodemailer.com').replace(/\/+$/, ''); const ETHEREAL_WEB = (process.env.ETHEREAL_WEB || 'https://ethereal.email').replace(/\/+$/, ''); -const ETHEREAL_CACHE = ['true', 'yes', 'y', '1'].includes( - (process.env.ETHEREAL_CACHE || 'yes') - .toString() - .trim() - .toLowerCase() -); +const ETHEREAL_CACHE = ['true', 'yes', 'y', '1'].includes((process.env.ETHEREAL_CACHE || 'yes').toString().trim().toLowerCase()); let testAccount = false; -module.exports.createTransport = function(transporter, defaults) { +module.exports.createTransport = function (transporter, defaults) { let urlConfig; let options; let mailer; @@ -60,7 +55,7 @@ module.exports.createTransport = function(transporter, defaults) { return mailer; }; -module.exports.createTestAccount = function(apiUrl, callback) { +module.exports.createTestAccount = function (apiUrl, callback) { let promise; if (!callback && typeof apiUrl === 'function') { @@ -128,7 +123,7 @@ module.exports.createTestAccount = function(apiUrl, callback) { return promise; }; -module.exports.getTestMessageUrl = function(info) { +module.exports.getTestMessageUrl = function (info) { if (!info || !info.response) { return false; } diff --git a/node_modules/nodemailer/lib/sendmail-transport/index.js b/node_modules/nodemailer/lib/sendmail-transport/index.js index 0e592212..cce15e73 100644 --- a/node_modules/nodemailer/lib/sendmail-transport/index.js +++ b/node_modules/nodemailer/lib/sendmail-transport/index.js @@ -70,6 +70,14 @@ class SendmailTransport { let returned; let transform; + const hasInvalidAddresses = [] + .concat(envelope.from || []) + .concat(envelope.to || []) + .some(addr => /^-/.test(addr)); + if (hasInvalidAddresses) { + return done(new Error('Can not send mail. Invalid envelope addresses.')); + } + if (this.args) { // force -i to keep single dots args = ['-i'].concat(this.args).concat(envelope.to); diff --git a/node_modules/nodemailer/lib/shared/index.js b/node_modules/nodemailer/lib/shared/index.js index b2571c1a..cecafbaf 100644 --- a/node_modules/nodemailer/lib/shared/index.js +++ b/node_modules/nodemailer/lib/shared/index.js @@ -276,7 +276,7 @@ module.exports.getLogger = (options, defaults) => { * @param {Function} reject Function to run if callback ends with an error */ module.exports.callbackPromise = (resolve, reject) => - function() { + function () { let args = Array.from(arguments); let err = args.shift(); if (err) { @@ -357,7 +357,7 @@ module.exports.resolveContent = (data, key, callback) => { /** * Copies properties from source objects to target objects */ -module.exports.assign = function(/* target, ... sources */) { +module.exports.assign = function (/* target, ... sources */) { let args = Array.from(arguments); let target = args.shift() || {}; @@ -489,15 +489,7 @@ function createDefaultLogger(levels) { message = util.format(message, ...args); message.split(/\r?\n/).forEach(line => { - console.log( - '[%s] %s %s', - new Date() - .toISOString() - .substr(0, 19) - .replace(/T/, ' '), - levelNames.get(level), - prefix + line - ); + console.log('[%s] %s %s', new Date().toISOString().substr(0, 19).replace(/T/, ' '), levelNames.get(level), prefix + line); }); }; diff --git a/node_modules/nodemailer/lib/smtp-connection/http-proxy-client.js b/node_modules/nodemailer/lib/smtp-connection/http-proxy-client.js index efb25039..0610dc11 100644 --- a/node_modules/nodemailer/lib/smtp-connection/http-proxy-client.js +++ b/node_modules/nodemailer/lib/smtp-connection/http-proxy-client.js @@ -44,7 +44,7 @@ function httpProxyClient(proxyUrl, destinationPort, destinationHost, callback) { // Error harness for initial connection. Once connection is established, the responsibility // to handle errors is passed to whoever uses this socket let finished = false; - let tempSocketErr = function(err) { + let tempSocketErr = function (err) { if (finished) { return; } diff --git a/node_modules/nodemailer/lib/smtp-connection/index.js b/node_modules/nodemailer/lib/smtp-connection/index.js index 4db05e1d..2ad9b173 100644 --- a/node_modules/nodemailer/lib/smtp-connection/index.js +++ b/node_modules/nodemailer/lib/smtp-connection/index.js @@ -45,10 +45,7 @@ class SMTPConnection extends EventEmitter { constructor(options) { super(options); - this.id = crypto - .randomBytes(8) - .toString('base64') - .replace(/\W/g, ''); + this.id = crypto.randomBytes(8).toString('base64').replace(/\W/g, ''); this.stage = 'init'; this.options = options || {}; @@ -73,10 +70,7 @@ class SMTPConnection extends EventEmitter { this.customAuth = new Map(); Object.keys(this.options.customAuth || {}).forEach(key => { - let mapKey = (key || '') - .toString() - .trim() - .toUpperCase(); + let mapKey = (key || '').toString().trim().toUpperCase(); if (!mapKey) { return; } @@ -424,11 +418,7 @@ class SMTPConnection extends EventEmitter { this._auth = authData || {}; // Select SASL authentication method - this._authMethod = - (this._auth.method || '') - .toString() - .trim() - .toUpperCase() || false; + this._authMethod = (this._auth.method || '').toString().trim().toUpperCase() || false; if (!this._authMethod && this._auth.oauth2 && !this._auth.credentials) { this._authMethod = 'XOAUTH2'; @@ -598,7 +588,7 @@ class SMTPConnection extends EventEmitter { // ensure that callback is only called once let returned = false; - let callback = function() { + let callback = function () { if (returned) { return; } diff --git a/node_modules/nodemailer/lib/well-known/index.js b/node_modules/nodemailer/lib/well-known/index.js index ca4c537e..9fdc28fa 100644 --- a/node_modules/nodemailer/lib/well-known/index.js +++ b/node_modules/nodemailer/lib/well-known/index.js @@ -41,7 +41,7 @@ function normalizeService(service) { * @param {String} key [description] * @returns {Object} SMTP config or false if not found */ -module.exports = function(key) { +module.exports = function (key) { key = normalizeKey(key.split('@').pop()); return normalized[key] || false; }; diff --git a/node_modules/nodemailer/lib/well-known/services.json b/node_modules/nodemailer/lib/well-known/services.json index a7587283..93423676 100644 --- a/node_modules/nodemailer/lib/well-known/services.json +++ b/node_modules/nodemailer/lib/well-known/services.json @@ -22,10 +22,10 @@ "host": "smtp.dynect.net", "port": 25 }, - + "Ethereal": { "aliases": ["ethereal.email"], - "host": "smtp.ethereal.email", + "host": "smtp.ethereal.email", "port": 587 }, diff --git a/node_modules/nodemailer/lib/xoauth2/index.js b/node_modules/nodemailer/lib/xoauth2/index.js index d92c25e8..e4e2f4ed 100644 --- a/node_modules/nodemailer/lib/xoauth2/index.js +++ b/node_modules/nodemailer/lib/xoauth2/index.js @@ -263,11 +263,11 @@ class XOAuth2 extends Stream { if (data.error) { // Error Response : https://tools.ietf.org/html/rfc6749#section-5.2 let errorMessage = data.error; - if(data.error_description) { - errorMessage += ': ' + data.error_description; + if (data.error_description) { + errorMessage += ': ' + data.error_description; } - if(data.error_uri) { - errorMessage += ' (' + data.error_uri + ')'; + if (data.error_uri) { + errorMessage += ' (' + data.error_uri + ')'; } return callback(new Error(errorMessage)); } diff --git a/node_modules/nodemailer/package.json b/node_modules/nodemailer/package.json index 9c78f1da..6e0a3893 100644 --- a/node_modules/nodemailer/package.json +++ b/node_modules/nodemailer/package.json @@ -1,31 +1,27 @@ { - "_args": [ - [ - "nodemailer@6.4.15", - "/home/dawidd6/github/dawidd6/action-send-mail" - ] - ], - "_from": "nodemailer@6.4.15", - "_id": "nodemailer@6.4.15", + "_from": "nodemailer@6.4.16", + "_id": "nodemailer@6.4.16", "_inBundle": false, - "_integrity": "sha512-2/z13dBTWdgTRlxVMAK6C13dCI22GEShET4+jFLlQsxpblxYhojnucfcTZO1QBu5CsHvABsBj2JCGO3vl0HSQA==", + "_integrity": "sha512-68K0LgZ6hmZ7PVmwL78gzNdjpj5viqBdFqKrTtr9bZbJYj6BRj5W6WGkxXrEnUl3Co3CBXi3CZBUlpV/foGnOQ==", "_location": "/nodemailer", "_phantomChildren": {}, "_requested": { "type": "version", "registry": true, - "raw": "nodemailer@6.4.15", + "raw": "nodemailer@6.4.16", "name": "nodemailer", "escapedName": "nodemailer", - "rawSpec": "6.4.15", + "rawSpec": "6.4.16", "saveSpec": null, - "fetchSpec": "6.4.15" + "fetchSpec": "6.4.16" }, "_requiredBy": [ + "#USER", "/" ], - "_resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.4.15.tgz", - "_spec": "6.4.15", + "_resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.4.16.tgz", + "_shasum": "5cb6391b1d79ab7eff32d6f9f48366b5a7117293", + "_spec": "nodemailer@6.4.16", "_where": "/home/dawidd6/github/dawidd6/action-send-mail", "author": { "name": "Andris Reinman" @@ -33,7 +29,9 @@ "bugs": { "url": "https://github.com/nodemailer/nodemailer/issues" }, + "bundleDependencies": false, "dependencies": {}, + "deprecated": false, "description": "Easy as cake e-mail sending from your Node.js applications", "devDependencies": { "bunyan": "1.8.14", @@ -71,5 +69,5 @@ "scripts": { "test": "grunt" }, - "version": "6.4.15" + "version": "6.4.16" }