mirrors/nocobase
1
0
Fork 0
mirror of https://github.com/nocobase/nocobase synced 2024-11-15 10:17:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(plugin-workflow-mailer): fix payload in sync mode (#4765)

Browse Source 
* chore(plugin-workflow-mailer): add error log

* fix(plugin-workflow-mailer): fix payload in sync mode

* fix(plugin-workflow-mailer): add trim for subject
This commit is contained in:
Junyi 2024-06-27 16:04:17 +08:00 committed by GitHub
parent ac76fc92d8
commit 3949473ad3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
packages/plugins/@nocobase/plugin-workflow-mailer/src/server/MailerInstruction.ts
View File

@ -21,6 +21,7 @@ export default class extends Instruction {
to = [],
cc,
bcc,
subject,
html,
text,
ignoreFail,
@ -33,12 +34,31 @@ export default class extends Instruction {
const transporter = nodemailer.createTransport(provider);
const send = promisify(transporter.sendMail.bind(transporter));
if (sync) {
try {
const result = await send({
const payload = {
...options,
...(contentType === 'html' ? { html } : { text }),
});
subject: subject?.trim(),
to: to
.flat()
.map((item) => item?.trim())
.filter(Boolean),
cc: cc
? cc
.flat()
.map((item) => item?.trim())
.filter(Boolean)
: null,
bcc: bcc
? bcc
.flat()
.map((item) => item?.trim())
.filter(Boolean)
: null,
};
if (sync) {
try {
const result = await send(payload);
return {
status: JOB_STATUS.RESOLVED,
result,
@ -59,13 +79,7 @@ export default class extends Instruction {
});
// eslint-disable-next-line promise/catch-or-return
send({
...options,
...(contentType === 'html' ? { html } : { text }),
to: to.flat().filter(Boolean),
cc: cc ? cc.flat().filter(Boolean) : null,
bcc: bcc ? bcc.flat().filter(Boolean) : null,
})
send(payload)
.then((response) => {
processor.logger.info(`smtp-mailer (#${node.id}) sent successfully.`);
@ -75,6 +89,8 @@ export default class extends Instruction {
});
})
.catch((error) => {
processor.logger.warn(`smtp-mailer (#${node.id}) sent failed: ${error.message}`);
job.set({
status: JOB_STATUS.FAILED,
result: error,