From 142084af8e78816fb2b8480671d0e14b5fd11cbd Mon Sep 17 00:00:00 2001 From: Mohannad Faihan Otaibi Date: Tue, 10 Jun 2025 23:26:01 +0300 Subject: [PATCH] fix: @ symbol in the from field with friendly name (#174) Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: KM Koushik --- apps/web/src/server/service/domain-service.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/web/src/server/service/domain-service.ts b/apps/web/src/server/service/domain-service.ts index a845378..e262429 100644 --- a/apps/web/src/server/service/domain-service.ts +++ b/apps/web/src/server/service/domain-service.ts @@ -9,7 +9,10 @@ import { UnsendApiError } from "../public-api/api-error"; const dnsResolveTxt = util.promisify(dns.resolveTxt); export async function validateDomainFromEmail(email: string, teamId: number) { - let fromDomain = email.split("@")[1]; +// Extract email from format like 'Name ' this will allow entries such as "Someone @ something " to parse correctly as well. +const match = email.match(/<([^>]+)>/); +let fromDomain = match ? match[1].split("@")[1] : email.split("@")[1]; + if (fromDomain?.endsWith(">")) { fromDomain = fromDomain.slice(0, -1); }