The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
simplify domain / folder / link verification checks in analytics/events endpoints
Steven Tey80550cd853ea
diff --git a/apps/web/app/(ee)/api/events/export/route.ts b/apps/web/app/(ee)/api/events/export/route.tsindex cfade7b000..e381f26fda 100644--- a/apps/web/app/(ee)/api/events/export/route.ts+++ b/apps/web/app/(ee)/api/events/export/route.ts@@ -6,7 +6,6 @@ import { getFirstFilterValue } from "@/lib/analytics/filter-helpers";import { getAnalytics } from "@/lib/analytics/get-analytics";import { getEvents } from "@/lib/analytics/get-events";import { convertToCSV } from "@/lib/analytics/utils";-import { getDomainOrThrow } from "@/lib/api/domains/get-domain-or-throw";import { getLinkOrThrow } from "@/lib/api/links/get-link-or-throw";import { throwIfClicksUsageExceeded } from "@/lib/api/links/usage-checks";import { assertValidDateRangeForPlan } from "@/lib/api/utils/assert-valid-date-range-for-plan";@@ -14,7 +13,6 @@ import { withWorkspace } from "@/lib/auth";import { qstash } from "@/lib/cron";import { verifyFolderAccess } from "@/lib/folder/permissions";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";import * as z from "zod/v4";@@ -38,40 +36,42 @@ export const GET = withWorkspace(const parsedParams = eventsQuerySchema.parse(searchParams);const { columns } = exportQuerySchema.parse(searchParams);- const {+ let {event,interval,start,end,- linkId: linkIdFilter,- externalId,- domain: domainFilter,+ folderId,+ domain,key,- folderId: folderIdFilter,+ linkId,+ externalId,} = parsedParams;- // Extract string values for specific link/folder lookup- const domain = getFirstFilterValue(domainFilter);- const linkId = getFirstFilterValue(linkIdFilter);- const folderId = getFirstFilterValue(folderIdFilter);-- let link: Link | null = null;-- if (domain) {- await getDomainOrThrow({ workspace, domain });- }-- if (linkId || externalId || (domain && key)) {- link = await getLinkOrThrow({+ let folderIdToVerify = getFirstFilterValue(folderId);+ if (!linkId && (externalId || (domain && key))) {+ const link = await getLinkOrThrow({workspaceId: workspace.id,linkId,externalId,- domain,+ domain: getFirstFilterValue(domain),key,});++ parsedParams.linkId = {+ operator: "IS",+ sqlOperator: "IN",+ values: [link.id],+ };++ // since we're filtering for a specific link, exclude domain from filters+ parsedParams.domain = undefined;++ if (link.folderId && !folderIdToVerify) {+ folderIdToVerify = link.folderId;+ }}- const folderIdToVerify = link?.folderId || folderId;if (folderIdToVerify) {await verifyFolderAccess({workspace,diff --git a/apps/web/app/(ee)/api/events/route.ts b/apps/web/app/(ee)/api/events/route.tsindex e92e0acbf1..7912c4ac7e 100644--- a/apps/web/app/(ee)/api/events/route.ts+++ b/apps/web/app/(ee)/api/events/route.ts@@ -1,13 +1,11 @@import { getFirstFilterValue } from "@/lib/analytics/filter-helpers";import { getEvents } from "@/lib/analytics/get-events";-import { getDomainOrThrow } from "@/lib/api/domains/get-domain-or-throw";import { getLinkOrThrow } from "@/lib/api/links/get-link-or-throw";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 { eventsQuerySchema } from "@/lib/zod/schemas/analytics";-import { Link } from "@dub/prisma/client";import { NextResponse } from "next/server";// GET /api/events@@ -22,35 +20,36 @@ export const GET = withWorkspace(interval,start,end,- linkId: linkIdFilter,- externalId,- domain: domainFilter,+ folderId,+ domain,key,- folderId: folderIdFilter,+ linkId,+ externalId,} = parsedParams;- // Extract string values for specific link/folder lookup- const domain = getFirstFilterValue(domainFilter);- const linkId = getFirstFilterValue(linkIdFilter);- const folderId = getFirstFilterValue(folderIdFilter);-- let link: Link | null = null;-- if (domain) {- await getDomainOrThrow({ workspace, domain });- }-- if (linkId || externalId || (domain && key)) {- link = await getLinkOrThrow({+ let folderIdToVerify = getFirstFilterValue(folderId);+ if (!linkId && (externalId || (domain && key))) {+ const link = await getLinkOrThrow({workspaceId: workspace.id,linkId,externalId,- domain,+ domain: getFirstFilterValue(domain),key,});- }- const folderIdToVerify = link?.folderId || folderId;+ parsedParams.linkId = {+ operator: "IS",+ sqlOperator: "IN",+ values: [link.id],+ };++ // since we're filtering for a specific link, exclude domain from filters+ parsedParams.domain = undefined;++ if (link.folderId && !folderIdToVerify) {+ folderIdToVerify = link.folderId;+ }+ }if (folderIdToVerify) {await verifyFolderAccess({@@ -69,12 +68,9 @@ 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({- ...(link ? filterParams : parsedParams),+ ...parsedParams,event,workspaceId: workspace.id,});diff --git a/apps/web/app/api/analytics/export/route.ts b/apps/web/app/api/analytics/export/route.tsindex 40975ecf15..27940489b0 100644--- a/apps/web/app/api/analytics/export/route.ts+++ b/apps/web/app/api/analytics/export/route.ts@@ -2,7 +2,6 @@ import { VALID_ANALYTICS_ENDPOINTS } from "@/lib/analytics/constants";import { getFirstFilterValue } from "@/lib/analytics/filter-helpers";import { getAnalytics } from "@/lib/analytics/get-analytics";import { convertToCSV } from "@/lib/analytics/utils";-import { getDomainOrThrow } from "@/lib/api/domains/get-domain-or-throw";import { DubApiError } from "@/lib/api/errors";import { getLinkOrThrow } from "@/lib/api/links/get-link-or-throw";import { throwIfClicksUsageExceeded } from "@/lib/api/links/usage-checks";@@ -23,23 +22,18 @@ export const GET = withWorkspace(const parsedParams = parseAnalyticsQuery(searchParams);- const {+ let {interval,start,end,- linkId: linkIdFilter,- externalId,- domain: domainFilter,+ folderId,+ domain,key,- folderId: folderIdFilter,+ linkId,+ externalId,programId,} = parsedParams;- // Extract string values for specific link/folder lookup- const domain = getFirstFilterValue(domainFilter);- const linkId = getFirstFilterValue(linkIdFilter);- const folderId = getFirstFilterValue(folderIdFilter);-let link: Link | null = null;let programStartedAt: Date | null | undefined = null;@@ -59,21 +53,29 @@ export const GET = withWorkspace(programStartedAt = program.startedAt;}- if (domain) {- await getDomainOrThrow({ workspace, domain });- }-- if (linkId || externalId || (domain && key)) {- link = await getLinkOrThrow({+ let folderIdToVerify = getFirstFilterValue(folderId);+ if (!linkId && (externalId || (domain && key))) {+ const link = await getLinkOrThrow({workspaceId: workspace.id,linkId,externalId,- domain,+ domain: getFirstFilterValue(domain),key,});- }- const folderIdToVerify = link?.folderId || folderId;+ parsedParams.linkId = {+ operator: "IS",+ sqlOperator: "IN",+ values: [link.id],+ };++ // since we're filtering for a specific link, exclude domain from filters+ parsedParams.domain = undefined;++ if (link.folderId && !folderIdToVerify) {+ folderIdToVerify = link.folderId;+ }+ }if (folderIdToVerify) {await verifyFolderAccess({diff --git a/apps/web/app/api/analytics/route.ts b/apps/web/app/api/analytics/route.tsindex 8c61105f12..a4eccfe6a7 100644--- a/apps/web/app/api/analytics/route.ts+++ b/apps/web/app/api/analytics/route.ts@@ -1,7 +1,6 @@import { VALID_ANALYTICS_ENDPOINTS } from "@/lib/analytics/constants";import { getFirstFilterValue } from "@/lib/analytics/filter-helpers";import { getAnalytics } from "@/lib/analytics/get-analytics";-import { getDomainOrThrow } from "@/lib/api/domains/get-domain-or-throw";import { DubApiError } from "@/lib/api/errors";import { getLinkOrThrow } from "@/lib/api/links/get-link-or-throw";import { throwIfClicksUsageExceeded } from "@/lib/api/links/usage-checks";@@ -15,7 +14,6 @@ import {analyticsPathParamsSchema,parseAnalyticsQuery,} from "@/lib/zod/schemas/analytics";-import { Link } from "@dub/prisma/client";import { NextResponse } from "next/server";// GET /api/analytics – get analytics@@ -40,22 +38,14 @@ export const GET = withWorkspace(interval,start,end,- externalId,- domain: domainFilter,+ folderId,+ domain,key,- linkId: linkIdFilter,- folderId: folderIdFilter,+ linkId,+ externalId,programId,} = parsedParams;- // Extract string values for specific link/folder lookup- // When domain+key is provided, it's for getting a specific link (not filtering)- const domain = getFirstFilterValue(domainFilter);- const linkId = getFirstFilterValue(linkIdFilter);- const folderId = getFirstFilterValue(folderIdFilter);-- let link: Link | null = null;-event = oldEvent || event;groupBy = oldType || groupBy;@@ -77,21 +67,29 @@ export const GET = withWorkspace(}}- if (domain) {- await getDomainOrThrow({ workspace, domain });- }-- if (linkId || externalId || (domain && key)) {- link = await getLinkOrThrow({+ let folderIdToVerify = getFirstFilterValue(folderId);+ if (!linkId && (externalId || (domain && key))) {+ const link = await getLinkOrThrow({workspaceId: workspace.id,linkId,externalId,- domain,+ domain: getFirstFilterValue(domain),key,});- }- const folderIdToVerify = link?.folderId || folderId;+ parsedParams.linkId = {+ operator: "IS",+ sqlOperator: "IN",+ values: [link.id],+ };++ // since we're filtering for a specific link, exclude domain from filters+ parsedParams.domain = undefined;++ if (link.folderId && !folderIdToVerify) {+ folderIdToVerify = link.folderId;+ }+ }if (folderIdToVerify) {await verifyFolderAccess({@@ -118,12 +116,9 @@ 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({- ...(link ? filterParams : parsedParams),+ ...parsedParams,event,groupBy,workspaceId: workspace.id,diff --git a/apps/web/lib/zod/schemas/analytics.ts b/apps/web/lib/zod/schemas/analytics.tsindex 17ca266e6f..325b6a5227 100644--- a/apps/web/lib/zod/schemas/analytics.ts+++ b/apps/web/lib/zod/schemas/analytics.ts@@ -427,7 +427,7 @@ export const analyticsQuerySchema = z.object({});/**- * Parse analytics query parameters with backward compatibility+ * Parse analytics/events query parameters with backward compatibility* Converts deprecated multiple value fields (tagIds) to singular fields (tagId)*/export function parseAnalyticsQuery(searchParams: Record<string, string>) {@@ -439,6 +439,15 @@ export function parseAnalyticsQuery(searchParams: Record<string, string>) {return data;}+export function parseEventsQuery(searchParams: Record<string, string>) {+ const data = eventsQuerySchema.parse(searchParams);++ if (data.tagIds && !data.tagId) {+ data.tagId = data.tagIds;+ }++ return data;+}// Analytics filter params for Tinybird endpointsexport const analyticsFilterTB = z.object({