The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Domain Connect (#3877)
Pedro Ladeirae3f608e019ce
diff --git a/apps/web/.env.example b/apps/web/.env.exampleindex 0cdb31e258..58c200660c 100644--- a/apps/web/.env.example+++ b/apps/web/.env.example@@ -196,4 +196,9 @@ E2E_PARTNER_PASSWORD=# Veriff (Identity Verification)VERIFF_API_KEY=-VERIFF_SHARED_SECRET=\ No newline at end of file+VERIFF_SHARED_SECRET=++# Domain Connect (auto-configure DNS for custom domains)+# Generate key: openssl genrsa -out private.pem 2048+# Get public key: openssl rsa -in private.pem -pubout -outform DER | base64 | tr -d '\n'+DOMAIN_CONNECT_PRIVATE_KEY=diff --git a/apps/web/app/(ee)/api/email-domains/[domain]/domain-connect/apply/route.ts b/apps/web/app/(ee)/api/email-domains/[domain]/domain-connect/apply/route.tsnew file mode 100644index 0000000000..c72ea8e4e9--- /dev/null+++ b/apps/web/app/(ee)/api/email-domains/[domain]/domain-connect/apply/route.ts@@ -0,0 +1,146 @@+import { getEmailDomainOrThrow } from "@/lib/api/domains/get-email-domain-or-throw";+import { DubApiError } from "@/lib/api/errors";+import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";+import { assertEnv } from "@/lib/assert-env";+import { withWorkspace } from "@/lib/auth";+import { isAllowedSyncUXOrigin } from "@/lib/domain-connect/allowed-origins";+import {+ DEFAULT_DC_SERVICE_EMAIL,+ DOMAIN_CONNECT_KEY_HOST,+} from "@/lib/domain-connect/constants";+import { discoverDomainConnect } from "@/lib/domain-connect/discover";+import { mapResendRecordsToEmailDomainConnectParams } from "@/lib/domain-connect/map-email-domain-records";+import { buildSignedApplyUrl } from "@/lib/domain-connect/sign-apply-url";+import { resend } from "@dub/email/resend";+import { APP_DOMAIN, getApexDomain } from "@dub/utils";+import { NextResponse } from "next/server";+import * as z from "zod/v4";++const bodySchema = z.object({+ returnTo: z.string().max(512).optional(),+});++// POST /api/email-domains/[domain]/domain-connect/apply+export const POST = withWorkspace(+ async ({ req, workspace, params }) => {+ const privateKeyPem = assertEnv("DOMAIN_CONNECT_PRIVATE_KEY")+ .trim()+ .replace(/\\n/g, "\n");++ if (!resend) {+ throw new DubApiError({+ code: "internal_server_error",+ message: "Resend is not configured.",+ });+ }++ const programId = getDefaultProgramIdOrThrow(workspace);+ const emailDomain = await getEmailDomainOrThrow({+ programId,+ domain: params.domain,+ });++ if (!emailDomain.resendDomainId) {+ throw new DubApiError({+ code: "internal_server_error",+ message: "Resend domain ID is not found for this domain.",+ });+ }++ const body = bodySchema.parse(await req.json().catch(() => ({})));++ const domainResponse = await resend.domains.get(emailDomain.resendDomainId);+ if (domainResponse.error || !domainResponse.data) {+ throw new DubApiError({+ code: "internal_server_error",+ message:+ domainResponse.error?.message ||+ "Could not retrieve DNS records for this email domain.",+ });+ }++ if (domainResponse.data.status === "verified") {+ throw new DubApiError({+ code: "bad_request",+ message: "This email domain is already verified.",+ });+ }++ const apex = getApexDomain(`https://${emailDomain.slug}`);+ const discovery = await discoverDomainConnect(apex);+ if (!discovery) {+ throw new DubApiError({+ code: "bad_request",+ message:+ "Auto configure is only available for Vercel or Cloudflare DNS zones.",+ });+ }++ if (!isAllowedSyncUXOrigin(discovery.urlSyncUX)) {+ throw new DubApiError({+ code: "bad_request",+ message: "Invalid Domain Connect provider URL.",+ });+ }++ const mapped = mapResendRecordsToEmailDomainConnectParams({+ records: domainResponse.data.records ?? [],+ emailSlug: emailDomain.slug,+ apex,+ });++ if (!mapped) {+ throw new DubApiError({+ code: "bad_request",+ message:+ "Could not build DNS auto-configure parameters from this domain's records. Try again or configure manually.",+ });+ }++ const returnPath =+ body.returnTo &&+ body.returnTo.startsWith(`/${workspace.slug}/`) &&+ !body.returnTo.includes("://")+ ? body.returnTo+ : `/${workspace.slug}/settings/domains/email`;++ const redirectUrl = new URL(returnPath, APP_DOMAIN);+ redirectUrl.searchParams.set("domain_connect", "callback");+ const redirectUri = redirectUrl.toString();++ const queryParams: Record<string, string> = {+ domain: apex,+ groupId: mapped.groupId,+ redirect_uri: redirectUri,+ mxHost: mapped.mxHost,+ mxValue: mapped.mxValue,+ spfTxtHost: mapped.spfTxtHost,+ spfTxtValue: mapped.spfTxtValue,+ dkimSelector: mapped.dkimSelector,+ dkimTxtValue: mapped.dkimTxtValue,+ };++ if (mapped.host) {+ queryParams.host = mapped.host;+ }++ if (mapped.dkim2Selector && mapped.dkim2TxtValue) {+ queryParams.dkim2Selector = mapped.dkim2Selector;+ queryParams.dkim2TxtValue = mapped.dkim2TxtValue;+ }++ const applyUrl = buildSignedApplyUrl({+ urlSyncUX: discovery.urlSyncUX,+ serviceId: DEFAULT_DC_SERVICE_EMAIL,+ privateKeyPem,+ keyHost: DOMAIN_CONNECT_KEY_HOST,+ queryParams,+ });++ return NextResponse.json({ applyUrl });+ },+ {+ requiredPlan: ["advanced", "enterprise"],+ requiredPermissions: ["domains.write"],+ },+);diff --git a/apps/web/app/(ee)/api/email-domains/[domain]/forward-instructions/route.ts b/apps/web/app/(ee)/api/email-domains/[domain]/forward-instructions/route.tsnew file mode 100644index 0000000000..8f343439b7--- /dev/null+++ b/apps/web/app/(ee)/api/email-domains/[domain]/forward-instructions/route.ts@@ -0,0 +1,98 @@+import { getEmailDomainOrThrow } from "@/lib/api/domains/get-email-domain-or-throw";+import { DubApiError } from "@/lib/api/errors";+import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";+import { withWorkspace } from "@/lib/auth";+import { mapResendRecordsToForwardRows } from "@/lib/domain-connect/map-email-domain-records";+import { assertEmailSent } from "@/lib/email/assert-email-sent";+import { assertRateLimit } from "@/lib/upstash/assert-rate-limit";+import { RATELIMIT_POLICIES } from "@/lib/upstash/ratelimit-policies";+import { sendEmail } from "@dub/email";+import { resend } from "@dub/email/resend";+import DomainDnsInstructions from "@dub/email/templates/domain-dns-instructions";+import { getApexDomain } from "@dub/utils";+import { NextResponse } from "next/server";+import * as z from "zod/v4";++const bodySchema = z.object({+ email: z.email(),+});++// POST /api/email-domains/[domain]/forward-instructions+export const POST = withWorkspace(+ async ({ req, workspace, params, session }) => {+ const programId = getDefaultProgramIdOrThrow(workspace);+ const emailDomain = await getEmailDomainOrThrow({+ programId,+ domain: params.domain,+ });++ const { email } = bodySchema.parse(await req.json());++ await assertRateLimit({+ policy: RATELIMIT_POLICIES.forwardDnsInstructions,+ identifier: [workspace.id, session.user.id],+ });++ await assertRateLimit({+ policy: RATELIMIT_POLICIES.forwardDnsInstructionsTarget,+ identifier: email.toLowerCase(),+ });++ if (!resend) {+ throw new DubApiError({+ code: "internal_server_error",+ message: "Resend is not configured.",+ });+ }++ if (!emailDomain.resendDomainId) {+ throw new DubApiError({+ code: "internal_server_error",+ message: "Resend domain ID is not found for this domain.",+ });+ }++ const domainResponse = await resend.domains.get(emailDomain.resendDomainId);+ if (domainResponse.error || !domainResponse.data) {+ throw new DubApiError({+ code: "bad_request",+ message: "Could not retrieve DNS records for this email domain.",+ });+ }++ const apex = getApexDomain(`https://${emailDomain.slug}`);+ const resendRecords = domainResponse.data.records ?? [];++ if (resendRecords.length === 0) {+ throw new DubApiError({+ code: "bad_request",+ message: "No DNS records available to forward for this domain.",+ });+ }++ const records = mapResendRecordsToForwardRows({+ records: resendRecords,+ emailSlug: emailDomain.slug,+ apex,+ });++ const result = await sendEmail({+ subject: `DNS instructions for ${emailDomain.slug}`,+ to: email,+ react: DomainDnsInstructions({+ email,+ domain: emailDomain.slug,+ records,+ senderEmail: session.user.email,+ }),+ });++ assertEmailSent(result);++ return NextResponse.json({ ok: true });+ },+ {+ requiredPlan: ["advanced", "enterprise"],+ requiredPermissions: ["domains.write"],+ },+);diff --git a/apps/web/app/(ee)/api/email-domains/[domain]/verify/route.ts b/apps/web/app/(ee)/api/email-domains/[domain]/verify/route.tsindex 84e562be40..3b12c5f88c 100644--- a/apps/web/app/(ee)/api/email-domains/[domain]/verify/route.ts+++ b/apps/web/app/(ee)/api/email-domains/[domain]/verify/route.ts@@ -1,9 +1,13 @@import { getEmailDomainOrThrow } from "@/lib/api/domains/get-email-domain-or-throw";import { DubApiError } from "@/lib/api/errors";import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";+import { assertEnv } from "@/lib/assert-env";import { withWorkspace } from "@/lib/auth";+import { discoverDomainConnect } from "@/lib/domain-connect/discover";+import type { DomainConnectDiscovery } from "@/lib/domain-connect/types";import { prisma } from "@/lib/prisma";import { resend } from "@dub/email/resend";+import { getApexDomain } from "@dub/utils";import { NextResponse } from "next/server";// GET /api/email-domains/[domain]/verify - verify an email domain@@ -26,7 +30,7 @@ export const GET = withWorkspace(if (!emailDomain.resendDomainId) {throw new DubApiError({- code: "not_found",+ code: "internal_server_error",message: "Resend domain ID is not found for this domain.",});}@@ -58,7 +62,17 @@ export const GET = withWorkspace(});}- return NextResponse.json(domainResponse.data);+ let domainConnect: DomainConnectDiscovery | null = null;+ if (domainResponse.data.status !== "verified") {+ assertEnv("DOMAIN_CONNECT_PRIVATE_KEY");+ const apex = getApexDomain(`https://${emailDomain.slug}`);+ domainConnect = await discoverDomainConnect(apex);+ }++ return NextResponse.json({+ ...domainResponse.data,+ domainConnect,+ });},{requiredPlan: ["advanced", "enterprise"],diff --git a/apps/web/app/api/domains/[domain]/domain-connect/apply/route.ts b/apps/web/app/api/domains/[domain]/domain-connect/apply/route.tsnew file mode 100644index 0000000000..02c40d598c--- /dev/null+++ b/apps/web/app/api/domains/[domain]/domain-connect/apply/route.ts@@ -0,0 +1,144 @@+import { getConfigResponse } from "@/lib/api/domains/get-config-response";+import { getDomainOrThrow } from "@/lib/api/domains/get-domain-or-throw";+import { getDomainResponse } from "@/lib/api/domains/get-domain-response";+import { DubApiError } from "@/lib/api/errors";+import { assertEnv } from "@/lib/assert-env";+import { withWorkspace } from "@/lib/auth";+import { isAllowedSyncUXOrigin } from "@/lib/domain-connect/allowed-origins";+import {+ DEFAULT_DC_SERVICE_APEX,+ DEFAULT_DC_SERVICE_SUBDOMAIN,+ DOMAIN_CONNECT_KEY_HOST,+} from "@/lib/domain-connect/constants";+import { discoverDomainConnect } from "@/lib/domain-connect/discover";+import { buildSignedApplyUrl } from "@/lib/domain-connect/sign-apply-url";+import { APP_DOMAIN, getApexDomain, getSubdomain } from "@dub/utils";+import { NextResponse } from "next/server";+import * as z from "zod/v4";++const bodySchema = z.object({+ returnTo: z.string().max(512).optional(),+});++// POST /api/domains/[domain]/domain-connect/apply+export const POST = withWorkspace(+ async ({ req, workspace, params }) => {+ const privateKeyPem = assertEnv("DOMAIN_CONNECT_PRIVATE_KEY")+ .trim()+ .replace(/\\n/g, "\n");++ const { slug: domain } = await getDomainOrThrow({+ workspace,+ domain: params.domain,+ dubDomainChecks: true,+ });++ const body = bodySchema.parse(await req.json().catch(() => ({})));++ const [domainJson, configJson] = await Promise.all([+ getDomainResponse(domain),+ getConfigResponse(domain),+ ]);++ if (domainJson?.error?.code === "not_found" || domainJson?.error) {+ throw new DubApiError({+ code: "bad_request",+ message: "Domain is not available for configuration.",+ });+ }++ if (configJson?.conflicts?.length) {+ throw new DubApiError({+ code: "bad_request",+ message: "Remove conflicting DNS records first, then retry.",+ });+ }++ if (domainJson.verified && !configJson.misconfigured) {+ throw new DubApiError({+ code: "bad_request",+ message: "This domain is already configured correctly.",+ });+ }++ const apex = getApexDomain(`https://${domain}`);+ const discovery = await discoverDomainConnect(apex);+ if (!discovery) {+ throw new DubApiError({+ code: "bad_request",+ message:+ "Auto configure is only available for Vercel or Cloudflare DNS zones.",+ });+ }++ if (!isAllowedSyncUXOrigin(discovery.urlSyncUX)) {+ throw new DubApiError({+ code: "bad_request",+ message: "Invalid Domain Connect provider URL.",+ });+ }++ const subdomain = getSubdomain(domain.toLowerCase(), apex);+ const isApex = !subdomain;+ const serviceId = isApex+ ? DEFAULT_DC_SERVICE_APEX+ : DEFAULT_DC_SERVICE_SUBDOMAIN;++ const returnPath =+ body.returnTo &&+ body.returnTo.startsWith(`/${workspace.slug}/`) &&+ !body.returnTo.includes("://")+ ? body.returnTo+ : `/${workspace.slug}/settings/domains`;++ const redirectUrl = new URL(returnPath, APP_DOMAIN);+ redirectUrl.searchParams.set("domain_connect", "callback");+ const redirectUri = redirectUrl.toString();++ const queryParams: Record<string, string> = {+ domain: apex,+ groupId: "subdomain",+ redirect_uri: redirectUri,+ };++ if (isApex) {+ queryParams.groupId = "apex";+ } else {+ queryParams.groupId = "subdomain";+ queryParams.host = (subdomain ?? "www").toLowerCase();+ }++ const txtVerification = domainJson.verification?.find(+ (x: { type: string }) => x.type === "TXT",+ );+ if (txtVerification) {+ const txtHostFqdn: string = txtVerification.domain?.toLowerCase() ?? "";+ const apexSuffix = `.${apex}`;+ const txtHost = txtHostFqdn.endsWith(apexSuffix)+ ? txtHostFqdn.slice(0, -apexSuffix.length)+ : txtHostFqdn === apex+ ? "@"+ : txtHostFqdn;+ const txtValue = txtVerification.value?.trim();++ if (txtHost && txtValue) {+ queryParams.groupId = queryParams.groupId + ",verification";+ queryParams.txtHost = txtHost;+ queryParams.txtValue = txtValue;+ }+ }++ const applyUrl = buildSignedApplyUrl({+ urlSyncUX: discovery.urlSyncUX,+ serviceId,+ privateKeyPem,+ keyHost: DOMAIN_CONNECT_KEY_HOST,+ queryParams,+ });++ return NextResponse.json({ applyUrl });+ },+ {+ requiredPermissions: ["domains.write"],+ },+);diff --git a/apps/web/app/api/domains/[domain]/forward-instructions/route.ts b/apps/web/app/api/domains/[domain]/forward-instructions/route.tsnew file mode 100644index 0000000000..23bc4acbf8--- /dev/null+++ b/apps/web/app/api/domains/[domain]/forward-instructions/route.ts@@ -0,0 +1,116 @@+import { getDomainOrThrow } from "@/lib/api/domains/get-domain-or-throw";+import { getDomainResponse } from "@/lib/api/domains/get-domain-response";+import { DubApiError } from "@/lib/api/errors";+import { withWorkspace } from "@/lib/auth";+import {+ DUB_CUSTOM_DOMAIN_A_RECORD,+ DUB_CUSTOM_DOMAIN_CNAME,+} from "@/lib/domain-connect/constants";+import { assertEmailSent } from "@/lib/email/assert-email-sent";+import { assertRateLimit } from "@/lib/upstash/assert-rate-limit";+import { RATELIMIT_POLICIES } from "@/lib/upstash/ratelimit-policies";+import { sendEmail } from "@dub/email";+import DomainDnsInstructions from "@dub/email/templates/domain-dns-instructions";+import { getApexDomain, getSubdomain } from "@dub/utils";+import { NextResponse } from "next/server";+import * as z from "zod/v4";++const bodySchema = z.object({+ email: z.email(),+ recordType: z.enum(["A", "CNAME"]),+});++type DnsRecord = {+ type: string;+ name: string;+ value: string;+};++// POST /api/domains/[domain]/forward-instructions+export const POST = withWorkspace(+ async ({ req, workspace, params, session }) => {+ const { slug: domain } = await getDomainOrThrow({+ workspace,+ domain: params.domain,+ dubDomainChecks: true,+ });++ const { email, recordType } = bodySchema.parse(await req.json());++ await assertRateLimit({+ policy: RATELIMIT_POLICIES.forwardDnsInstructions,+ identifier: [workspace.id, session.user.id],+ });++ await assertRateLimit({+ policy: RATELIMIT_POLICIES.forwardDnsInstructionsTarget,+ identifier: email.toLowerCase(),+ });++ const records: DnsRecord[] = [];++ const domainJson = await getDomainResponse(domain);++ if (domainJson?.error) {+ throw new DubApiError({+ code: "bad_request",+ message: "Could not retrieve DNS records for this domain.",+ });+ }++ const apex = getApexDomain(`https://${domain}`);+ const subdomain = getSubdomain(+ domainJson.name?.toLowerCase() ?? domain,+ domainJson.apexName?.toLowerCase() ?? apex,+ );++ if (recordType === "A") {+ records.push({+ type: "A",+ name: subdomain ?? "@",+ value: DUB_CUSTOM_DOMAIN_A_RECORD,+ });+ } else {+ records.push({+ type: "CNAME",+ name: subdomain ?? "www",+ value: DUB_CUSTOM_DOMAIN_CNAME,+ });+ }++ const txtVerification = domainJson.verification?.find(+ (x: { type: string }) => x.type === "TXT",+ );+ if (txtVerification) {+ const txtHostFqdn: string = txtVerification.domain?.toLowerCase() ?? "";+ const apexSuffix = `.${apex}`;+ const txtHost = txtHostFqdn.endsWith(apexSuffix)+ ? txtHostFqdn.slice(0, -apexSuffix.length)+ : txtHostFqdn === apex+ ? "@"+ : txtHostFqdn;+ const txtValue = txtVerification.value?.trim() ?? "";+ if ((txtHost || txtHost === "@") && txtValue) {+ records.push({ type: "TXT", name: txtHost, value: txtValue });+ }+ }++ const result = await sendEmail({+ subject: `DNS instructions for ${domain}`,+ to: email,+ react: DomainDnsInstructions({+ email,+ domain,+ records,+ senderEmail: session.user.email,+ }),+ });++ assertEmailSent(result);++ return NextResponse.json({ ok: true });+ },+ {+ requiredPermissions: ["domains.write"],+ },+);diff --git a/apps/web/app/api/domains/[domain]/verify/route.ts b/apps/web/app/api/domains/[domain]/verify/route.tsindex d48cb79bbd..88d150f8fe 100644--- a/apps/web/app/api/domains/[domain]/verify/route.ts+++ b/apps/web/app/api/domains/[domain]/verify/route.ts@@ -1,10 +1,13 @@import { getConfigResponse } from "@/lib/api/domains/get-config-response";import { getDomainOrThrow } from "@/lib/api/domains/get-domain-or-throw";import { getDomainResponse } from "@/lib/api/domains/get-domain-response";-import { verifyDomain } from "@/lib/api/domains/verify-domain";+import { verifyDomainWithRetry } from "@/lib/api/domains/verify-domain";import { withWorkspace } from "@/lib/auth";+import { discoverDomainConnectIfEligible } from "@/lib/domain-connect/discover";+import type { DomainConnectDiscovery } from "@/lib/domain-connect/types";import { prisma } from "@/lib/prisma";import { DomainVerificationStatusProps } from "@/lib/types";+import { getApexDomain } from "@dub/utils";import { NextResponse } from "next/server";export const maxDuration = 30;@@ -19,6 +22,7 @@ export const GET = withWorkspace(});let status: DomainVerificationStatusProps = "Valid Configuration";+ const apex = getApexDomain(`https://${domain}`);const [domainJson, configJson] = await Promise.all([getDomainResponse(domain),@@ -31,12 +35,14 @@ export const GET = withWorkspace(return NextResponse.json({status,response: { configJson, domainJson },+ domainConnect: null,});} else if (domainJson.error) {status = "Unknown Error";return NextResponse.json({status,response: { configJson, domainJson },+ domainConnect: null,});}@@ -48,6 +54,7 @@ export const GET = withWorkspace(return NextResponse.json({status,response: { configJson, domainJson },+ domainConnect: null,});}@@ -56,22 +63,53 @@ export const GET = withWorkspace(*/if (!domainJson.verified) {status = "Pending Verification";- const verificationJson = await verifyDomain(domain);+ const verificationJson = await verifyDomainWithRetry(domain);- if (verificationJson && verificationJson.verified) {- /**- * Domain was just verified- */- status = "Valid Configuration";+ if (verificationJson?.verified) {+ // Re-check config after Vercel ownership verification succeeds+ const freshConfig = await getConfigResponse(domain);+ if (freshConfig?.conflicts?.length) {+ status = "Conflicting DNS Records";+ } else if (freshConfig?.misconfigured) {+ status = "Invalid Configuration";+ await prisma.domain.update({+ where: { slug: domain },+ data: { verified: false, lastChecked: new Date() },+ });+ } else {+ status = "Valid Configuration";+ await prisma.domain.update({+ where: { slug: domain },+ data: { verified: true, lastChecked: new Date() },+ });+ }++ const domainConnect: DomainConnectDiscovery | null =+ await discoverDomainConnectIfEligible(apex, status);++ return NextResponse.json({+ status,+ response: {+ configJson: freshConfig,+ domainJson: { ...domainJson, verified: true },+ verificationJson,+ },+ domainConnect,+ });}+ const domainConnect: DomainConnectDiscovery | null =+ await discoverDomainConnectIfEligible(apex, status);+return NextResponse.json({status,response: { configJson, domainJson, verificationJson },+ domainConnect,});}let prismaResponse: any = null;+ let domainConnect: DomainConnectDiscovery | null = null;if (!configJson.misconfigured) {prismaResponse = await prisma.domain.update({where: {@@ -84,20 +122,19 @@ export const GET = withWorkspace(});} else {status = "Invalid Configuration";- prismaResponse = await prisma.domain.update({- where: {- slug: domain,- },- data: {- verified: false,- lastChecked: new Date(),- },- });+ [prismaResponse, domainConnect] = await Promise.all([+ prisma.domain.update({+ where: { slug: domain },+ data: { verified: false, lastChecked: new Date() },+ }),+ discoverDomainConnectIfEligible(apex, "Invalid Configuration"),+ ]);}return NextResponse.json({status,response: { configJson, domainJson, prismaResponse },+ domainConnect,});},{diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/domains/email/email-domain-card.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/domains/email/email-domain-card.tsxindex b7e162a0dc..698f95d592 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/domains/email/email-domain-card.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/domains/email/email-domain-card.tsx@@ -4,7 +4,6 @@ import { DomainCardTitleColumn } from "@/ui/domains/domain-card-title-column";import { useAddEditEmailDomainModal } from "@/ui/modals/add-edit-email-domain-modal";import { useDeleteEmailDomainModal } from "@/ui/modals/delete-email-domain-modal";import { Delete, ThreeDots } from "@/ui/shared/icons";-import { GetDomainResponseSuccess } from "@dub/email/resend/types";import {Button,Envelope,@@ -19,7 +18,7 @@ import {import { capitalize, cn, fetcher, formatDate } from "@dub/utils";import { motion } from "motion/react";import { useEffect, useRef, useState } from "react";-import useSWRImmutable from "swr/immutable";+import useSWR from "swr";import { EMAIL_DOMAIN_STATUS_TO_VARIANT } from "./constants";import { EmailDomainDnsRecords } from "./email-domain-dns-records";@@ -34,13 +33,16 @@ export function EmailDomainCard({ domain }: EmailDomainCardProps) {const domainRef = useRef<HTMLDivElement>(null);const isVisible = useInViewport(domainRef, { defaultValue: true });- const { isValidating, mutate, data } =- useSWRImmutable<GetDomainResponseSuccess>(- workspaceId &&- isVisible &&- `/api/email-domains/${domain.slug}/verify?workspaceId=${workspaceId}`,- fetcher,- );+ const { isValidating, mutate, data } = useSWR<{ status?: string }>(+ workspaceId &&+ isVisible &&+ `/api/email-domains/${domain.slug}/verify?workspaceId=${workspaceId}`,+ fetcher,+ {+ revalidateOnFocus: false,+ dedupingInterval: 5000,+ },+ );const { addEditEmailDomainModal, setIsOpen: setShowEditModal } =useAddEditEmailDomainModal({diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/domains/email/email-domain-dns-records.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/domains/email/email-domain-dns-records.tsxindex e2fb57ea26..5fd354b81b 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/domains/email/email-domain-dns-records.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/domains/email/email-domain-dns-records.tsx@@ -1,15 +1,38 @@+"use client";++import { clientAccessCheck } from "@/lib/client-access-check";+import { isAllowedSyncUXOrigin } from "@/lib/domain-connect/allowed-origins";+import type { DomainConnectDiscovery } from "@/lib/domain-connect/types";import useWorkspace from "@/lib/swr/use-workspace";import { EmailDomainProps } from "@/lib/types";+import { useForwardDnsInstructionsModal } from "@/ui/modals/forward-dns-instructions-modal";import { GetDomainResponseSuccess } from "@dub/email/resend/types";-import { CircleCheck, CopyButton, StatusBadge, Table, useTable } from "@dub/ui";-import { capitalize, fetcher } from "@dub/utils";-import useSWRImmutable from "swr/immutable";+import {+ Button,+ CircleCheck,+ Cloudflare,+ CopyButton,+ StatusBadge,+ Table,+ useTable,+ Vercel,+} from "@dub/ui";+import { EnvelopeArrowRight } from "@dub/ui/icons";+import { capitalize, cn, fetcher } from "@dub/utils";+import { usePathname } from "next/navigation";+import { useState } from "react";+import { toast } from "sonner";+import useSWR from "swr";import { EMAIL_DOMAIN_STATUS_TO_VARIANT } from "./constants";interface EmailDomainDnsRecordsProps {domain: EmailDomainProps;}+type EmailDomainVerifyResponse = GetDomainResponseSuccess & {+ domainConnect?: DomainConnectDiscovery | null;+};+interface DomainRecord {record: string;type: string;@@ -168,22 +191,85 @@ function DnsRecordsTable({);}+// Hide until Domain Connect + forward-instructions email template are ready to ship for email domains.+const ENABLE_EMAIL_DNS_ACTIONS = false;+export function EmailDomainDnsRecords({ domain }: EmailDomainDnsRecordsProps) {- const { id: workspaceId } = useWorkspace();+ const { id: workspaceId, slug: workspaceSlug, role } = useWorkspace();+ const pathname = usePathname();+ const [autoLoading, setAutoLoading] = useState(false);- const { data, isValidating } = useSWRImmutable<GetDomainResponseSuccess>(- workspaceId &&- `/api/email-domains/${domain.slug}/verify?workspaceId=${workspaceId}`,- fetcher,- {- onError: (error) => {- console.error("Failed to fetch email domain verification", error);+ const { error: permissionsError } = clientAccessCheck({+ action: "domains.write",+ role,+ });++ const { data, error, isLoading, isValidating, mutate } =+ useSWR<EmailDomainVerifyResponse>(+ workspaceId &&+ `/api/email-domains/${domain.slug}/verify?workspaceId=${workspaceId}`,+ fetcher,+ {+ revalidateOnFocus: false,+ dedupingInterval: 5000,+ onError: (err) => {+ console.error("Failed to fetch email domain verification", err);+ },},- },- );+ );+ const domainConnect = data?.domainConnect ?? null;const isVerified = data?.status === "verified";- const records = data?.records || [];+ const records = data?.records;++ const { ForwardDnsInstructionsModal, setShowForwardDnsModal } =+ useForwardDnsInstructionsModal({+ domain: domain.slug,+ workspaceId: workspaceId ?? "",+ endpoint: workspaceId+ ? `/api/email-domains/${encodeURIComponent(domain.slug)}/forward-instructions?workspaceId=${workspaceId}`+ : "",+ });++ const providerLabel =+ domainConnect?.providerKind === "cloudflare" ? "Cloudflare" : "Vercel";+ const ProviderIcon =+ domainConnect?.providerKind === "cloudflare" ? Cloudflare : Vercel;++ const handleAutoConfigure = async () => {+ if (!workspaceId) return;+ setAutoLoading(true);+ try {+ const res = await fetch(+ `/api/email-domains/${encodeURIComponent(domain.slug)}/domain-connect/apply?workspaceId=${workspaceId}`,+ {+ method: "POST",+ headers: { "Content-Type": "application/json" },+ body: JSON.stringify({+ returnTo: pathname ?? `/${workspaceSlug}/settings/domains/email`,+ }),+ },+ );+ const json = await res.json().catch(() => ({}));+ if (!res.ok) {+ toast.error(json?.error?.message ?? "Could not start auto configure.");+ return;+ }+ if (json?.applyUrl) {+ if (!isAllowedSyncUXOrigin(json.applyUrl as string)) {+ toast.error("Invalid redirect URL from server.");+ return;+ }+ window.location.assign(json.applyUrl as string);+ return;+ }+ toast.error("Could not start auto configure.");+ } catch {+ toast.error("Could not start auto configure.");+ } finally {+ setAutoLoading(false);+ }+ };const dmarcRecords = [{@@ -195,11 +281,35 @@ export function EmailDomainDnsRecords({ domain }: EmailDomainDnsRecordsProps) {},];+ if (error && !data) {+ return (+ <div className="mt-4 flex flex-col items-center gap-3 rounded-lg bg-neutral-100/80 p-4 text-center">+ <p className="text-sm text-neutral-600">+ Failed to load verification records. Please try again.+ </p>+ <Button+ type="button"+ variant="secondary"+ text="Retry"+ className="w-fit"+ loading={isValidating}+ onClick={() => mutate()}+ />+ </div>+ );+ }++ if (!data || isLoading) {+ return (+ <div className="mt-4">+ <div className="h-20 animate-pulse rounded-lg bg-neutral-200" />+ </div>+ );+ }+return (<div className="mt-4 space-y-4">- {!records && !isValidating ? (- <div className="h-20 animate-pulse rounded-lg bg-neutral-200" />- ) : isVerified ? (+ {isVerified ? (<div className="flex items-center gap-2 text-pretty rounded-lg bg-green-100/80 p-3 text-sm text-green-600"><CircleCheck className="h-5 w-5 shrink-0" /><div>@@ -211,43 +321,76 @@ export function EmailDomainDnsRecords({ domain }: EmailDomainDnsRecordsProps) {<div className="flex flex-col gap-8"><div className="flex flex-col gap-4 rounded-lg border border-neutral-200 bg-neutral-100 p-4"><div className="flex flex-col gap-6">- {records.length > 0 && (- <DnsRecordsTable- title="DKIM and SPF (Required)"- description={- <p className="text-sm text-neutral-700">- To authorize Dub to send emails from{" "}- <strong>{domain.slug}</strong> to your partners, verify- that the DNS records listed below are properly configured- in your domain's DNS settings.- </p>- }- records={records}- showPriority- showStatus- />- )}- </div>- </div>-- <div className="flex flex-col rounded-lg border border-neutral-200 bg-neutral-100 p-4">- {dmarcRecords.length > 0 && (<DnsRecordsTable- title="DMARC (Recommended)"+ title="DKIM and SPF (Required)"description={<p className="text-sm text-neutral-700">- Add DMARC record to build trust in your domain and protect- against email spoofing.+ To authorize Dub to send emails from{" "}+ <strong>{domain.slug}</strong> to your partners, verify that+ the DNS records listed below are properly configured in your+ domain's DNS settings.</p>}- records={dmarcRecords}+ records={records}+ showPriority+ showStatus/>- )}+ </div>+ </div>++ <div className="flex flex-col rounded-lg border border-neutral-200 bg-neutral-100 p-4">+ <DnsRecordsTable+ title="DMARC (Recommended)"+ description={+ <p className="text-sm text-neutral-700">+ Add DMARC record to build trust in your domain and protect+ against email spoofing.+ </p>+ }+ records={dmarcRecords}+ /></div>++ {ENABLE_EMAIL_DNS_ACTIONS && (domainConnect || workspaceId) && (+ <div className="flex flex-wrap gap-2">+ {domainConnect && workspaceId && (+ <Button+ type="button"+ variant="secondary"+ text={`Auto configure with ${providerLabel}`}+ icon={+ <ProviderIcon+ className={cn(+ "size-4 shrink-0",+ domainConnect.providerKind === "cloudflare"+ ? "text-[#F6821F]"+ : "text-black",+ )}+ />+ }+ className="w-fit"+ onClick={handleAutoConfigure}+ loading={autoLoading}+ />+ )}+ {workspaceId && (+ <Button+ type="button"+ variant="secondary"+ text="Forward instructions"+ icon={<EnvelopeArrowRight className="size-4 shrink-0" />}+ className="w-fit"+ onClick={() => setShowForwardDnsModal(true)}+ disabledTooltip={permissionsError || undefined}+ />+ )}+ </div>+ )}+ {ENABLE_EMAIL_DNS_ACTIONS && <ForwardDnsInstructionsModal />}</div>) : (<div className="rounded-lg bg-neutral-100/80 p-4 text-center text-sm text-neutral-600">- Loading verification records...+ No verification records available for this domain yet.</div>)}</div>diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/domains/email/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/domains/email/page-client.tsxindex fdbc1ca904..99ecefe761 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/domains/email/page-client.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/domains/email/page-client.tsx@@ -6,14 +6,24 @@ import useWorkspace from "@/lib/swr/use-workspace";import { EmailDomainProps } from "@/lib/types";import { useAddEditEmailDomainModal } from "@/ui/modals/add-edit-email-domain-modal";import { AnimatedEmptyState } from "@/ui/shared/animated-empty-state";-import { ArrowTurnRight2, Button, buttonVariants } from "@dub/ui";+import {+ ArrowTurnRight2,+ Button,+ buttonVariants,+ useRouterStuff,+} from "@dub/ui";import { cn } from "@dub/utils";import { EmailDomainCard } from "app/app.dub.co/(dashboard)/[slug]/(ee)/settings/domains/email/email-domain-card";import { Mail } from "lucide-react";import Link from "next/link";+import { useEffect } from "react";+import { toast } from "sonner";+import { useSWRConfig } from "swr";export function EmailDomains() {const { slug, plan } = useWorkspace();+ const { searchParams, queryParams } = useRouterStuff();+ const { mutate } = useSWRConfig();const {emailDomains,@@ -23,6 +33,43 @@ export function EmailDomains() {const { canSendEmailCampaigns } = getPlanCapabilities(plan);+ useEffect(() => {+ if (searchParams.get("domain_connect") !== "callback") return;+ const error = searchParams.get("error");+ const errorDesc = searchParams.get("error_description");+ if (error) {+ toast.error(+ errorDesc === "user_cancel"+ ? "DNS setup was cancelled."+ : "Your DNS provider returned an error. Try again or configure manually.",+ );+ } else {+ toast.success(+ "DNS changes submitted. Checking email domain verification…",+ );+ const revalidateEmailDomains = () => {+ void mutate(+ (key) =>+ typeof key === "string" &&+ key.includes("/api/email-domains/") &&+ key.includes("/verify"),+ );+ void mutate(+ (key) =>+ typeof key === "string" && key.startsWith("/api/email-domains"),+ );+ };+ revalidateEmailDomains();+ window.setTimeout(revalidateEmailDomains, 4000);+ window.setTimeout(revalidateEmailDomains, 10000);+ }+ queryParams({+ del: ["domain_connect", "error", "error_description", "state"],+ replace: true,+ scroll: false,+ });+ }, [searchParams, queryParams, mutate]);+if (!canSendEmailCampaigns) {return (<div className="grid gap-5">diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/domains/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/domains/page-client.tsxindex c163889eea..2d41f187ac 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/domains/page-client.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/domains/page-client.tsx@@ -30,6 +30,8 @@ import {import { capitalize, pluralize } from "@dub/utils";import { ChevronDown, Crown } from "lucide-react";import { useEffect, useState } from "react";+import { toast } from "sonner";+import { useSWRConfig } from "swr";export function CustomDomains() {const {@@ -44,6 +46,7 @@ export function CustomDomains() {const [openPopover, setOpenPopover] = useState(false);const { searchParams, queryParams } = useRouterStuff();+ const { mutate } = useSWRConfig();const { allWorkspaceDomains, loading } = useDomains({opts: { includeLink: "true" },});@@ -72,6 +75,41 @@ export function CustomDomains() {[searchParams],);+ useEffect(() => {+ if (searchParams.get("domain_connect") !== "callback") return;+ const error = searchParams.get("error");+ const errorDesc = searchParams.get("error_description");+ if (error) {+ toast.error(+ errorDesc === "user_cancel"+ ? "DNS setup was cancelled."+ : "Your DNS provider returned an error. Try again or configure manually.",+ );+ } else {+ toast.success("DNS changes submitted. Checking domain verification…");+ const revalidateDomains = () => {+ void mutate(+ (key) =>+ typeof key === "string" &&+ key.includes("/api/domains/") &&+ key.includes("/verify"),+ );+ void mutate(+ (key) => typeof key === "string" && key.startsWith("/api/domains"),+ );+ };+ // Immediate check, then again after DNS has a moment to propagate to Vercel+ revalidateDomains();+ window.setTimeout(revalidateDomains, 4000);+ window.setTimeout(revalidateDomains, 10000);+ }+ queryParams({+ del: ["domain_connect", "error", "error_description", "state"],+ replace: true,+ scroll: false,+ });+ }, [searchParams, queryParams, mutate]);+const { error: permissionsError } = clientAccessCheck({action: "domains.write",role,diff --git a/apps/web/lib/api/domains/get-config-response.ts b/apps/web/lib/api/domains/get-config-response.tsindex 43979b89d3..8afead1d76 100644--- a/apps/web/lib/api/domains/get-config-response.ts+++ b/apps/web/lib/api/domains/get-config-response.ts@@ -25,7 +25,7 @@ export const getConfigResponse = async (domain: string) => {if (apexDomain !== domain) {const wildcardDomain = `*.${apexDomain}`;const wildcardResponse = await getVercelConfigResponse(wildcardDomain);- if (!wildcardResponse.misconfigured) {+ if (!wildcardResponse?.error && wildcardResponse?.misconfigured === false) {return wildcardResponse;}}diff --git a/apps/web/lib/api/domains/verify-domain.ts b/apps/web/lib/api/domains/verify-domain.tsindex c93e42d6ae..d546f322d7 100644--- a/apps/web/lib/api/domains/verify-domain.ts+++ b/apps/web/lib/api/domains/verify-domain.ts@@ -1,5 +1,5 @@export const verifyDomain = async (domain: string) => {- return await fetch(+ const res = await fetch(`https://api.vercel.com/v9/projects/${process.env.VERCEL_PROJECT_ID}/domains/${domain.toLowerCase()}/verify?teamId=${process.env.TEAM_ID_VERCEL}`,{method: "POST",@@ -8,5 +8,33 @@ export const verifyDomain = async (domain: string) => {"Content-Type": "application/json",},},- ).then((res) => res.json());+ );+ return res.json();+};++export const verifyDomainWithRetry = async (+ domain: string,+ {+ attempts = 3,+ delayMs = 2500,+ }: { attempts?: number; delayMs?: number } = {},+) => {+ let last: any = null;+ for (let i = 0; i < attempts; i++) {+ if (i > 0) {+ await new Promise((resolve) => setTimeout(resolve, delayMs));+ }+ try {+ last = await verifyDomain(domain);+ } catch (error) {+ if (i === attempts - 1) {+ throw error;+ }+ continue;+ }+ if (last?.verified) {+ return last;+ }+ }+ return last;};diff --git a/apps/web/lib/domain-connect/allowed-origins.ts b/apps/web/lib/domain-connect/allowed-origins.tsnew file mode 100644index 0000000000..6cf103ff1d--- /dev/null+++ b/apps/web/lib/domain-connect/allowed-origins.ts@@ -0,0 +1,16 @@+/** Allowed origins for Domain Connect SyncUX / signed apply redirects. */+export const ALLOWED_SYNC_UX_ORIGINS = [+ "https://vercel.com",+ "https://dash.cloudflare.com",+] as const;++/** True when `url` (SyncUX or apply URL) has an allowlisted origin. */+export function isAllowedSyncUXOrigin(url: string): boolean {+ try {+ return (ALLOWED_SYNC_UX_ORIGINS as readonly string[]).includes(+ new URL(url).origin,+ );+ } catch {+ return false;+ }+}diff --git a/apps/web/lib/domain-connect/constants.ts b/apps/web/lib/domain-connect/constants.tsnew file mode 100644index 0000000000..26921b7d94--- /dev/null+++ b/apps/web/lib/domain-connect/constants.ts@@ -0,0 +1,7 @@+export const DUB_CUSTOM_DOMAIN_A_RECORD = "76.76.21.21";+export const DUB_CUSTOM_DOMAIN_CNAME = "cname.dub.co";+export const DOMAIN_CONNECT_PROVIDER_ID = "dub.co";+export const DOMAIN_CONNECT_KEY_HOST = "_dck1";+export const DEFAULT_DC_SERVICE_APEX = "links-apex";+export const DEFAULT_DC_SERVICE_SUBDOMAIN = "links-subdomain";+export const DEFAULT_DC_SERVICE_EMAIL = "email";diff --git a/apps/web/lib/domain-connect/discover.ts b/apps/web/lib/domain-connect/discover.tsnew file mode 100644index 0000000000..dee52ca797--- /dev/null+++ b/apps/web/lib/domain-connect/discover.ts@@ -0,0 +1,141 @@+import dns from "node:dns/promises";+import { isAllowedSyncUXOrigin } from "./allowed-origins";+import type {+ DomainConnectDiscovery,+ DomainConnectProviderKind,+} from "./types";++type DomainConnectSettings = {+ providerId?: string;+ urlSyncUX?: string;+};++function providerKindFromId(+ id: string | undefined,+): DomainConnectProviderKind | null {+ if (!id) return null;+ const lower = id.toLowerCase();+ if (lower === "vercel.com") return "vercel";+ if (lower === "cloudflare.com" || lower.includes("cloudflare"))+ return "cloudflare";+ return null;+}++const ALLOWED_SETTINGS_HOST_SUFFIXES = [+ "domainconnect.org",+ ".vercel.com",+ ".cloudflare.com",+];++function settingsBaseFromTxtRecords(records: string[][]): string | null {+ const candidates = records+ .map((chunks) =>+ chunks+ .join("")+ .replace(/^"(.*)"$/, "$1")+ .trim(),+ )+ .map((s) =>+ s+ .replace(/^https?:\/\//i, "")+ .replace(/\/$/, "")+ .toLowerCase(),+ )+ .filter((s) => {+ if (!s.includes(".")) return false;+ const [host, ...pathParts] = s.split("/");+ if (+ !host ||+ !/^[a-z0-9.-]+$/.test(host) ||+ /^\d+\.\d+\.\d+\.\d+$/.test(host)+ ) {+ return false;+ }+ // Allow only simple path segments (no query/fragment)+ if (+ pathParts.some(+ (p) => !p || !/^[a-z0-9._-]+$/i.test(p) || p === "." || p === "..",+ )+ ) {+ return false;+ }+ return ALLOWED_SETTINGS_HOST_SUFFIXES.some((suffix) => {+ const hostnameSuffix = suffix.replace(/^\./, "");+ return host === hostnameSuffix || host.endsWith(`.${hostnameSuffix}`);+ });+ });++ return candidates[0] ?? null;+}++/**+ * Discover Domain Connect provider for the given apex domain.+ * Returns null when the provider is not Vercel or Cloudflare, or on any error.+ */+export async function discoverDomainConnect(+ apexDomain: string,+): Promise<DomainConnectDiscovery | null> {+ let txtRecords: string[][];+ try {+ txtRecords = await dns.resolveTxt(+ `_domainconnect.${apexDomain.toLowerCase()}`,+ );+ } catch {+ return null;+ }++ const settingsBase = settingsBaseFromTxtRecords(txtRecords);+ if (!settingsBase) return null;++ const settingsUrl = `https://${settingsBase}/v2/${encodeURIComponent(apexDomain.toLowerCase())}/settings`;+ let res: Response;+ try {+ res = await fetch(settingsUrl, {+ headers: { accept: "application/json" },+ redirect: "manual",+ signal: AbortSignal.timeout(3000),+ });+ } catch {+ return null;+ }++ if (!res.ok) return null;++ let json: DomainConnectSettings;+ try {+ json = (await res.json()) as DomainConnectSettings;+ } catch {+ return null;+ }++ const urlSyncUX = json.urlSyncUX?.trim().replace(/\/$/, "");+ const dnsProviderId = json.providerId ?? "";+ if (!urlSyncUX || !dnsProviderId) return null;++ let parsedSyncUX: URL;+ try {+ parsedSyncUX = new URL(urlSyncUX);+ } catch {+ return null;+ }+ if (parsedSyncUX.protocol !== "https:") return null;+ if (!isAllowedSyncUXOrigin(urlSyncUX)) return null;++ const providerKind = providerKindFromId(dnsProviderId);+ if (!providerKind) return null;++ return { providerKind, dnsProviderId, urlSyncUX };+}++/**+ * Only discover when the feature is enabled and the status warrants it.+ */+export async function discoverDomainConnectIfEligible(+ apexDomain: string,+ status: string,+): Promise<DomainConnectDiscovery | null> {+ if (!process.env.DOMAIN_CONNECT_PRIVATE_KEY?.trim()) return null;+ if (status !== "Pending Verification" && status !== "Invalid Configuration")+ return null;+ return discoverDomainConnect(apexDomain);+}diff --git a/apps/web/lib/domain-connect/map-email-domain-records.ts b/apps/web/lib/domain-connect/map-email-domain-records.tsnew file mode 100644index 0000000000..7e8c3b49fa--- /dev/null+++ b/apps/web/lib/domain-connect/map-email-domain-records.ts@@ -0,0 +1,255 @@+/**+ * Map Resend email-domain DNS records to Domain Connect apply query params+ * for serviceId `email` (dub.co.email.json v2).+ *+ * Subdomain email domains (e.g. partners.acme.com) use the Domain Connect+ * `host` query parameter — record hosts stay relative to that email domain+ * (`send`, `resend._domainkey`, `_dmarc`), never zone-appended+ * (`send.partners`, `_dmarc.partners`).+ */++type ResendDnsRecord = {+ record?: string;+ type?: string;+ name?: string;+ value?: string;+ priority?: number | null;+};++type EmailDomainConnectParams = {+ groupId: string;+ /** Domain Connect `host` — email subdomain relative to the zone apex, if any. */+ host?: string;+ mxHost: string;+ mxValue: string;+ spfTxtHost: string;+ spfTxtValue: string;+ dkimSelector: string;+ dkimTxtValue: string;+ dkim2Selector?: string;+ dkim2TxtValue?: string;+};++/** Strip full SPF TXT into SPFM merge mechanisms (no v=spf1 / trailing all). */+function toSpfRules(raw: string): string {+ return raw+ .trim()+ .replace(/^"+|"+$/g, "")+ .replace(/^v=spf1\s+/i, "")+ .replace(/\s+[~\-+?]?all\s*$/i, "")+ .trim();+}++/** Ensure DKIM TXT starts with v=DKIM1 for template conflict matching. */+function normalizeDkimValue(raw: string): string {+ const value = raw.trim().replace(/^"+|"+$/g, "");+ if (!value) return value;+ if (/^v=DKIM1/i.test(value)) return value;+ if (/^p=/i.test(value)) return `v=DKIM1; k=rsa; ${value}`;+ return `v=DKIM1; ${value}`;+}++/**+ * Relativize a Resend record name onto the email domain slug+ * (Domain Connect host scope), not the zone apex.+ *+ * e.g. slug `partners.acme.com`, name `send` → `send`+ * slug `partners.acme.com`, name `send.partners.acme.com` → `send`+ * slug `acme.com`, name `@` → `@`+ */+function relativeToEmailSlug({+ resendName,+ emailSlug,+}: {+ resendName: string;+ emailSlug: string;+}): string {+ const name = (resendName || "").trim().toLowerCase();+ const slug = emailSlug.toLowerCase();++ if (name === "" || name === "@" || name === slug) return "@";++ const slugSuffix = `.${slug}`;+ if (name.endsWith(slugSuffix)) {+ const relative = name.slice(0, -slugSuffix.length);+ return relative || "@";+ }++ return name;+}++/**+ * Relativize a Resend record name onto the zone apex (for forward-instructions+ * emails that list zone-absolute labels an admin pastes into DNS).+ *+ * e.g. slug `partners.acme.com`, apex `acme.com`, name `send`+ * → host `send.partners`+ */+function toZoneHost({+ resendName,+ emailSlug,+ apex,+}: {+ resendName: string;+ emailSlug: string;+ apex: string;+}): string {+ const name = (resendName || "").trim().toLowerCase();+ const slug = emailSlug.toLowerCase();+ const apexLower = apex.toLowerCase();++ const fqdn =+ name === "" || name === "@"+ ? slug+ : name === slug || name.endsWith(`.${slug}`)+ ? name+ : `${name}.${slug}`.replace(/\.+/g, ".");++ const apexSuffix = `.${apexLower}`;+ if (fqdn === apexLower) return "@";+ if (fqdn.endsWith(apexSuffix)) return fqdn.slice(0, -apexSuffix.length);+ return name || "@";+}++function extractDkimSelector(relativeHost: string): string | null {+ const host = relativeHost.trim().toLowerCase();+ if (!host || host === "@") return null;+ const match = host.match(/^([^.]+)\._domainkey$/i);+ if (match?.[1]) return match[1];+ // Resend sometimes returns only the selector label+ if (!host.includes(".")) return host;+ return null;+}++/**+ * Build Domain Connect query params from Resend domain records.+ * Returns null when required MX, SPF TXT, or primary DKIM are missing.+ */+export function mapResendRecordsToEmailDomainConnectParams({+ records,+ emailSlug,+ apex,+}: {+ records: ResendDnsRecord[];+ emailSlug: string;+ apex: string;+}): EmailDomainConnectParams | null {+ const mx = records.find(+ (r) => r.type === "MX" && r.record !== "Receiving" && r.name && r.value,+ );+ const spfTxt = records.find(+ (r) => r.record === "SPF" && r.type === "TXT" && r.name && r.value,+ );+ const dkims = records.filter(+ (r) => r.record === "DKIM" && r.type === "TXT" && r.name && r.value,+ );++ if (!mx?.name || !mx.value || !spfTxt?.name || !spfTxt.value || !dkims[0]) {+ return null;+ }++ const mxHost = relativeToEmailSlug({+ resendName: mx.name,+ emailSlug,+ });+ const spfTxtHost = relativeToEmailSlug({+ resendName: spfTxt.name,+ emailSlug,+ });+ const spfTxtValue = toSpfRules(spfTxt.value);+ if (!spfTxtValue || !mxHost || mxHost === "@" || !spfTxtHost) return null;++ const dkimRelative = relativeToEmailSlug({+ resendName: dkims[0].name!,+ emailSlug,+ });+ const dkimSelector = extractDkimSelector(dkimRelative);+ const dkimTxtValue = normalizeDkimValue(dkims[0].value!);+ if (!dkimSelector || !dkimTxtValue) return null;++ const slug = emailSlug.toLowerCase();+ const apexLower = apex.toLowerCase();+ const host =+ slug === apexLower+ ? undefined+ : slug.endsWith(`.${apexLower}`)+ ? slug.slice(0, -(apexLower.length + 1))+ : undefined;++ const groups = ["mx", "spf", "dkim"];+ const params: EmailDomainConnectParams = {+ groupId: "",+ ...(host ? { host } : {}),+ mxHost,+ mxValue: mx.value.trim().replace(/\.$/, ""),+ spfTxtHost,+ spfTxtValue,+ dkimSelector,+ dkimTxtValue,+ };++ if (dkims[1]?.name && dkims[1]?.value) {+ const dkim2Relative = relativeToEmailSlug({+ resendName: dkims[1].name,+ emailSlug,+ });+ const dkim2Selector = extractDkimSelector(dkim2Relative);+ const dkim2TxtValue = normalizeDkimValue(dkims[1].value);+ if (dkim2Selector && dkim2TxtValue) {+ groups.push("dkim2");+ params.dkim2Selector = dkim2Selector;+ params.dkim2TxtValue = dkim2TxtValue;+ }+ }++ groups.push("dmarc");+ params.groupId = groups.join(",");+ return params;+}++/** Flat DNS rows for forward-instructions email (includes recommended DMARC). */+export function mapResendRecordsToForwardRows({+ records,+ emailSlug,+ apex,+}: {+ records: ResendDnsRecord[];+ emailSlug: string;+ apex: string;+}): { type: string; name: string; value: string }[] {+ const rows: { type: string; name: string; value: string }[] = [];++ for (const r of records) {+ if (!r.type || !r.name || !r.value) continue;+ // Skip inbound Receiving MX if present — outbound setup only+ if (r.record === "Receiving") continue;++ const name = toZoneHost({+ resendName: r.name,+ emailSlug,+ apex,+ });+ const trimmed = r.value.trim();+ const value =+ r.type === "MX" && typeof r.priority === "number"+ ? `${r.priority} ${trimmed}`+ : trimmed;+ rows.push({+ type: r.type,+ name,+ value,+ });+ }++ rows.push({+ type: "TXT",+ name: toZoneHost({+ resendName: "_dmarc",+ emailSlug,+ apex,+ }),+ value: "v=DMARC1; p=none;",+ });++ return rows;+}diff --git a/apps/web/lib/domain-connect/sign-apply-url.ts b/apps/web/lib/domain-connect/sign-apply-url.tsnew file mode 100644index 0000000000..7809befa92--- /dev/null+++ b/apps/web/lib/domain-connect/sign-apply-url.ts@@ -0,0 +1,48 @@+import crypto from "node:crypto";+import { DOMAIN_CONNECT_PROVIDER_ID } from "./constants";++type SignApplyUrlParams = {+ urlSyncUX: string;+ serviceId: string;+ privateKeyPem: string;+ keyHost: string;+ queryParams: Record<string, string>;+};++/**+ * Builds a fully signed Domain Connect apply URL.+ * sig= is placed last (required by Cloudflare).+ */+export function buildSignedApplyUrl({+ urlSyncUX,+ serviceId,+ privateKeyPem,+ keyHost,+ queryParams,+}: SignApplyUrlParams): string {+ const base = [+ urlSyncUX.replace(/\/$/, ""),+ "v2/domainTemplates/providers",+ encodeURIComponent(DOMAIN_CONNECT_PROVIDER_ID),+ "services",+ encodeURIComponent(serviceId),+ "apply",+ ].join("/");++ const sortedParts = Object.keys(queryParams)+ .sort()+ .map(+ (k) => `${encodeURIComponent(k)}=${encodeURIComponent(queryParams[k]!)}`,+ );+ const signingString = sortedParts.join("&");++ const sign = crypto.createSign("RSA-SHA256");+ sign.update(signingString);+ sign.end();+ const sig = sign.sign(privateKeyPem, "base64");++ sortedParts.push(`key=${encodeURIComponent(keyHost)}`);+ sortedParts.push(`sig=${encodeURIComponent(sig)}`);++ return `${base}?${sortedParts.join("&")}`;+}diff --git a/apps/web/lib/domain-connect/types.ts b/apps/web/lib/domain-connect/types.tsnew file mode 100644index 0000000000..1a6ed2ff7f--- /dev/null+++ b/apps/web/lib/domain-connect/types.ts@@ -0,0 +1,7 @@+export type DomainConnectProviderKind = "vercel" | "cloudflare";++export type DomainConnectDiscovery = {+ providerKind: DomainConnectProviderKind;+ dnsProviderId: string;+ urlSyncUX: string;+};diff --git a/apps/web/lib/email/assert-email-sent.ts b/apps/web/lib/email/assert-email-sent.tsnew file mode 100644index 0000000000..4b11bad5c7--- /dev/null+++ b/apps/web/lib/email/assert-email-sent.ts@@ -0,0 +1,18 @@+import { DubApiError } from "@/lib/api/errors";+import { sendEmail } from "@dub/email";++type SendEmailResult = Awaited<ReturnType<typeof sendEmail>>;++export function assertEmailSent(result: SendEmailResult) {+ const failed =+ !result ||+ ("error" in result && Boolean(result.error)) ||+ ("data" in result && !result.data);++ if (failed) {+ throw new DubApiError({+ code: "internal_server_error",+ message: "Failed to send DNS instructions email.",+ });+ }+}diff --git a/apps/web/lib/upstash/ratelimit-policies.ts b/apps/web/lib/upstash/ratelimit-policies.tsindex 10ba05a3f6..214373c1bd 100644--- a/apps/web/lib/upstash/ratelimit-policies.ts+++ b/apps/web/lib/upstash/ratelimit-policies.ts@@ -95,4 +95,18 @@ export const RATELIMIT_POLICIES = {window: "1 m",keyPrefix: "rl:ai:reward:generate",},++ // Keyed on workspace + user so one actor cannot exhaust the workspace quota+ forwardDnsInstructions: {+ attempts: 10,+ window: "1 h",+ keyPrefix: "rl:domains:forward-dns-instructions",+ },++ // Keyed on the recipient so many accounts can't spam the same address+ forwardDnsInstructionsTarget: {+ attempts: 10,+ window: "1 h",+ keyPrefix: "rl:domains:forward-dns-instructions:target",+ },} as const satisfies Record<string, RatelimitPolicy>;diff --git a/apps/web/ui/domains/domain-card.tsx b/apps/web/ui/domains/domain-card.tsxindex 3b1f3ea229..d5689ae5eb 100644--- a/apps/web/ui/domains/domain-card.tsx+++ b/apps/web/ui/domains/domain-card.tsx@@ -1,4 +1,5 @@import { clientAccessCheck } from "@/lib/client-access-check";+import type { DomainConnectDiscovery } from "@/lib/domain-connect/types";import useDomains from "@/lib/swr/use-domains";import useWorkspace from "@/lib/swr/use-workspace";import {@@ -44,7 +45,7 @@ import Link from "next/link";import { useSearchParams } from "next/navigation";import { useMemo, useRef, useState } from "react";import { toast } from "sonner";-import useSWRImmutable from "swr/immutable";+import useSWR from "swr";import { useAddEditDomainModal } from "../modals/add-edit-domain-modal";import { useArchiveDomainModal } from "../modals/archive-domain-modal";import { useDeleteDomainModal } from "../modals/delete-domain-modal";@@ -66,14 +67,19 @@ export default function DomainCard({ props }: { props: DomainProps }) {const domainRef = useRef<HTMLDivElement>(null);const isVisible = useInViewport(domainRef, { defaultValue: true });- const { data, isValidating, mutate } = useSWRImmutable<{+ const { data, isValidating, mutate } = useSWR<{status: DomainVerificationStatusProps;response: any;+ domainConnect?: DomainConnectDiscovery | null;}>(workspaceId &&isVisible &&`/api/domains/${domain}/verify?workspaceId=${workspaceId}`,fetcher,+ {+ revalidateOnFocus: false,+ dedupingInterval: 5000,+ },);const verificationData = useMemo(() => {@@ -81,9 +87,11 @@ export default function DomainCard({ props }: { props: DomainProps }) {return {status: "Valid Configuration",response: null,+ domainConnect: null,} as {status: DomainVerificationStatusProps;response: any;+ domainConnect?: DomainConnectDiscovery | null;};}return data;@@ -316,7 +324,13 @@ export default function DomainCard({ props }: { props: DomainProps }) {</div></div>) : (- <DomainConfiguration data={verificationData} />+ <DomainConfiguration+ data={verificationData}+ domainConnect={verificationData.domainConnect}+ domain={domain}+ workspaceId={workspaceId ?? undefined}+ workspaceSlug={slug ?? undefined}+ />)) : (<div className="mt-6 h-6 w-32 animate-pulse rounded-md bg-neutral-200" />diff --git a/apps/web/ui/domains/domain-configuration.tsx b/apps/web/ui/domains/domain-configuration.tsxindex a15208448c..6b79b0743a 100644--- a/apps/web/ui/domains/domain-configuration.tsx+++ b/apps/web/ui/domains/domain-configuration.tsx@@ -1,23 +1,108 @@+"use client";++import { clientAccessCheck } from "@/lib/client-access-check";+import { isAllowedSyncUXOrigin } from "@/lib/domain-connect/allowed-origins";+import {+ DUB_CUSTOM_DOMAIN_A_RECORD,+ DUB_CUSTOM_DOMAIN_CNAME,+} from "@/lib/domain-connect/constants";+import type { DomainConnectDiscovery } from "@/lib/domain-connect/types";+import useWorkspace from "@/lib/swr/use-workspace";import { DomainVerificationStatusProps } from "@/lib/types";-import { CircleInfo, CopyButton, TabSelect } from "@dub/ui";+import { useForwardDnsInstructionsModal } from "@/ui/modals/forward-dns-instructions-modal";+import {+ Button,+ CircleInfo,+ Cloudflare,+ CopyButton,+ TabSelect,+ Vercel,+} from "@dub/ui";+import { EnvelopeArrowRight } from "@dub/ui/icons";import { cn, getSubdomain } from "@dub/utils";+import { usePathname } from "next/navigation";import { Fragment, useState } from "react";+import { toast } from "sonner";export default function DomainConfiguration({data,+ domainConnect,+ domain,+ workspaceId,+ workspaceSlug,}: {data: { status: DomainVerificationStatusProps; response: any };+ domainConnect?: DomainConnectDiscovery | null;+ domain?: string;+ workspaceId?: string;+ workspaceSlug?: string;}) {+ const pathname = usePathname();+ const { role } = useWorkspace();const { domainJson, configJson } = data.response;const subdomain = getSubdomain(domainJson.name, domainJson.apexName);- const [recordType, setRecordType] = useState(!!subdomain ? "CNAME" : "A");+ const [recordType, setRecordType] = useState<"A" | "CNAME">(+ !!subdomain ? "CNAME" : "A",+ );+ const [autoLoading, setAutoLoading] = useState(false);++ const { error: permissionsError } = clientAccessCheck({+ action: "domains.write",+ role,+ });++ const { ForwardDnsInstructionsModal, setShowForwardDnsModal } =+ useForwardDnsInstructionsModal({+ domain: domain ?? "",+ recordType,+ workspaceId: workspaceId ?? "",+ endpoint:+ domain && workspaceId+ ? `/api/domains/${encodeURIComponent(domain)}/forward-instructions?workspaceId=${workspaceId}`+ : "",+ });++ const handleAutoConfigure = async () => {+ if (!domain || !workspaceId) return;+ setAutoLoading(true);+ try {+ const res = await fetch(+ `/api/domains/${encodeURIComponent(domain)}/domain-connect/apply?workspaceId=${workspaceId}`,+ {+ method: "POST",+ headers: { "Content-Type": "application/json" },+ body: JSON.stringify({+ returnTo: pathname ?? `/${workspaceSlug}/settings/domains`,+ }),+ },+ );+ const json = await res.json().catch(() => ({}));+ if (!res.ok) {+ toast.error(json?.error?.message ?? "Could not start auto configure.");+ return;+ }+ if (json?.applyUrl) {+ if (!isAllowedSyncUXOrigin(json.applyUrl as string)) {+ toast.error("Invalid redirect URL from server.");+ return;+ }+ window.location.assign(json.applyUrl as string);+ return;+ }+ toast.error("Could not start auto configure.");+ } catch {+ toast.error("Could not start auto configure.");+ } finally {+ setAutoLoading(false);+ }+ };if (data.status === "Conflicting DNS Records") {return (<div className="pt-5"><div className="flex justify-start space-x-4"><div className="ease border-b-2 border-black pb-1 text-sm text-black transition-all duration-150">- {configJson?.conflicts.some((x) => x.type === "A")+ {configJson?.conflicts.some((x: { type: string }) => x.type === "A")? "A Record (recommended)": "CNAME Record (recommended)"}</div>@@ -46,7 +131,10 @@ export default function DomainConfiguration({{type: recordType,name: recordType === "A" ? "@" : subdomain ?? "www",- value: recordType === "A" ? `76.76.21.21` : `cname.dub.co`,+ value:+ recordType === "A"+ ? DUB_CUSTOM_DOMAIN_A_RECORD+ : DUB_CUSTOM_DOMAIN_CNAME,ttl: "86400",},]}@@ -68,6 +156,11 @@ export default function DomainConfiguration({? domainJson.verification.find((x: any) => x.type === "TXT"): undefined;+ const providerLabel =+ domainConnect?.providerKind === "cloudflare" ? "Cloudflare" : "Vercel";+ const ProviderIcon =+ domainConnect?.providerKind === "cloudflare" ? Cloudflare : Vercel;+return (<div className="pt-2"><div className="-ml-1.5 border-b border-neutral-200">@@ -94,7 +187,10 @@ export default function DomainConfiguration({{type: recordType,name: recordType === "A" ? "@" : subdomain ?? "www",- value: recordType === "A" ? `76.76.21.21` : `cname.dub.co`,+ value:+ recordType === "A"+ ? DUB_CUSTOM_DOMAIN_A_RECORD+ : DUB_CUSTOM_DOMAIN_CNAME,ttl: "86400",},...(txtVerification@@ -118,6 +214,43 @@ export default function DomainConfiguration({: undefined}/>++ {(domainConnect || (domain && workspaceId)) && (+ <div className="mt-4 flex flex-wrap gap-2">+ {domainConnect && domain && workspaceId && (+ <Button+ type="button"+ variant="secondary"+ text={`Auto configure with ${providerLabel}`}+ icon={+ <ProviderIcon+ className={cn(+ "size-4 shrink-0",+ domainConnect.providerKind === "cloudflare"+ ? "text-[#F6821F]"+ : "text-black",+ )}+ />+ }+ className="w-fit"+ onClick={handleAutoConfigure}+ loading={autoLoading}+ />+ )}+ {domain && workspaceId && (+ <Button+ type="button"+ variant="secondary"+ text="Forward instructions"+ icon={<EnvelopeArrowRight className="size-4 shrink-0" />}+ className="w-fit"+ onClick={() => setShowForwardDnsModal(true)}+ disabledTooltip={permissionsError || undefined}+ />+ )}+ </div>+ )}+ <ForwardDnsInstructionsModal /></div>);}diff --git a/apps/web/ui/modals/forward-dns-instructions-modal.tsx b/apps/web/ui/modals/forward-dns-instructions-modal.tsxnew file mode 100644index 0000000000..74d375e50b--- /dev/null+++ b/apps/web/ui/modals/forward-dns-instructions-modal.tsx@@ -0,0 +1,137 @@+"use client";++import { Button, Modal, useMediaQuery } from "@dub/ui";+import {+ Dispatch,+ SetStateAction,+ useCallback,+ useMemo,+ useState,+} from "react";+import { toast } from "sonner";++type ForwardDnsInstructionsModalProps = {+ domain: string;+ workspaceId: string;+ endpoint: string;+ recordType?: "A" | "CNAME";+};++function ForwardDnsInstructionsModal({+ showModal,+ setShowModal,+ domain,+ endpoint,+ recordType,+}: {+ showModal: boolean;+ setShowModal: Dispatch<SetStateAction<boolean>>;+} & ForwardDnsInstructionsModalProps) {+ const { isMobile } = useMediaQuery();+ const [email, setEmail] = useState("");+ const [loading, setLoading] = useState(false);++ const handleSubmit = async (e: React.FormEvent) => {+ e.preventDefault();+ e.stopPropagation();+ setLoading(true);+ try {+ const body: { email: string; recordType?: "A" | "CNAME" } = { email };+ if (recordType) {+ body.recordType = recordType;+ }+ const res = await fetch(endpoint, {+ method: "POST",+ headers: { "Content-Type": "application/json" },+ body: JSON.stringify(body),+ });+ const json = await res.json().catch(() => ({}));+ if (!res.ok) {+ toast.error(json?.error?.message ?? "Failed to send instructions.");+ return;+ }+ toast.success(`DNS instructions sent to ${email}`);+ setShowModal(false);+ setEmail("");+ } catch {+ toast.error("Failed to send instructions.");+ } finally {+ setLoading(false);+ }+ };++ return (+ <Modal showModal={showModal} setShowModal={setShowModal}>+ <div className="space-y-1 border-b border-neutral-200 px-4 py-4 sm:px-6">+ <h3 className="text-lg font-medium">Forward DNS instructions</h3>+ <p className="text-sm text-neutral-500">+ Enter an email address to send the DNS records needed to configure{" "}+ <span className="font-medium text-neutral-700">{domain}</span>.+ </p>+ </div>++ <form+ onSubmit={handleSubmit}+ className="flex flex-col gap-4 bg-neutral-50 px-4 py-6 sm:px-6"+ >+ <div>+ <label+ htmlFor="forward-email"+ className="block text-sm font-medium text-neutral-700"+ >+ Email address+ </label>+ <input+ id="forward-email"+ type="email"+ required+ autoFocus={!isMobile}+ autoComplete="off"+ value={email}+ onChange={(e) => setEmail(e.target.value)}+ placeholder="[email protected]"+ className="mt-1 block w-full rounded-md border-neutral-300 text-neutral-900 placeholder-neutral-400 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500 sm:text-sm"+ />+ </div>++ <Button+ type="submit"+ text="Send instructions"+ loading={loading}+ disabled={!email}+ />+ </form>+ </Modal>+ );+}++export function useForwardDnsInstructionsModal(+ props: ForwardDnsInstructionsModalProps,+) {+ const [showModal, setShowModal] = useState(false);++ const Modal = useCallback(+ () => (+ <ForwardDnsInstructionsModal+ showModal={showModal}+ setShowModal={setShowModal}+ {...props}+ />+ ),+ [+ showModal,+ props.domain,+ props.endpoint,+ props.recordType,+ props.workspaceId,+ ],+ );++ return useMemo(+ () => ({+ setShowForwardDnsModal: setShowModal,+ ForwardDnsInstructionsModal: Modal,+ }),+ [setShowModal, Modal],+ );+}diff --git a/apps/web/ui/partners/program-link-configuration.tsx b/apps/web/ui/partners/program-link-configuration.tsxindex dac204de31..5f076f8e16 100644--- a/apps/web/ui/partners/program-link-configuration.tsx+++ b/apps/web/ui/partners/program-link-configuration.tsx@@ -1,3 +1,4 @@+import type { DomainConnectDiscovery } from "@/lib/domain-connect/types";import { getLinkStructureOptions } from "@/lib/partners/get-link-structure-options";import { mutatePrefix } from "@/lib/swr/mutate";import useDomains from "@/lib/swr/use-domains";@@ -588,11 +589,12 @@ function DomainOnboardingSelection({domain,onDomainChange,}: DomainProps & { onBack: () => void }) {- const { id: workspaceId } = useWorkspace();+ const { id: workspaceId, slug: workspaceSlug } = useWorkspace();const { data: verificationData } = useSWRImmutable<{status: DomainVerificationStatusProps;response: any;+ domainConnect?: DomainConnectDiscovery | null;}>(workspaceId && domain? `/api/domains/${domain}/verify?workspaceId=${workspaceId}`@@ -623,7 +625,13 @@ function DomainOnboardingSelection({transition={{ duration: 0.2 }}className="mt-6 overflow-hidden rounded-md border border-neutral-200 bg-neutral-50 px-5 pb-5">- <DomainConfiguration data={verificationData} />+ <DomainConfiguration+ data={verificationData}+ domainConnect={verificationData.domainConnect}+ domain={domain ?? undefined}+ workspaceId={workspaceId ?? undefined}+ workspaceSlug={workspaceSlug ?? undefined}+ /></motion.div>)}</AnimatePresence>diff --git a/packages/email/src/templates/domain-dns-instructions.tsx b/packages/email/src/templates/domain-dns-instructions.tsxnew file mode 100644index 0000000000..7f01f29ba3--- /dev/null+++ b/packages/email/src/templates/domain-dns-instructions.tsx@@ -0,0 +1,107 @@+import { DUB_WORDMARK } from "@dub/utils";+import {+ Body,+ Column,+ Container,+ Head,+ Heading,+ Html,+ Img,+ Preview,+ Row,+ Section,+ Tailwind,+ Text,+} from "@react-email/components";+import { Footer } from "../components/footer";++type DnsRecord = {+ type: string;+ name: string;+ value: string;+};++export default function DomainDnsInstructions({+ email = "[email protected]",+ domain = "go.acme.com",+ records = [+ { type: "A", name: "@", value: "76.76.21.21" },+ { type: "TXT", name: "_vercel", value: "vc-domain-verify=abc123" },+ ],+ senderEmail = "[email protected]",+}: {+ email: string;+ domain: string;+ records: DnsRecord[];+ senderEmail: string;+}) {+ return (+ <Html>+ <Head />+ <Preview>DNS instructions for {domain}</Preview>+ <Tailwind>+ <Body className="mx-auto my-auto bg-white font-sans">+ <Container className="mx-auto my-10 max-w-[600px] rounded border border-solid border-neutral-200 px-10 py-5">+ <Section className="mt-8">+ <Img src={DUB_WORDMARK} height="32" alt="Dub" />+ </Section>+ <Heading className="mx-0 my-7 p-0 text-lg font-medium text-black">+ DNS configuration for {domain}+ </Heading>+ <Text className="text-sm leading-6 text-black">+ <strong>{senderEmail}</strong> forwarded you the DNS records+ needed to connect <strong>{domain}</strong> to Dub. Add the+ records below to your DNS provider to complete the setup.+ </Text>++ <Section className="mt-6 rounded-lg bg-neutral-100 px-4 py-3">+ <Row>+ <Column className="w-16">+ <Text className="m-0 text-xs font-semibold text-neutral-500">+ TYPE+ </Text>+ </Column>+ <Column className="w-24">+ <Text className="m-0 text-xs font-semibold text-neutral-500">+ NAME+ </Text>+ </Column>+ <Column>+ <Text className="m-0 text-xs font-semibold text-neutral-500">+ VALUE+ </Text>+ </Column>+ </Row>++ {records.map((record, idx) => (+ <Row key={idx} className="border-t border-neutral-200">+ <Column className="w-16 py-2">+ <Text className="m-0 font-mono text-xs text-black">+ {record.type}+ </Text>+ </Column>+ <Column className="w-24 py-2">+ <Text className="m-0 font-mono text-xs text-black">+ {record.name}+ </Text>+ </Column>+ <Column className="py-2">+ <Text className="m-0 break-all font-mono text-xs text-black">+ {record.value}+ </Text>+ </Column>+ </Row>+ ))}+ </Section>++ <Text className="text-sm leading-6 text-neutral-500">+ DNS changes can take up to 24-48 hours to propagate fully.+ </Text>++ <Footer email={email} />+ </Container>+ </Body>+ </Tailwind>+ </Html>+ );+}diff --git a/packages/ui/src/icons/cloudflare.tsx b/packages/ui/src/icons/cloudflare.tsxnew file mode 100644index 0000000000..1075905604--- /dev/null+++ b/packages/ui/src/icons/cloudflare.tsx@@ -0,0 +1,16 @@+export function Cloudflare({ className }: { className?: string }) {+ return (+ <svg+ xmlns="http://www.w3.org/2000/svg"+ viewBox="0 0 640 640"+ width="16"+ height="16"+ className={className}+ >+ <path+ fill="currentColor"+ d="M407.9 383.9L177.1 381C176.4 381 175.7 380.8 175.1 380.5C174.5 380.2 173.9 379.7 173.5 379.1C173.1 378.5 172.8 377.8 172.8 377.1C172.8 376.4 172.8 375.7 173 375C173.4 373.9 174.1 372.9 175.1 372.2C176.1 371.5 177.2 371 178.4 371L411.3 368.1C438.9 366.8 468.8 344.5 479.3 317.3L492.6 282.8C493 281.9 493.1 280.9 493.1 279.9C493.1 279.4 493 278.8 492.9 278.3C485.5 246.1 467.9 217.2 442.6 196C417.3 174.8 385.9 162.3 352.9 160.5C319.9 158.7 287.3 167.8 259.9 186.2C232.5 204.6 211.9 231.5 201.1 262.7C189.8 254.2 176.2 249.4 162.1 249C148 248.6 134.1 252.5 122.3 260.4C110.5 268.3 101.5 279.5 96.4 292.7C91.3 305.9 90.5 320.3 94 334C41.7 335.5-.2 378.1-.2 430.5C-.2 435.2 .1 439.8 .8 444.5C1 445.6 1.5 446.6 2.3 447.3C3.1 448 4.2 448.4 5.2 448.4L431.3 448.5C431.3 448.5 431.4 448.5 431.4 448.5C432.6 448.5 433.7 448.1 434.7 447.4C435.7 446.7 436.3 445.7 436.7 444.5L440 433.2C443.9 419.8 442.4 407.4 435.9 398.3C429.9 389.9 419.8 385 407.7 384.4zM513.8 285.1C511.7 285.1 509.5 285.2 507.4 285.3C506.6 285.4 505.9 285.6 505.3 286.1C504.7 286.6 504.3 287.2 504 287.9L494.9 319.1C491 332.5 492.5 344.9 499 354C505 362.4 515.1 367.3 527.2 367.9L576.4 370.8C577.1 370.8 577.8 371 578.4 371.3C579 371.6 579.5 372.1 579.9 372.7C580.3 373.3 580.6 374 580.7 374.7C580.8 375.4 580.7 376.2 580.5 376.8C580.1 377.9 579.4 378.9 578.4 379.6C577.4 380.3 576.3 380.8 575.1 380.8L524 383.7C496.2 385 466.3 407.3 455.9 434.5L452.2 444.1C452 444.5 452 444.9 452 445.4C452 445.9 452.2 446.2 452.4 446.6C452.6 447 453 447.3 453.3 447.5C453.6 447.7 454.1 447.8 454.5 447.8C454.5 447.8 454.6 447.8 454.6 447.8L630.5 447.8C631.5 447.8 632.5 447.5 633.3 446.9C634.1 446.3 634.7 445.4 635 444.5C638.1 433.4 639.7 422 639.7 410.5C639.7 341.2 583.2 285 513.6 285z"+ />+ </svg>+ );+}diff --git a/packages/ui/src/icons/index.tsx b/packages/ui/src/icons/index.tsxindex 7d1a8e1ee5..bfeca84912 100644--- a/packages/ui/src/icons/index.tsx+++ b/packages/ui/src/icons/index.tsx@@ -37,6 +37,7 @@ export * from "./loading-spinner";export * from "./anthropic";export * from "./beehiiv";export * from "./bing";+export * from "./cloudflare";export * from "./facebook";export * from "./github";export * from "./google";@@ -50,6 +51,7 @@ export * from "./slack-colorful";export * from "./tiktok";export * from "./twitter";export * from "./unsplash";+export * from "./vercel";export * from "./veriff";export * from "./youtube";diff --git a/packages/ui/src/icons/vercel.tsx b/packages/ui/src/icons/vercel.tsxnew file mode 100644index 0000000000..ab3b584046--- /dev/null+++ b/packages/ui/src/icons/vercel.tsx@@ -0,0 +1,19 @@+export function Vercel({ className }: { className?: string }) {+ return (+ <svg+ width="16"+ height="16"+ viewBox="0 0 16 16"+ fill="none"+ xmlns="http://www.w3.org/2000/svg"+ className={className}+ >+ <path+ fillRule="evenodd"+ clipRule="evenodd"+ d="M8 1L16 15H0L8 1Z"+ fill="currentColor"+ />+ </svg>+ );+}