gib/GibSend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: handle potential undefined domain (#178)

Browse Source
This commit is contained in:
KM Koushik
2025-06-16 21:48:19 +10:00
committed by GitHub
parent 629f09100a
commit 0bc75e4474
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apps/web/src/server/service/domain-service.ts
View File

@@ -9,9 +9,17 @@ import { UnsendApiError } from "../public-api/api-error";
const dnsResolveTxt = util.promisify(dns.resolveTxt); const dnsResolveTxt = util.promisify(dns.resolveTxt);
export async function validateDomainFromEmail(email: string, teamId: number) { export async function validateDomainFromEmail(email: string, teamId: number) {
// Extract email from format like 'Name <email@domain>' this will allow entries such as "Someone @ something <some@domain.com>" to parse correctly as well. // Extract email from format like 'Name <email@domain>' this will allow entries such as "Someone @ something <some@domain.com>" to parse correctly as well.
const match = email.match(/<([^>]+)>/); const match = email.match(/<([^>]+)>/);
let fromDomain = match ? match[1].split("@")[1] : email.split("@")[1]; let fromDomain: string | undefined;
if (match && match[1]) {
const parts = match[1].split("@");
fromDomain = parts.length > 1 ? parts[1] : undefined;
} else {
const parts = email.split("@");
fromDomain = parts.length > 1 ? parts[1] : undefined;
}
if (fromDomain?.endsWith(">")) { if (fromDomain?.endsWith(">")) {
fromDomain = fromDomain.slice(0, -1); fromDomain = fromDomain.slice(0, -1);