The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
exclude domain filter when domain+key resolves a link and replace parseEventsQuery with eventsQuerySchema
Pedro Ladeira42c47805c40e
diff --git a/apps/web/app/(ee)/api/admin/events/route.ts b/apps/web/app/(ee)/api/admin/events/route.tsindex cc791e4f46..f6696fc3df 100644--- a/apps/web/app/(ee)/api/admin/events/route.ts+++ b/apps/web/app/(ee)/api/admin/events/route.ts@@ -1,11 +1,11 @@import { getEvents } from "@/lib/analytics/get-events";import { withAdmin } from "@/lib/auth";-import { parseEventsQuery } from "@/lib/zod/schemas/analytics";+import { eventsQuerySchema } from "@/lib/zod/schemas/analytics";import { NextResponse } from "next/server";// GET /api/admin/events – get events for adminexport const GET = withAdmin(async ({ searchParams }) => {- const parsedParams = parseEventsQuery(searchParams);+ const parsedParams = eventsQuerySchema.parse(searchParams);const response = await getEvents(parsedParams);diff --git a/apps/web/app/(ee)/api/events/export/route.ts b/apps/web/app/(ee)/api/events/export/route.tsindex caeade5417..cfade7b000 100644--- a/apps/web/app/(ee)/api/events/export/route.ts+++ b/apps/web/app/(ee)/api/events/export/route.ts@@ -13,7 +13,7 @@ import { assertValidDateRangeForPlan } from "@/lib/api/utils/assert-valid-date-rimport { withWorkspace } from "@/lib/auth";import { qstash } from "@/lib/cron";import { verifyFolderAccess } from "@/lib/folder/permissions";-import { parseEventsQuery } from "@/lib/zod/schemas/analytics";+import { eventsQuerySchema } from "@/lib/zod/schemas/analytics";import { Link } from "@dub/prisma/client";import { APP_DOMAIN_WITH_NGROK, capitalize } from "@dub/utils";import { NextResponse } from "next/server";@@ -35,7 +35,7 @@ export const GET = withWorkspace(async ({ searchParams, workspace, session }) => {throwIfClicksUsageExceeded(workspace);- const parsedParams = parseEventsQuery(searchParams);+ const parsedParams = eventsQuerySchema.parse(searchParams);const { columns } = exportQuerySchema.parse(searchParams);const {diff --git a/apps/web/app/(ee)/api/events/route.ts b/apps/web/app/(ee)/api/events/route.tsindex fdb76f7da1..e92e0acbf1 100644--- a/apps/web/app/(ee)/api/events/route.ts+++ b/apps/web/app/(ee)/api/events/route.ts@@ -6,7 +6,7 @@ import { throwIfClicksUsageExceeded } from "@/lib/api/links/usage-checks";import { assertValidDateRangeForPlan } from "@/lib/api/utils/assert-valid-date-range-for-plan";import { withWorkspace } from "@/lib/auth";import { verifyFolderAccess } from "@/lib/folder/permissions";-import { parseEventsQuery } from "@/lib/zod/schemas/analytics";+import { eventsQuerySchema } from "@/lib/zod/schemas/analytics";import { Link } from "@dub/prisma/client";import { NextResponse } from "next/server";@@ -15,7 +15,7 @@ export const GET = withWorkspace(async ({ searchParams, workspace, session }) => {throwIfClicksUsageExceeded(workspace);- const parsedParams = parseEventsQuery(searchParams);+ const parsedParams = eventsQuerySchema.parse(searchParams);let {event,@@ -69,9 +69,12 @@ export const GET = withWorkspace(end,});+ // When domain+key resolves a specific link, exclude domain from filters+ const { domain: _domain, key: _key, ...filterParams } = parsedParams;+console.time("getEvents");const response = await getEvents({- ...parsedParams,+ ...(link ? filterParams : parsedParams),event,workspaceId: workspace.id,});diff --git a/apps/web/app/api/analytics/dashboard/route.ts b/apps/web/app/api/analytics/dashboard/route.tsindex f718192b77..8bdb08cc35 100644--- a/apps/web/app/api/analytics/dashboard/route.ts+++ b/apps/web/app/api/analytics/dashboard/route.ts@@ -163,8 +163,11 @@ export const GET = async (req: Request) => {`[Analytics Dashboard] Cache miss: ${JSON.stringify(parsedParams, null, 2)}`,);+ // When domain+key resolves a specific link, exclude domain from filters+ const { domain: _domain, key: _key, ...filterParams } = parsedParams;+const response = await getAnalytics({- ...parsedParams,+ ...(link ? filterParams : parsedParams),// workspaceId can be undefined (for public links that haven't been claimed/synced to a workspace)...(workspace && { workspaceId: workspace.id }),...(folder && { folderId: folder.id }),diff --git a/apps/web/app/api/analytics/export/route.ts b/apps/web/app/api/analytics/export/route.tsindex db5344d007..40975ecf15 100644--- a/apps/web/app/api/analytics/export/route.ts+++ b/apps/web/app/api/analytics/export/route.ts@@ -92,6 +92,9 @@ export const GET = withWorkspace(end,});+ // When domain+key resolves a specific link, exclude domain from filters+ const { domain: _domain, key: _key, ...filterParams } = parsedParams;+const zip = new JSZip();await Promise.all(@@ -103,7 +106,7 @@ export const GET = withWorkspace(if (endpoint === "count") return;const response = await getAnalytics({- ...parsedParams,+ ...(link ? filterParams : parsedParams),workspaceId: workspace.id,groupBy: endpoint,isDeprecatedClicksEndpoint: false,diff --git a/apps/web/app/api/analytics/route.ts b/apps/web/app/api/analytics/route.tsindex fc56054110..8c61105f12 100644--- a/apps/web/app/api/analytics/route.ts+++ b/apps/web/app/api/analytics/route.ts@@ -118,9 +118,12 @@ export const GET = withWorkspace(const isDeprecatedClicksEndpoint =oldEvent === "clicks" || oldType === "count";+ // When domain+key resolves a specific link, exclude domain from filters+ const { domain: _domain, key: _key, ...filterParams } = parsedParams;+console.time("getAnalytics");const response = await getAnalytics({- ...parsedParams,+ ...(link ? filterParams : parsedParams),event,groupBy,workspaceId: workspace.id,