mirror of
https://github.com/dawidd6/action-send-mail.git
synced 2025-09-07 21:34:05 +07:00
node_modules: update
This commit is contained in:
1
node_modules/nodemailer/lib/mail-composer/index.js
generated
vendored
1
node_modules/nodemailer/lib/mail-composer/index.js
generated
vendored
@ -475,6 +475,7 @@ class MailComposer {
|
||||
} else {
|
||||
node = parentNode.createChild(element.contentType, {
|
||||
filename: element.filename,
|
||||
textEncoding: this.mail.textEncoding,
|
||||
disableUrlAccess: this.mail.disableUrlAccess,
|
||||
disableFileAccess: this.mail.disableFileAccess,
|
||||
normalizeHeaderKey: this.mail.normalizeHeaderKey
|
||||
|
2
node_modules/nodemailer/lib/mime-node/index.js
generated
vendored
2
node_modules/nodemailer/lib/mime-node/index.js
generated
vendored
@ -451,7 +451,7 @@ class MimeNode {
|
||||
transferEncoding = this._getTextEncoding(this.content) === 'Q' ? 'quoted-printable' : 'base64';
|
||||
} else {
|
||||
// we can not check content for a stream, so either use preferred encoding or fallback to QP
|
||||
transferEncoding = this.transferEncoding === 'B' ? 'base64' : 'quoted-printable';
|
||||
transferEncoding = this.textEncoding === 'B' ? 'base64' : 'quoted-printable';
|
||||
}
|
||||
} else if (!/^(multipart|message)\//i.test(contentType)) {
|
||||
transferEncoding = transferEncoding || 'base64';
|
||||
|
80
node_modules/nodemailer/lib/ses-transport/index.js
generated
vendored
80
node_modules/nodemailer/lib/ses-transport/index.js
generated
vendored
@ -239,36 +239,64 @@ class SESTransport extends EventEmitter {
|
||||
sesMessage[key] = mail.data.ses[key];
|
||||
});
|
||||
|
||||
this.ses.sendRawEmail(sesMessage, (err, data) => {
|
||||
if (err) {
|
||||
this.logger.error(
|
||||
{
|
||||
err,
|
||||
tnx: 'send'
|
||||
},
|
||||
'Send error for %s: %s',
|
||||
messageId,
|
||||
err.message
|
||||
);
|
||||
statObject.pending = false;
|
||||
return callback(err);
|
||||
let ses = (this.ses.aws ? this.ses.ses : this.ses) || {};
|
||||
let aws = this.ses.aws || {};
|
||||
|
||||
let getRegion = cb => {
|
||||
if (ses.config && typeof ses.config.region === 'function') {
|
||||
// promise
|
||||
return ses.config
|
||||
.region()
|
||||
.then(region => cb(null, region))
|
||||
.catch(err => cb(err));
|
||||
}
|
||||
return cb(null, (ses.config && ses.config.region) || 'us-east-1');
|
||||
};
|
||||
|
||||
getRegion((err, region) => {
|
||||
if (err || !region) {
|
||||
region = 'us-east-1';
|
||||
}
|
||||
|
||||
let region = (this.ses.config && this.ses.config.region) || 'us-east-1';
|
||||
if (region === 'us-east-1') {
|
||||
region = 'email';
|
||||
let sendPromise;
|
||||
if (typeof ses.send === 'function' && aws.SendRawEmailCommand) {
|
||||
// v3 API
|
||||
sendPromise = ses.send(new aws.SendRawEmailCommand(sesMessage));
|
||||
} else {
|
||||
// v2 API
|
||||
sendPromise = ses.sendRawEmail(sesMessage).promise();
|
||||
}
|
||||
|
||||
statObject.pending = false;
|
||||
callback(null, {
|
||||
envelope: {
|
||||
from: envelope.from,
|
||||
to: envelope.to
|
||||
},
|
||||
messageId: '<' + data.MessageId + (!/@/.test(data.MessageId) ? '@' + region + '.amazonses.com' : '') + '>',
|
||||
response: data.MessageId,
|
||||
raw
|
||||
});
|
||||
sendPromise
|
||||
.then(data => {
|
||||
if (region === 'us-east-1') {
|
||||
region = 'email';
|
||||
}
|
||||
|
||||
statObject.pending = false;
|
||||
callback(null, {
|
||||
envelope: {
|
||||
from: envelope.from,
|
||||
to: envelope.to
|
||||
},
|
||||
messageId: '<' + data.MessageId + (!/@/.test(data.MessageId) ? '@' + region + '.amazonses.com' : '') + '>',
|
||||
response: data.MessageId,
|
||||
raw
|
||||
});
|
||||
})
|
||||
.catch(err => {
|
||||
this.logger.error(
|
||||
{
|
||||
err,
|
||||
tnx: 'send'
|
||||
},
|
||||
'Send error for %s: %s',
|
||||
messageId,
|
||||
err.message
|
||||
);
|
||||
statObject.pending = false;
|
||||
callback(err);
|
||||
});
|
||||
});
|
||||
})
|
||||
);
|
||||
|
6
node_modules/nodemailer/lib/well-known/services.json
generated
vendored
6
node_modules/nodemailer/lib/well-known/services.json
generated
vendored
@ -148,6 +148,12 @@
|
||||
"secure": false
|
||||
},
|
||||
|
||||
"OhMySMTP": {
|
||||
"host": "smtp.ohmysmtp.com",
|
||||
"port": 587,
|
||||
"secure": false
|
||||
},
|
||||
|
||||
"Postmark": {
|
||||
"aliases": ["PostmarkApp"],
|
||||
"host": "smtp.postmarkapp.com",
|
||||
|
Reference in New Issue
Block a user