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.

sanitization out of the transform and into parse

Pedro Ladeiraa19337b45371
diff --git a/apps/web/app/(ee)/api/partners/applications/analytics/route.ts b/apps/web/app/(ee)/api/partners/applications/analytics/route.ts
index 6473c6f05f..aa485f9aca 100644
--- a/apps/web/app/(ee)/api/partners/applications/analytics/route.ts
+++ b/apps/web/app/(ee)/api/partners/applications/analytics/route.ts
@@ -1,4 +1,5 @@
import { getStartEndDates } from "@/lib/analytics/utils/get-start-end-dates";
+import { sanitizeTimezone } from "@/lib/analytics/utils/sanitize-timezone";
import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
import {
applicationEventAnalyticsQuerySchema,
@@ -53,7 +54,7 @@ export const GET = withWorkspace(async ({ workspace, searchParams }) => {
} = parsedFilters;
// Align with CONVERT_TZ in raw SQL and analyticsQuerySchema default (UTC when omitted).
- const timezone = timezoneParam ?? "UTC";
+ const timezone = sanitizeTimezone(timezoneParam);
const { startDate, endDate } = getStartEndDates({
interval,
diff --git a/apps/web/lib/zod/schemas/analytics.ts b/apps/web/lib/zod/schemas/analytics.ts
index ae14b4abda..9c3b73bbc5 100644
--- a/apps/web/lib/zod/schemas/analytics.ts
+++ b/apps/web/lib/zod/schemas/analytics.ts
@@ -168,7 +168,6 @@ export const analyticsQuerySchema = z.object({
timezone: z
.string()
.optional()
- .transform(sanitizeTimezone)
.describe(
"The IANA time zone code for aligning timeseries granularity (e.g. America/New_York). Defaults to UTC.",
)
@@ -401,6 +400,10 @@ export function parseAnalyticsQuery(searchParams: Record<string, string>) {
data.tagId = data.tagIds;
}
+ if (data.timezone !== undefined) {
+ data.timezone = sanitizeTimezone(data.timezone);
+ }
+
return data;
}
export function parseEventsQuery(searchParams: Record<string, string>) {
@@ -410,6 +413,10 @@ export function parseEventsQuery(searchParams: Record<string, string>) {
data.tagId = data.tagIds;
}
+ if (data.timezone !== undefined) {
+ data.timezone = sanitizeTimezone(data.timezone);
+ }
+
return data;
}