admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve bounced email tracking.

Browse Source
This commit is contained in:
Patrick Fic
2022-11-23 14:31:25 -08:00
parent 37cef75fef
commit e8c727a393
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
server/email/sendemail.js
View File

@@ -148,7 +148,7 @@ exports.sendEmail = async (req, res) => {
to: req.body.to, to: req.body.to,
cc: req.body.cc, cc: req.body.cc,
subject: req.body.subject, subject: req.body.subject,
messageId: info.messageId, messageId: info.response,
}); });
res.json({ res.json({
success: true, //response: info success: true, //response: info
@@ -182,7 +182,7 @@ async function getImage(imageUrl) {
async function logEmail(req, email) { async function logEmail(req, email) {
try { try {
await client.request(queries.INSERT_EMAIL_AUDIT, { const insertresult = await client.request(queries.INSERT_EMAIL_AUDIT, {
email: { email: {
to: email.to, to: email.to,
cc: email.cc, cc: email.cc,
@@ -195,6 +195,7 @@ async function logEmail(req, email) {
status: "Sent", status: "Sent",
}, },
}); });
console.log(insertresult);
} catch (error) { } catch (error) {
logger.log("email-log-error", "error", req.user.email, null, { logger.log("email-log-error", "error", req.user.email, null, {
from: `${req.body.from.name} <${req.body.from.address}>`, from: `${req.body.from.name} <${req.body.from.address}>`,
@@ -214,19 +215,17 @@ exports.emailBounce = async function (req, res, next) {
body: req.body, body: req.body,
}); });
} }
if (body.notificationType === "Bounce") { const message = JSON.parse(body.Message);
// const message = JSON.parse(body.Message); if (message.notificationType === "Bounce") {
let replyTo, subject, messageId; let replyTo, subject, messageId;
body.mail.headers.forEach((header) => { message.mail.headers.forEach((header) => {
if (header.name === "Reply-To") { if (header.name === "Reply-To") {
replyTo = header.value; replyTo = header.value;
} else if (header.name === "Subject") { } else if (header.name === "Subject") {
subject = header.value; subject = header.value;
} else if (header.name === "Message-ID") {
messageId = header.value;
} }
}); });
messageId = message.mail.messageId;
if (replyTo === "noreply@imex.online") { if (replyTo === "noreply@imex.online") {
res.sendStatus(200); res.sendStatus(200);
return; return;
@@ -235,13 +234,13 @@ exports.emailBounce = async function (req, res, next) {
const result = await client.request(queries.UPDATE_EMAIL_AUDIT, { const result = await client.request(queries.UPDATE_EMAIL_AUDIT, {
sesid: messageId, sesid: messageId,
status: "Bounced", status: "Bounced",
context: body.bounce?.bouncedRecipients, context: message.bounce?.bouncedRecipients,
}); });
transporter.sendMail( transporter.sendMail(
{ {
from: `ImEX Online <noreply@imex.online>`, from: `ImEX Online <noreply@imex.online>`,
to: replyTo, to: replyTo,
bcc: "patrick@snapt.ca", //bcc: "patrick@snapt.ca",
subject: `ImEX Online Bounced Email - RE: ${subject}`, subject: `ImEX Online Bounced Email - RE: ${subject}`,
text: `ImEX Online has tried to deliver an email with the subject: ${subject} to the intended recipients but encountered an error. text: `ImEX Online has tried to deliver an email with the subject: ${subject} to the intended recipients but encountered an error.