Corrects old masked email pattern

proofzero · Jan 20, 2024 · ad632e5 · ad632e5
1 parent b2d8d5f
commit ad632e5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/platform/account/src/jsonrpc/methods/getMaskedAddress.ts b/platform/account/src/jsonrpc/methods/getMaskedAddress.ts
@@ -43,6 +43,7 @@ export const getMaskedAddressMethod: GetMaskedAddressMethod = async ({
   const node = new EmailAccount(ctx.account, ctx.env)
   return node.getMaskedAddress(
     input.clientId,
-    ctx.env.INTERNAL_RELAY_DISTRIBUTION_KEY
+    ctx.env.INTERNAL_RELAY_DISTRIBUTION_KEY,
+    ctx.env.INTERNAL_RELAY_DKIM_DOMAIN
   )
 }
diff --git a/platform/account/src/nodes/email.ts b/platform/account/src/nodes/email.ts
@@ -249,14 +249,17 @@ export default class EmailAccount {
 
   async getMaskedAddress(
     clientId: string,
-    distributionKey: string
+    distributionKey: string,
+    relayDomain: string
   ): Promise<string> {
+    const relayPattern = `.${distributionKey}@${relayDomain}`
     const key = `masked-address/${clientId}`
     const stored = await this.node.storage.get<string>(key)
-    if (stored) return stored
+    //Generates new masked email if there's an existing one using old pattern
+    if (stored && stored.endsWith(relayPattern)) return stored
     const bits = generateRandomString(6)
     const words = randomWords.generate(3).join('-')
-    const address = `${words}-${bits}.${distributionKey}@rollup.email`
+    const address = `${words}-${bits}${relayPattern}`
     await this.node.storage.put<string>(key, address)
     return address
   }