From 231e1bf6668df7e10533134fcdb5a79cf175a534 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Fri, 26 Aug 2022 19:01:00 -0400 Subject: [PATCH] catch fastmail errors in notCreated response prop (#3395) --- libs/common/src/emailForwarders/fastmailForwarder.ts | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/libs/common/src/emailForwarders/fastmailForwarder.ts b/libs/common/src/emailForwarders/fastmailForwarder.ts index 545a0c700a..19b7d043cf 100644 --- a/libs/common/src/emailForwarders/fastmailForwarder.ts +++ b/libs/common/src/emailForwarders/fastmailForwarder.ts @@ -54,7 +54,15 @@ export class FastmailForwarder implements Forwarder { json.methodResponses[0].length > 0 ) { if (json.methodResponses[0][0] === "MaskedEmail/set") { - return json.methodResponses[0][1]?.created?.["new-masked-email"]?.email; + if (json.methodResponses[0][1]?.created?.["new-masked-email"] != null) { + return json.methodResponses[0][1]?.created?.["new-masked-email"]?.email; + } + if (json.methodResponses[0][1]?.notCreated?.["new-masked-email"] != null) { + throw ( + "Fastmail error: " + + json.methodResponses[0][1]?.notCreated?.["new-masked-email"]?.description + ); + } } else if (json.methodResponses[0][0] === "error") { throw "Fastmail error: " + json.methodResponses[0][1]?.description; }