feat(console): DKIM, DMARC & SPF records for custom domains

proofzero · Jun 1, 2023 · 3c5b1d4 · 3c5b1d4
1 parent 750d4db
commit 3c5b1d4
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/apps/passport/app/routes/connect/email/otp.ts b/apps/passport/app/routes/connect/email/otp.ts
@@ -70,9 +70,9 @@ export const loader: LoaderFunction = getRollupReqFunctionErrorWrapper(
         // we need to figure out DKIM
         // for custom domains
         // https://github.com/proofzero/rollupid/issues/2326
-        // if (customDomain) {
-        //   themeProps.hostname = customDomain.hostname
-        // }
+        if (customDomain) {
+          themeProps.hostname = customDomain.hostname
+        }
       }
 
       const state = await addressClient.generateEmailOTP.mutate({

diff --git a/platform/email/src/emailFunctions.ts b/platform/email/src/emailFunctions.ts
@@ -59,7 +59,7 @@ export async function send(
             name: message.recipient.name,
           },
         ],
-        dkim_domain: env.INTERNAL_DKIM_DOMAIN,
+        dkim_domain: message.customHostname ?? env.INTERNAL_DKIM_DOMAIN,
         dkim_selector: env.INTERNAL_DKIM_SELECTOR,
         dkim_private_key: env.KEY_DKIM_PRIVATEKEY,
       },
@@ -94,6 +94,7 @@ export async function send(
 
 export type NotificationSender =
   | {
+      hostname: string
       name: string
       address: string
     }
@@ -105,12 +106,14 @@ export async function sendNotification(
   customSender?: NotificationSender
 ) {
   let from: NotificationSender = {
+    hostname: env.INTERNAL_DKIM_DOMAIN,
     name: env.NotificationFromName,
     address: `${env.NotificationFromUser}@${env.INTERNAL_DKIM_DOMAIN}`,
   }
 
   if (customSender) {
     from = {
+      hostname: customSender.hostname,
       name: customSender.name,
       address: customSender.address,
     }

diff --git a/platform/email/src/jsonrpc/methods/sendOTPEmail.ts b/platform/email/src/jsonrpc/methods/sendOTPEmail.ts
@@ -79,6 +79,7 @@ export const sendEmailNotificationMethod = async ({
   let customSender: NotificationSender
   if (input.themeProps?.hostname) {
     customSender = {
+      hostname: input.themeProps.hostname,
       address: `no-reply@${input.themeProps.hostname}`,
       name: input.themeProps.appName,
     }

diff --git a/platform/email/src/types.ts b/platform/email/src/types.ts
@@ -31,6 +31,7 @@ export type EmailMessage = {
   from: EmailAddressComponents
   recipient: EmailAddressComponents
   content: EmailContent
+  customHostname?: string
 }
 
 export type EmailNotification = Omit<EmailMessage, 'from'>