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.

Sanitize timezone in analytics date range and query schema

Kiran Ke7d67655addc
diff --git a/apps/web/lib/analytics/utils/get-start-end-dates.ts b/apps/web/lib/analytics/utils/get-start-end-dates.ts
index 87c5ff1990..e86fd93418 100644
--- a/apps/web/lib/analytics/utils/get-start-end-dates.ts
+++ b/apps/web/lib/analytics/utils/get-start-end-dates.ts
@@ -1,6 +1,7 @@
import { tz, TZDate } from "@date-fns/tz";
import { differenceInDays, endOfDay, startOfDay } from "date-fns";
import { getIntervalData } from "./get-interval-data";
+import { sanitizeTimezone } from "./sanitize-timezone";
export const getStartEndDates = ({
interval,
@@ -15,6 +16,8 @@ export const getStartEndDates = ({
dataAvailableFrom?: Date;
timezone?: string;
}) => {
+ timezone = sanitizeTimezone(timezone);
+
let startDate: TZDate;
let endDate: TZDate;
let granularity: "minute" | "hour" | "day" | "month" = "day";
@@ -26,7 +29,7 @@ export const getStartEndDates = ({
endDate = endOfDay(new TZDate(new Date(end ?? Date.now()), timezone));
const daysDifference = differenceInDays(endDate, startDate, {
- in: timezone ? tz(timezone) : undefined,
+ in: tz(timezone),
});
if (daysDifference <= 2) {
diff --git a/apps/web/lib/zod/schemas/analytics.ts b/apps/web/lib/zod/schemas/analytics.ts
index 0140736a5f..ae14b4abda 100644
--- a/apps/web/lib/zod/schemas/analytics.ts
+++ b/apps/web/lib/zod/schemas/analytics.ts
@@ -5,6 +5,7 @@ import {
OLD_TO_NEW_ANALYTICS_ENDPOINTS,
VALID_ANALYTICS_ENDPOINTS,
} from "@/lib/analytics/constants";
+import { sanitizeTimezone } from "@/lib/analytics/utils/sanitize-timezone";
import {
DEFAULT_PAGINATION_LIMIT,
DUB_FOUNDING_DATE,
@@ -167,6 +168,7 @@ 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.",
)