github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove Promise on Email.sendAsync

Browse Source
This commit is contained in:
Edimar Cardoso
2022-07-27 16:09:12 -03:00
parent 631b74ff50
commit 537cadf7b4
1 changed files with 32 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
packages/email/email.js
View File

@@ -238,51 +238,43 @@ Email.customTransport = undefined;
*/
Email.sendAsync = async function (options) {
const stream = output_stream;
return new Promise((resolve, reject) => {
if (options.mailComposer) {
options = options.mailComposer.mail;
}
if (options.mailComposer) {
options = options.mailComposer.mail;
}
let send = true;
sendHooks.forEach((hook) => {
send = hook(options);
return send;
});
if (!send) {
resolve();
return;
}
let send = true;
sendHooks.forEach((hook) => {
send = hook(options);
return send;
});
if (!send) {
return;
}
if (Email.customTransport) {
const packageSettings = Meteor.settings.packages?.email || {};
Email.customTransport({ packageSettings, ...options });
resolve();
return;
}
if (Email.customTransport) {
const packageSettings = Meteor.settings.packages?.email || {};
Email.customTransport({ packageSettings, ...options });
return;
}
const mailUrlEnv = process.env.MAIL_URL;
const mailUrlSettings = Meteor.settings.packages?.email;
const mailUrlEnv = process.env.MAIL_URL;
const mailUrlSettings = Meteor.settings.packages?.email;
if (Meteor.isProduction && !mailUrlEnv && !mailUrlSettings) {
// This check is mostly necessary when using the flag --production when running locally.
// And it works as a reminder to properly set the mail URL when running locally.
reject(
new Error(
'You have not provided a mail URL. You can provide it by using the environment variable MAIL_URL or your settings. You can read more about it here: https://docs.meteor.com/api/email.html.'
)
);
return;
}
if (Meteor.isProduction && !mailUrlEnv && !mailUrlSettings) {
// This check is mostly necessary when using the flag --production when running locally.
// And it works as a reminder to properly set the mail URL when running locally.
new Error(
'You have not provided a mail URL. You can provide it by using the environment variable MAIL_URL or your settings. You can read more about it here: https://docs.meteor.com/api/email.html.'
);
}
if (mailUrlEnv || mailUrlSettings) {
const transport = getTransport();
smtpSend(transport, options);
resolve();
return;
}
devModeSendAsync(options, stream)
.then((currentStream) => resolve(currentStream))
.catch((err) => reject(err));
if (mailUrlEnv || mailUrlSettings) {
const transport = getTransport();
smtpSend(transport, options);
return;
}
return devModeSendAsync(options, stream).catch((err) => {
throw err;
});
};