Merge pull request #39 from fterh/no-throw-missing-alias

Don't throw an error when receiving emails on non-existent aliases
fterh · Mar 23, 2020 · a7fe3f1 · a7fe3f1
2 parents 420dad4 + 581593c
commit a7fe3f1
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 3 deletions.
diff --git a/lib/forwardInbound.ts b/lib/forwardInbound.ts
@@ -73,7 +73,8 @@ export default async (
 
   const alias = await Alias.getAlias(aliasValue);
   if (alias === undefined) {
-    throw new Error(`Alias=${aliasValue} not found in database!`);
+    console.log("Skipping forwarding received email, as alias does not exist");
+    return;
   }
   const mailOptions = await generateInboundMailOptions(alias, parsedMail);
   await sendEmail(mailOptions);

diff --git a/lib/models/__mocks__/Alias.ts b/lib/models/__mocks__/Alias.ts
@@ -3,6 +3,7 @@ import { AliasData } from "../Alias";
 export const now = new Date();
 export const didReceiveEmailSpy = jest.fn();
 export const didSendEmailSpy = jest.fn();
+export const INVALID_ALIAS = "invalidalias";
 
 export default class MockAlias implements AliasData {
   value: string;
@@ -34,6 +35,10 @@ export default class MockAlias implements AliasData {
   });
 
   static getAlias = jest.fn(async (aliasValue: string) => {
+    if (aliasValue === INVALID_ALIAS) {
+      return;
+    }
+
     return new MockAlias({
       value: aliasValue,
       description: "test description",

diff --git a/tests/lib/commands/index.test.ts b/tests/lib/commands/index.test.ts
@@ -35,7 +35,7 @@ it("should call the right command handler", async () => {
 
 it("should throw if the command is unrecognized", async () => {
   const res = handleCommand("edit", testEmailAuthenticated);
-  expect(res).rejects.toEqual(new Error(`"edit" is not a command`));
+  await expect(res).rejects.toEqual(new Error(`"edit" is not a command`));
 });
 
 it("should throw if the command is not authenticated", async () => {

diff --git a/tests/lib/commands/info.test.ts b/tests/lib/commands/info.test.ts
@@ -40,7 +40,7 @@ it("should throw if no alias has been provided", async () => {
 
   const res = info(testEmail);
 
-  expect(res).rejects.toEqual(
+  await expect(res).rejects.toEqual(
     new Error("Alias value (email subject) is undefined")
   );
 });

diff --git a/tests/lib/forwardInbound.test.ts b/tests/lib/forwardInbound.test.ts
@@ -2,6 +2,7 @@ import { email as myEmail, operationalDomain } from "../../lib/env";
 import forwardInbound, { generateFromHeader } from "../../lib/forwardInbound";
 // @ts-ignore: We're using Jest's ES6 class mocks (https://jestjs.io/docs/en/es6-class-mocks)
 import { didReceiveEmailSpy } from "../../lib/models/Alias";
+import { INVALID_ALIAS } from "../../lib/models/__mocks__/Alias";
 import sendEmail from "../../lib/sendEmail";
 import senderAddressEncodeDecode from "../../lib/senderAddressEncodeDecode";
 import assertEquivalentAttachments from "../utils/assertEquivalentAttachments";
@@ -154,3 +155,10 @@ it("should default to an empty string if there is no email subject", async () =>
   await forwardInbound(testAlias, testEmail);
   expect(_sendEmail.mock.calls[0][0].subject).toBe("");
 });
+
+it("should not throw if the alias does not exist", async () => {
+  const testEmail = await generateTestEmail(testEmailData1);
+  const res = forwardInbound(INVALID_ALIAS, testEmail);
+
+  await expect(res).resolves.toBeUndefined();
+});