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.

Fall back to UTC when billing usage receives an invalid timezone.

Kiran Kd2a5c7a1af8c
diff --git a/apps/web/lib/swr/use-usage-timeseries.ts b/apps/web/lib/swr/use-usage-timeseries.ts
index 8fcc9d2692..41dcad5516 100644
--- a/apps/web/lib/swr/use-usage-timeseries.ts
+++ b/apps/web/lib/swr/use-usage-timeseries.ts
@@ -79,6 +79,8 @@ export function useUsageTimeseries({
(gb) => gb === searchParams.get("groupBy"),
) ?? "domain";
+ const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+
const {
data: usage,
error,
@@ -99,7 +101,7 @@ export function useUsageTimeseries({
end: endOfDay(new Date(end)).toISOString(),
}),
...(interval && { interval }),
- timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
+ ...(timezone && { timezone }),
...(isLinkResource && {
...(folderId && { folderId }),
...(domain && { domain }),
diff --git a/apps/web/lib/tinybird/get-workspace-usage.ts b/apps/web/lib/tinybird/get-workspace-usage.ts
index 0416818de2..4900bf4c94 100644
--- a/apps/web/lib/tinybird/get-workspace-usage.ts
+++ b/apps/web/lib/tinybird/get-workspace-usage.ts
@@ -1,5 +1,6 @@
import { formatUTCDateTimeClickhouse } from "@/lib/analytics/utils/format-utc-datetime-clickhouse";
import { getStartEndDates } from "@/lib/analytics/utils/get-start-end-dates";
+import { sanitizeTimezone } from "@/lib/analytics/utils/sanitize-timezone";
import { prisma } from "@/lib/prisma";
import { usageQuerySchema, usageResponse } from "@/lib/zod/schemas/usage";
import * as z from "zod/v4";
@@ -39,6 +40,8 @@ export async function getWorkspaceUsage({
end,
timezone = "UTC",
}: GetWorkspaceUsageParams) {
+ timezone = sanitizeTimezone(timezone);
+
const { startDate, endDate, granularity } = getStartEndDates({
interval,
start,
diff --git a/apps/web/lib/zod/schemas/usage.ts b/apps/web/lib/zod/schemas/usage.ts
index 242ae3bb4a..4fe73a5bc3 100644
--- a/apps/web/lib/zod/schemas/usage.ts
+++ b/apps/web/lib/zod/schemas/usage.ts
@@ -1,4 +1,5 @@
import { DATE_RANGE_INTERVAL_PRESETS } from "@/lib/analytics/constants";
+import { sanitizeTimezone } from "@/lib/analytics/utils/sanitize-timezone";
import * as z from "zod/v4";
export const usageQuerySchema = z.object({
@@ -9,7 +10,11 @@ export const usageQuerySchema = z.object({
interval: z.enum(DATE_RANGE_INTERVAL_PRESETS).optional(),
start: z.string().optional(),
end: z.string().optional(),
- timezone: z.string().optional().default("UTC"),
+ timezone: z
+ .string()
+ .optional()
+ .overwrite((v) => (v === undefined ? undefined : sanitizeTimezone(v)))
+ .default("UTC"),
});
export const usageResponse = z.object({