Merge pull request #7733 from opengovsg/fix/ses-default

fix: ses default configset
opengovsg · Sep 27, 2024 · 422fbff · 422fbff
2 parents ec58886 + f4c78cb
commit 422fbff
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 4 deletions.
diff --git a/src/app/config/config.ts b/src/app/config/config.ts
@@ -183,6 +183,7 @@ const mailConfig: MailConfig = (function () {
     official,
     mailer,
     transporter,
+    sesConfigSet: prodOnlyVars.sesConfigSet,
   }
 })()
 

diff --git a/src/app/config/schema.ts b/src/app/config/schema.ts
@@ -452,6 +452,13 @@ export const prodOnlyVarsSchema: Schema<IProdOnlyVarsSchema> = {
     env: 'SES_PASS',
     sensitive: true,
   },
+  sesConfigSet: {
+    doc: 'Config set for SES when sending email',
+    format: String,
+    default: null,
+    env: 'SES_CONFIG_SET',
+    sensitive: true,
+  },
   dbHost: {
     doc: 'Database URI',
     format: (val) => {

diff --git a/src/app/services/mail/mail.service.ts b/src/app/services/mail/mail.service.ts
@@ -247,10 +247,21 @@ export class MailService {
     }
 
     return ResultAsync.fromPromise(
-      this.#sendMailWithRetries(mail, {
-        mailId: sendOptions?.mailId,
-        formId: sendOptions?.formId,
-      }),
+      this.#sendMailWithRetries(
+        {
+          ...mail,
+          headers: config.mail.sesConfigSet
+            ? {
+                'X-SES-CONFIGURATION-SET': config.mail.sesConfigSet,
+                ...mail.headers,
+              }
+            : mail.headers,
+        },
+        {
+          mailId: sendOptions?.mailId,
+          formId: sendOptions?.formId,
+        },
+      ),
       (error) => {
         logger.error({
           message: 'Error returned from sendMail retries',

diff --git a/src/types/config.ts b/src/types/config.ts
@@ -54,6 +54,7 @@ export type MailConfig = {
   }
   official: string
   transporter: Mail
+  sesConfigSet: string
 }
 
 export type RateLimitConfig = {
@@ -121,6 +122,7 @@ export interface IProdOnlyVarsSchema {
   user: string
   pass: string
   dbHost: string
+  sesConfigSet: string
 }
 
 export interface ICompulsoryVarsSchema {