Removed logic that caused email duplication in new architecture (#2841)

packages/types/headers.ts

@@ -1,3 +1,5 @@
 export const PlatformAccountURNHeader = 'rollup-account-urn'
 
 export const AppAPIKeyHeader = 'APP-API-KEY'
+
+export const RelayRecipientHeader = 'X-rollup-relay-recipient'

platform/emaildistributor/src/index.ts

@@ -1,5 +1,6 @@
 import type { Environment } from './types'
 import type { CloudflareEmailMessage } from '@proofzero/packages/types/email'
+import { RelayRecipientHeader } from '@proofzero/types/headers'
 
 export default {
   async email(message: CloudflareEmailMessage, env: Environment) {
@@ -31,7 +32,9 @@ export default {
       console.info(
         `Forwarding to env suffix ${addressEnvSuffix} for ${message.to}`
       )
-      await message.forward(targetEnvEmail)
+      const newHeaders = new Headers(message.headers)
+      newHeaders.append(RelayRecipientHeader, message.to)
+      await message.forward(targetEnvEmail, newHeaders)
     }
   },
 }

platform/emailinbounder/.dev.vars.example

@@ -1,5 +1,4 @@
 #This is only set in the CF environments, as a secret. Locally it can be set to anything
 #JSON object containing mapping between env specific identifier in the email address
 #and the target internal (hence, secret) email to be forwarded to for env-specific processor
-SECRET_RELAY_DISTRIBUTION_MAP="{'local':'supersecretemail@example.com'}"
-INTERNAL_RELAY_DISTRIBUTION_KEY = "local"
+SECRET_RELAY_DISTRIBUTION_MAP="{'local':'supersecretemail@example.com'}"

platform/emailinbounder/src/index.ts

@@ -1,6 +1,7 @@
 import { CloudflareEmailMessage } from '@proofzero/packages/types/email'
 import type { Environment } from './types'
 import createCoreClient from '@proofzero/platform-clients/core'
+import { RelayRecipientHeader } from '@proofzero/types/headers'
 
 import {
   generateTraceContextHeaders,
@@ -20,7 +21,15 @@ export default {
       ;({ done, value } = await reader.read())
     }
 
-    return relay(content, env)
+    const recipient = message.headers.get(RelayRecipientHeader)
+    if (!recipient) console.error('Received email without the expected headers')
+    else if (
+      !recipient.endsWith(
+        `.${env.INTERNAL_EMAIL_DISTRIBUTION_KEY}@${env.INTERNAL_RELAY_DKIM_DOMAIN}`
+      )
+    )
+      console.warn('Received email for wrong environment')
+    else return relay(recipient, content, env)
   },
 }
 
@@ -42,7 +51,7 @@ interface DKIM {
   dkim_private_key: string
 }
 
-const relay = async (message: string, env: Environment) => {
+const relay = async (recipient: string, message: string, env: Environment) => {
   const postalMime = new PostalMime()
   const email = await postalMime.parse(message)
 
@@ -52,41 +61,30 @@ const relay = async (message: string, env: Environment) => {
     dkim_private_key: env.SECRET_RELAY_DKIM_PRIVATE_KEY,
   }
 
-  const recipients = new Array<Address>()
-    .concat(email.to || [])
-    .concat(email.cc || [])
-    .filter((recipient) =>
-      recipient.address.endsWith(
-        `.${env.INTERNAL_EMAIL_DISTRIBUTION_KEY}@${env.INTERNAL_RELAY_DKIM_DOMAIN}`
-      )
-    )
-
-  for (const recipient of recipients) {
-    const coreClient = getCoreClient(env)
-    const { sourceEmail, nickname } =
-      await coreClient.account.getSourceFromMaskedAddress.query({
-        maskedEmail: recipient.address,
-      })
-    if (!sourceEmail) continue
-
-    const from: MailChannelAddress = {
-      name: `Rollup Hidden email from ${email.from.name}`,
-      email: recipient.address,
-    }
+  const coreClient = getCoreClient(env)
+  const { sourceEmail, nickname } =
+    await coreClient.account.getSourceFromMaskedAddress.query({
+      maskedEmail: recipient,
+    })
+  if (!sourceEmail) return
 
-    const replyTo: MailChannelAddress = {
-      name: email.from.name,
-      email: email.from.address,
-    }
+  const from: MailChannelAddress = {
+    name: `Rollup Hidden email from ${email.from.name}`,
+    email: recipient,
+  }
 
-    const to: MailChannelAddress[] = [
-      {
-        name: nickname,
-        email: sourceEmail,
-      },
-    ]
-    await send(email, from, to, replyTo, dkim)
+  const replyTo: MailChannelAddress = {
+    name: email.from.name,
+    email: email.from.address,
   }
+
+  const to: MailChannelAddress[] = [
+    {
+      name: nickname,
+      email: sourceEmail,
+    },
+  ]
+  await send(email, from, to, replyTo, dkim)
 }
 
 const send = async (

platform/emailinbounder/wrangler.current.toml

@@ -15,3 +15,4 @@ services = [{ binding = "Core", service = "core-current" }]
 [env.current.vars]
 INTERNAL_RELAY_DKIM_DOMAIN = "rollup.email"
 INTERNAL_RELAY_DKIM_SELECTOR = "mailchannels"
+INTERNAL_EMAIL_DISTRIBUTION_KEY = "id"

platform/emailinbounder/wrangler.dev.toml

@@ -15,3 +15,4 @@ services = [{ binding = "Core", service = "core-dev" }]
 [env.dev.vars]
 INTERNAL_RELAY_DKIM_DOMAIN = "rollup.email"
 INTERNAL_RELAY_DKIM_SELECTOR = "mailchannels"
+INTERNAL_EMAIL_DISTRIBUTION_KEY = "dev"

platform/emailinbounder/wrangler.next.toml

@@ -15,3 +15,4 @@ services = [{ binding = "Core", service = "core-next" }]
 [env.next.vars]
 INTERNAL_RELAY_DKIM_DOMAIN = "rollup.email"
 INTERNAL_RELAY_DKIM_SELECTOR = "mailchannels"
+INTERNAL_EMAIL_DISTRIBUTION_KEY = "next"

platform/emailinbounder/wrangler.toml

@@ -15,3 +15,4 @@ local_protocol = "http"
 [vars]
 INTERNAL_RELAY_DKIM_DOMAIN = "rollup.email"
 INTERNAL_RELAY_DKIM_SELECTOR = "mailchannels"
+INTERNAL_EMAIL_DISTRIBUTION_KEY = "local"