From 26f42e6e9ea2dd5a486031335fffcf84b7b8536a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavi=20Vel=C3=A0squez?= Date: Thu, 28 Nov 2024 22:28:26 +0100 Subject: [PATCH] Fix error when adding attachments (#82) --- apps/web/src/server/aws/ses.ts | 8 ++++---- apps/web/src/server/service/email-queue-service.ts | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/apps/web/src/server/aws/ses.ts b/apps/web/src/server/aws/ses.ts index 0f23678..53f9fa5 100644 --- a/apps/web/src/server/aws/ses.ts +++ b/apps/web/src/server/aws/ses.ts @@ -204,9 +204,9 @@ export async function sendEmailWithAttachments({ const boundary = "NextPart"; let rawEmail = `From: ${from}\n`; rawEmail += `To: ${Array.isArray(to) ? to.join(", ") : to}\n`; - rawEmail += `Cc: ${cc ? cc.join(", ") : ""}\n`; - rawEmail += `Bcc: ${bcc ? bcc.join(", ") : ""}\n`; - rawEmail += `Reply-To: ${replyTo}\n`; + rawEmail += cc && cc.length ? `Cc: ${cc.join(", ")}\n` : ""; + rawEmail += bcc && bcc.length ? `Bcc: ${bcc.join(", ")}\n` : ""; + rawEmail += replyTo && replyTo.length ? `Reply-To: ${replyTo.join(", ")}\n` : ""; rawEmail += `Subject: ${subject}\n`; rawEmail += `MIME-Version: 1.0\n`; rawEmail += `Content-Type: multipart/mixed; boundary="${boundary}"\n\n`; @@ -256,7 +256,7 @@ export async function addWebhookConfiguration( configName: string, topicArn: string, eventTypes: EventType[], - region: string + region: string, ) { const sesClient = getSesClient(region); diff --git a/apps/web/src/server/service/email-queue-service.ts b/apps/web/src/server/service/email-queue-service.ts index 7c0623c..dd30ccb 100644 --- a/apps/web/src/server/service/email-queue-service.ts +++ b/apps/web/src/server/service/email-queue-service.ts @@ -220,6 +220,9 @@ async function executeEmail( to: email.to, from: email.from, subject: email.subject, + replyTo: email.replyTo ?? undefined, + bcc: email.bcc, + cc: email.cc, text, html: email.html ?? undefined, region: domain?.region ?? env.AWS_DEFAULT_REGION,