Skip to content

Email for professionals and teams

update domain config check #22

Hieu Nguyen (Jack)2f706f788e40
diff --git a/src/app/(admin)/domains/DomainDnsDetails.tsx b/src/app/(admin)/domains/DomainDnsDetails.tsx
index 5eaf389..aa8f38f 100644
--- a/src/app/(admin)/domains/DomainDnsDetails.tsx
+++ b/src/app/(admin)/domains/DomainDnsDetails.tsx
@@ -9,7 +9,7 @@ export default function DomainDnsDetails({ domain, dns }: DomainDnsDetailsProps)
<CardHeader className="py-0">
<CardTitle>DNS — {domain.hostname}</CardTitle>
</CardHeader>
- <CardContent className="grid gap-6 pt-5 md:grid-cols-2">
+ <CardContent className="gap-6 pt-5">
<section className="space-y-3">
<h2 className="text-sm font-medium text-neutral-900">Email Routing</h2>
<ul className="space-y-2">
@@ -44,7 +44,7 @@ export default function DomainDnsDetails({ domain, dns }: DomainDnsDetailsProps)
</ul>
</section>
- <section className="space-y-3">
+ <section className="space-y-3 mt-8">
<h2 className="text-sm font-medium text-neutral-900">Email Sending</h2>
<ul className="space-y-2">
{dns.sending.map((record, index) => (
diff --git a/src/app/(admin)/domains/types.d.ts b/src/app/(admin)/domains/types.d.ts
index fd994a2..dc75f5a 100644
--- a/src/app/(admin)/domains/types.d.ts
+++ b/src/app/(admin)/domains/types.d.ts
@@ -26,6 +26,7 @@ export type DomainDnsView = {
status?: string;
};
sending: DnsRecord[];
+ sendingEnabled: boolean;
};
export type DomainDnsDetailsProps = {
diff --git a/src/app/api/domains/[id]/dns/route.ts b/src/app/api/domains/[id]/dns/route.ts
index 448b771..7eaa568 100644
--- a/src/app/api/domains/[id]/dns/route.ts
+++ b/src/app/api/domains/[id]/dns/route.ts
@@ -14,7 +14,10 @@ export async function GET(request: Request, { params }: Params) {
try {
const dns = await getDomainDns(env, domain);
- return NextResponse.json({ domain, dns });
+ return NextResponse.json({
+ domain: { ...domain, sendingEnabled: dns.sendingEnabled },
+ dns,
+ });
} catch (err) {
const message = err instanceof Error ? err.message : "Failed to fetch DNS";
return NextResponse.json({ error: message }, { status: 500 });
diff --git a/src/app/api/domains/route.ts b/src/app/api/domains/route.ts
index e8dba86..a622682 100644
--- a/src/app/api/domains/route.ts
+++ b/src/app/api/domains/route.ts
@@ -14,6 +14,7 @@ export async function GET(request: NextRequest) {
const includeDns = request.nextUrl.searchParams.get("includeDns") === "true";
let dns: Record<string, DnsStatusSummary> = {};
+ let domainViews = domains;
if (includeDns) {
const results = await Promise.allSettled(
domains.map(async (domain) => {
@@ -25,19 +26,26 @@ export async function GET(request: NextRequest) {
view.routing.missing,
view.sending,
domain.routingEnabled,
- domain.sendingEnabled,
+ view.sendingEnabled,
),
+ sendingEnabled: view.sendingEnabled,
};
}),
);
+ const sendingEnabledByDomain = new Map<string, boolean>();
for (const r of results) {
if (r.status === "fulfilled") {
dns[r.value.id] = r.value.summary;
+ sendingEnabledByDomain.set(r.value.id, r.value.sendingEnabled);
}
}
+ domainViews = domains.map((domain) => ({
+ ...domain,
+ sendingEnabled: sendingEnabledByDomain.get(domain.id) ?? domain.sendingEnabled,
+ }));
}
- return NextResponse.json({ domains, dns: includeDns ? dns : undefined });
+ return NextResponse.json({ domains: domainViews, dns: includeDns ? dns : undefined });
}
export async function POST(request: Request) {
diff --git a/src/lib/cloudflare-api.ts b/src/lib/cloudflare-api.ts
index c86c85f..4468d88 100644
--- a/src/lib/cloudflare-api.ts
+++ b/src/lib/cloudflare-api.ts
@@ -1,4 +1,9 @@
-import type { CfDnsRecord, CfEmailRoutingRule, CfResponse } from "@/lib/cloudflare-api.types";
+import type {
+ CfDnsRecord,
+ CfEmailRoutingRule,
+ CfResponse,
+ CfSendingSubdomain,
+} from "@/lib/cloudflare-api.types";
import {
formatCloudflareError,
getCloudflareAuth,
@@ -90,7 +95,7 @@ export async function listSendingSubdomains(
env: CloudflareEnv,
zoneId: string,
) {
- return cfRequest<{ tag: string; name: string; enabled: boolean }[]>(
+ return cfRequest<CfSendingSubdomain[]>(
env,
`/zones/${zoneId}/email/sending/subdomains`,
);
diff --git a/src/lib/cloudflare-api.types.d.ts b/src/lib/cloudflare-api.types.d.ts
index c790dc4..d3fae99 100644
--- a/src/lib/cloudflare-api.types.d.ts
+++ b/src/lib/cloudflare-api.types.d.ts
@@ -47,3 +47,9 @@ export type CfEmailRoutingRule = {
priority?: number;
tag?: string;
};
+
+export type CfSendingSubdomain = {
+ tag: string;
+ name: string;
+ enabled: boolean;
+};
diff --git a/src/lib/dns-status.ts b/src/lib/dns-status.ts
index 7316c79..8756c37 100644
--- a/src/lib/dns-status.ts
+++ b/src/lib/dns-status.ts
@@ -16,7 +16,7 @@ export function summariseDns(
routingMissing: CfDnsRecord[],
sendingRecords: CfDnsRecord[],
routingEnabled = false,
- sendingEnabled = false,
+ sendingEnabled?: boolean,
): DnsStatusSummary {
const recordTypes = (
type: "routing-records" | "routing-missing" | "sending",
@@ -36,7 +36,7 @@ export function summariseDns(
missing: recordTypes("routing-missing"),
},
sending: {
- configured: sendingRecords.length > 0 || sendingEnabled,
+ configured: sendingEnabled ?? sendingRecords.length > 0,
records: recordTypes("sending"),
},
};
diff --git a/src/lib/domains/sending-status.ts b/src/lib/domains/sending-status.ts
new file mode 100644
index 0000000..7392a94
--- /dev/null
+++ b/src/lib/domains/sending-status.ts
@@ -0,0 +1,20 @@
+import type { CfSendingSubdomain } from "@/lib/cloudflare-api.types";
+
+export function findSendingSubdomain(
+ hostname: string,
+ subdomains: CfSendingSubdomain[],
+): CfSendingSubdomain | null {
+ const normalizedHostname = hostname.toLowerCase();
+ const exact = subdomains.find(
+ (subdomain) => subdomain.name.toLowerCase() === normalizedHostname,
+ );
+ if (exact) return exact;
+
+ return subdomains.find((subdomain) => {
+ const normalizedName = subdomain.name.toLowerCase();
+ if (!normalizedName.startsWith("*.")) return false;
+
+ const baseDomain = normalizedName.slice(2);
+ return normalizedHostname !== baseDomain && normalizedHostname.endsWith(`.${baseDomain}`);
+ }) ?? null;
+}
diff --git a/src/lib/domains/service.ts b/src/lib/domains/service.ts
index 1436dd4..026ac24 100644
--- a/src/lib/domains/service.ts
+++ b/src/lib/domains/service.ts
@@ -9,14 +9,17 @@ import {
getEmailRoutingSettings,
getSendingSubdomainDns,
deleteSendingSubdomain,
+ listSendingSubdomains,
type CfDnsRecord,
} from "@/lib/cloudflare-api";
import { deleteEmailRoutingRulesForDomain } from "@/lib/domains/cloudflare-cleanup";
import { provisionDomainOnCloudflare } from "@/lib/domains/provision";
+import { findSendingSubdomain } from "@/lib/domains/sending-status";
export type DomainDnsView = {
routing: { records: CfDnsRecord[]; missing: CfDnsRecord[]; status?: string };
sending: CfDnsRecord[];
+ sendingEnabled: boolean;
};
export async function listUserDomains(env: CloudflareEnv, userId: string) {
@@ -78,11 +81,15 @@ export async function getDomainDns(
env: CloudflareEnv,
domain: typeof domains.$inferSelect,
): Promise<DomainDnsView> {
- const routingDns = await getEmailRoutingDns(env, domain.zoneId);
- const routingSettings = await getEmailRoutingSettings(env, domain.zoneId);
+ const [routingDns, routingSettings, sendingSubdomains] = await Promise.all([
+ getEmailRoutingDns(env, domain.zoneId),
+ getEmailRoutingSettings(env, domain.zoneId),
+ listSendingSubdomains(env, domain.zoneId),
+ ]);
+ const sendingSubdomain = findSendingSubdomain(domain.hostname, sendingSubdomains);
let sending: CfDnsRecord[] = [];
- if (domain.sendingSubdomainTag) {
- sending = await getSendingSubdomainDns(env, domain.zoneId, domain.sendingSubdomainTag);
+ if (sendingSubdomain?.tag) {
+ sending = await getSendingSubdomainDns(env, domain.zoneId, sendingSubdomain.tag);
}
return {
routing: {
@@ -91,6 +98,7 @@ export async function getDomainDns(
status: routingSettings.status,
},
sending,
+ sendingEnabled: sendingSubdomain?.enabled ?? false,
};
}