Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

code improvements

Pedro Ladeira8052a9158a67
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.ts
index 67105b82cc..e375881755 100644
--- a/apps/web/app/api/domains/[domain]/domain-connect/apply/route.ts
+++ b/apps/web/app/api/domains/[domain]/domain-connect/apply/route.ts
@@ -9,9 +9,11 @@ import {
DEFAULT_DC_SERVICE_APEX,
DEFAULT_DC_SERVICE_SUBDOMAIN,
DOMAIN_CONNECT_KEY_HOST,
- DOMAIN_CONNECT_PROVIDER_ID,
} from "@/lib/domain-connect/constants";
-import { discoverDomainConnect } from "@/lib/domain-connect/discover";
+import {
+ discoverDomainConnect,
+ fetchDomainConnectTemplateVersion,
+} 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";
@@ -108,23 +110,9 @@ export const POST = withWorkspace(
// provider confirms which version it serves.
let subdomainTemplateV2 = false;
if (subdomain) {
- let version: number | undefined;
- if (discovery.urlAPI) {
- try {
- const res = await fetch(
- `${discovery.urlAPI}/v2/domainTemplates/providers/${DOMAIN_CONNECT_PROVIDER_ID}/services/${serviceId}`,
- {
- headers: { accept: "application/json" },
- redirect: "manual",
- signal: AbortSignal.timeout(3000),
- },
- );
- if (res.ok) {
- const json = (await res.json()) as { version?: unknown };
- if (typeof json.version === "number") version = json.version;
- }
- } catch {}
- }
+ const version = discovery.urlAPI
+ ? await fetchDomainConnectTemplateVersion(discovery.urlAPI, serviceId)
+ : undefined;
if (!version) {
throw new DubApiError({
diff --git a/apps/web/app/api/domains/[domain]/verify/route.ts b/apps/web/app/api/domains/[domain]/verify/route.ts
index 88d150f8fe..bc55031199 100644
--- a/apps/web/app/api/domains/[domain]/verify/route.ts
+++ b/apps/web/app/api/domains/[domain]/verify/route.ts
@@ -3,11 +3,15 @@ import { getDomainOrThrow } from "@/lib/api/domains/get-domain-or-throw";
import { getDomainResponse } from "@/lib/api/domains/get-domain-response";
import { verifyDomainWithRetry } from "@/lib/api/domains/verify-domain";
import { withWorkspace } from "@/lib/auth";
-import { discoverDomainConnectIfEligible } from "@/lib/domain-connect/discover";
+import { DEFAULT_DC_SERVICE_SUBDOMAIN } from "@/lib/domain-connect/constants";
+import {
+ discoverDomainConnectIfEligible,
+ fetchDomainConnectTemplateVersion,
+} 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 { getApexDomain, getSubdomain } from "@dub/utils";
import { NextResponse } from "next/server";
export const maxDuration = 30;
@@ -98,9 +102,23 @@ export const GET = withWorkspace(
});
}
- const domainConnect: DomainConnectDiscovery | null =
+ let domainConnect: DomainConnectDiscovery | null =
await discoverDomainConnectIfEligible(apex, status);
+ // links-subdomain v1 cannot write the ownership TXT at _vercel.<apex>.
+ // Vercel still serves that version, so skip auto-configure until it is v2.
+ if (
+ domainConnect?.providerKind === "vercel" &&
+ domainConnect.urlAPI &&
+ getSubdomain(domain.toLowerCase(), apex)
+ ) {
+ const version = await fetchDomainConnectTemplateVersion(
+ domainConnect.urlAPI,
+ DEFAULT_DC_SERVICE_SUBDOMAIN,
+ );
+ if (version !== undefined && version < 2) domainConnect = null;
+ }
+
return NextResponse.json({
status,
response: { configJson, domainJson, verificationJson },
diff --git a/apps/web/lib/domain-connect/discover.ts b/apps/web/lib/domain-connect/discover.ts
index 1b74dcd821..d1adea0bc2 100644
--- a/apps/web/lib/domain-connect/discover.ts
+++ b/apps/web/lib/domain-connect/discover.ts
@@ -1,5 +1,6 @@
import dns from "node:dns/promises";
import { isAllowedSyncUXOrigin } from "./allowed-origins";
+import { DOMAIN_CONNECT_PROVIDER_ID } from "./constants";
import type {
DomainConnectDiscovery,
DomainConnectProviderKind,
@@ -143,6 +144,28 @@ export async function discoverDomainConnect(
return { providerKind, dnsProviderId, urlSyncUX, urlAPI };
}
+/** Template version from the provider, or undefined when the lookup is inconclusive. */
+export async function fetchDomainConnectTemplateVersion(
+ urlAPI: string,
+ serviceId: string,
+): Promise<number | undefined> {
+ try {
+ const res = await fetch(
+ `${urlAPI}/v2/domainTemplates/providers/${DOMAIN_CONNECT_PROVIDER_ID}/services/${serviceId}`,
+ {
+ headers: { accept: "application/json" },
+ redirect: "manual",
+ signal: AbortSignal.timeout(3000),
+ },
+ );
+ if (!res.ok) return;
+ const { version } = (await res.json()) as { version?: unknown };
+ return typeof version === "number" ? version : undefined;
+ } catch {
+ return;
+ }
+}
+
/**
* Only discover when the feature is enabled and the status warrants it.
*/