The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Parse domain JSON configs before side effects and simplify clear handling
Kiran K059aa265502b
diff --git a/apps/web/app/api/domains/[domain]/route.ts b/apps/web/app/api/domains/[domain]/route.tsindex cac616f5b1..44fb619a3b 100644--- a/apps/web/app/api/domains/[domain]/route.ts+++ b/apps/web/app/api/domains/[domain]/route.ts@@ -15,7 +15,6 @@ import { prisma } from "@/lib/prisma";import { storage } from "@/lib/storage";import { updateDomainBodySchema } from "@/lib/zod/schemas/domains";import { combineWords, nanoid, R2_URL } from "@dub/utils";-import { Prisma } from "@prisma/client";import { waitUntil } from "@vercel/functions";import { revalidatePath, revalidateTag } from "next/cache";import { NextResponse } from "next/server";@@ -98,6 +97,21 @@ export const PATCH = withWorkspace(}}+ const parsedAssetLinks = parseDomainJsonConfig({+ value: assetLinks,+ field: "assetLinks",+ });++ const parsedAppleAppSiteAssociation = parseDomainJsonConfig({+ value: appleAppSiteAssociation,+ field: "appleAppSiteAssociation",+ });++ const parsedDeepviewData = parseDomainJsonConfig({+ value: deepviewData,+ field: "deepviewData",+ });+const domainChanged =newDomain && newDomain.toLowerCase() !== currentDomain.toLowerCase();@@ -147,23 +161,14 @@ export const PATCH = withWorkspace(expiredUrl,notFoundUrl,logo: deleteLogo ? null : logoUploaded?.url || existingDomain.logo,- ...(assetLinks !== undefined && {- assetLinks: assetLinks- ? parseDomainJsonConfig(assetLinks, "assetLinks")- : Prisma.DbNull,+ ...(parsedAssetLinks !== undefined && {+ assetLinks: parsedAssetLinks,}),- ...(appleAppSiteAssociation !== undefined && {- appleAppSiteAssociation: appleAppSiteAssociation- ? parseDomainJsonConfig(- appleAppSiteAssociation,- "appleAppSiteAssociation",- )- : Prisma.DbNull,+ ...(parsedAppleAppSiteAssociation !== undefined && {+ appleAppSiteAssociation: parsedAppleAppSiteAssociation,}),- ...(deepviewData !== undefined && {- deepviewData: deepviewData- ? parseDomainJsonConfig(deepviewData, "deepviewData")- : Prisma.DbNull,+ ...(parsedDeepviewData !== undefined && {+ deepviewData: parsedDeepviewData,}),},include: {diff --git a/apps/web/app/api/domains/route.ts b/apps/web/app/api/domains/route.tsindex 2d56d9925e..173233e9c8 100644--- a/apps/web/app/api/domains/route.ts+++ b/apps/web/app/api/domains/route.ts@@ -136,6 +136,21 @@ export const POST = withWorkspace(}}+ const parsedAssetLinks = parseDomainJsonConfig({+ value: assetLinks,+ field: "assetLinks",+ });++ const parsedAppleAppSiteAssociation = parseDomainJsonConfig({+ value: appleAppSiteAssociation,+ field: "appleAppSiteAssociation",+ });++ const parsedDeepviewData = parseDomainJsonConfig({+ value: deepviewData,+ field: "deepviewData",+ });+const validDomain = await validateDomain(slug);if (validDomain.error && validDomain.code) {@@ -225,17 +240,14 @@ export const POST = withWorkspace(expiredUrl,notFoundUrl,...(logoUploaded && { logo: logoUploaded.url }),- ...(assetLinks && {- assetLinks: parseDomainJsonConfig(assetLinks, "assetLinks"),+ ...(parsedAssetLinks !== undefined && {+ assetLinks: parsedAssetLinks,}),- ...(appleAppSiteAssociation && {- appleAppSiteAssociation: parseDomainJsonConfig(- appleAppSiteAssociation,- "appleAppSiteAssociation",- ),+ ...(parsedAppleAppSiteAssociation !== undefined && {+ appleAppSiteAssociation: parsedAppleAppSiteAssociation,}),- ...(deepviewData && {- deepviewData: parseDomainJsonConfig(deepviewData, "deepviewData"),+ ...(parsedDeepviewData !== undefined && {+ deepviewData: parsedDeepviewData,}),},});diff --git a/apps/web/lib/api/domains/parse-domain-json-config.ts b/apps/web/lib/api/domains/parse-domain-json-config.tsindex bd2a7a7637..6449287b11 100644--- a/apps/web/lib/api/domains/parse-domain-json-config.ts+++ b/apps/web/lib/api/domains/parse-domain-json-config.ts@@ -1,4 +1,5 @@import { DubApiError } from "@/lib/api/errors";+import { Prisma } from "@prisma/client";const DOMAIN_JSON_CONFIG_LABELS = {assetLinks: "Asset Links",@@ -8,12 +9,19 @@ const DOMAIN_JSON_CONFIG_LABELS = {type DomainJsonConfigField = keyof typeof DOMAIN_JSON_CONFIG_LABELS;-export function parseDomainJsonConfig(- value: string | null | undefined,- field: DomainJsonConfigField,-) {- if (value == null || value === "") {- return value;+export function parseDomainJsonConfig({+ value,+ field,+}: {+ value: string | null | undefined;+ field: DomainJsonConfigField;+}): Prisma.InputJsonValue | typeof Prisma.DbNull | undefined {+ if (value === undefined) {+ return undefined;+ }++ if (value === null || value === "") {+ return Prisma.DbNull;}try {