Skip to content

armgit / umami

Public Imported from GitHub
0

Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.

Revert "refactor 6 month retention. use auth instead of cache:website". Fix share page retention bug.

Francis Cao2bd0734162c9
diff --git a/src/app/api/reports/attribution/route.ts b/src/app/api/reports/attribution/route.ts
index ab9b1ddbc..bd7d86dc7 100644
--- a/src/app/api/reports/attribution/route.ts
+++ b/src/app/api/reports/attribution/route.ts
@@ -17,8 +17,8 @@ export async function POST(request: Request) {
return unauthorized();
}
- const parameters = await setWebsiteDate(websiteId, auth.user.id, body.parameters);
- const filters = await getQueryFilters(body.filters, websiteId, auth.user?.id);
+ const parameters = await setWebsiteDate(websiteId, body.parameters);
+ const filters = await getQueryFilters(body.filters, websiteId);
const data = await getAttribution(websiteId, parameters as AttributionParameters, filters);
diff --git a/src/app/api/reports/breakdown/route.ts b/src/app/api/reports/breakdown/route.ts
index a06636c74..3c5931458 100644
--- a/src/app/api/reports/breakdown/route.ts
+++ b/src/app/api/reports/breakdown/route.ts
@@ -17,8 +17,8 @@ export async function POST(request: Request) {
return unauthorized();
}
- const parameters = await setWebsiteDate(websiteId, auth.user.id, body.parameters);
- const filters = await getQueryFilters(body.filters, websiteId, auth.user?.id);
+ const parameters = await setWebsiteDate(websiteId, body.parameters);
+ const filters = await getQueryFilters(body.filters, websiteId);
const data = await getBreakdown(websiteId, parameters as BreakdownParameters, filters);
diff --git a/src/app/api/reports/funnel/route.ts b/src/app/api/reports/funnel/route.ts
index f6e210293..c13f6f1c8 100644
--- a/src/app/api/reports/funnel/route.ts
+++ b/src/app/api/reports/funnel/route.ts
@@ -17,8 +17,8 @@ export async function POST(request: Request) {
return unauthorized();
}
- const parameters = await setWebsiteDate(websiteId, auth.user.id, body.parameters);
- const filters = await getQueryFilters(body.filters, websiteId, auth.user?.id);
+ const parameters = await setWebsiteDate(websiteId, body.parameters);
+ const filters = await getQueryFilters(body.filters, websiteId);
const data = await getFunnel(websiteId, parameters as FunnelParameters, filters);
diff --git a/src/app/api/reports/goal/route.ts b/src/app/api/reports/goal/route.ts
index db2aabcef..3bd0415d6 100644
--- a/src/app/api/reports/goal/route.ts
+++ b/src/app/api/reports/goal/route.ts
@@ -17,8 +17,8 @@ export async function POST(request: Request) {
return unauthorized();
}
- const parameters = await setWebsiteDate(websiteId, auth.user.id, body.parameters);
- const filters = await getQueryFilters(body.filters, websiteId, auth.user?.id);
+ const parameters = await setWebsiteDate(websiteId, body.parameters);
+ const filters = await getQueryFilters(body.filters, websiteId);
const data = await getGoal(websiteId, parameters as GoalParameters, filters);
diff --git a/src/app/api/reports/retention/route.ts b/src/app/api/reports/retention/route.ts
index 5adf7bb85..d1a7d698b 100644
--- a/src/app/api/reports/retention/route.ts
+++ b/src/app/api/reports/retention/route.ts
@@ -17,8 +17,8 @@ export async function POST(request: Request) {
return unauthorized();
}
- const filters = await getQueryFilters(body.filters, websiteId, auth.user?.id);
- const parameters = await setWebsiteDate(websiteId, auth.user.id, body.parameters);
+ const filters = await getQueryFilters(body.filters, websiteId);
+ const parameters = await setWebsiteDate(websiteId, body.parameters);
const data = await getRetention(websiteId, parameters as RetentionParameters, filters);
diff --git a/src/app/api/reports/revenue/route.ts b/src/app/api/reports/revenue/route.ts
index f4146b966..6a556612b 100644
--- a/src/app/api/reports/revenue/route.ts
+++ b/src/app/api/reports/revenue/route.ts
@@ -17,8 +17,8 @@ export async function POST(request: Request) {
return unauthorized();
}
- const parameters = await setWebsiteDate(websiteId, auth.user.id, body.parameters);
- const filters = await getQueryFilters(body.filters, websiteId, auth.user?.id);
+ const parameters = await setWebsiteDate(websiteId, body.parameters);
+ const filters = await getQueryFilters(body.filters, websiteId);
const data = await getRevenue(websiteId, parameters as RevenuParameters, filters);
diff --git a/src/app/api/reports/utm/route.ts b/src/app/api/reports/utm/route.ts
index d4af4da06..577fdab79 100644
--- a/src/app/api/reports/utm/route.ts
+++ b/src/app/api/reports/utm/route.ts
@@ -18,8 +18,8 @@ export async function POST(request: Request) {
return unauthorized();
}
- const filters = await getQueryFilters(body.filters, websiteId, auth.user?.id);
- const parameters = await setWebsiteDate(websiteId, auth.user.id, body.parameters);
+ const filters = await getQueryFilters(body.filters, websiteId);
+ const parameters = await setWebsiteDate(websiteId, body.parameters);
const data = {
utm_source: [],
diff --git a/src/app/api/websites/[websiteId]/event-data/events/route.ts b/src/app/api/websites/[websiteId]/event-data/events/route.ts
index 444afa273..eb6ee6ed8 100644
--- a/src/app/api/websites/[websiteId]/event-data/events/route.ts
+++ b/src/app/api/websites/[websiteId]/event-data/events/route.ts
@@ -27,7 +27,7 @@ export async function GET(
return unauthorized();
}
- const filters = await getQueryFilters(query, websiteId, auth.user?.id);
+ const filters = await getQueryFilters(query, websiteId);
const data = await getEventDataEvents(websiteId, {
...filters,
diff --git a/src/app/api/websites/[websiteId]/event-data/fields/route.ts b/src/app/api/websites/[websiteId]/event-data/fields/route.ts
index e034d9375..bce6a977c 100644
--- a/src/app/api/websites/[websiteId]/event-data/fields/route.ts
+++ b/src/app/api/websites/[websiteId]/event-data/fields/route.ts
@@ -27,7 +27,7 @@ export async function GET(
return unauthorized();
}
- const filters = await getQueryFilters(query, websiteId, auth.user?.id);
+ const filters = await getQueryFilters(query, websiteId);
const data = await getEventDataFields(websiteId, filters);
diff --git a/src/app/api/websites/[websiteId]/event-data/properties/route.ts b/src/app/api/websites/[websiteId]/event-data/properties/route.ts
index 29719fb22..52d15cfbd 100644
--- a/src/app/api/websites/[websiteId]/event-data/properties/route.ts
+++ b/src/app/api/websites/[websiteId]/event-data/properties/route.ts
@@ -27,7 +27,7 @@ export async function GET(
return unauthorized();
}
- const filters = await getQueryFilters(query, websiteId, auth.user?.id);
+ const filters = await getQueryFilters(query, websiteId);
const data = await getEventDataProperties(websiteId, filters);
diff --git a/src/app/api/websites/[websiteId]/event-data/stats/route.ts b/src/app/api/websites/[websiteId]/event-data/stats/route.ts
index 1d1e76dff..042e989a4 100644
--- a/src/app/api/websites/[websiteId]/event-data/stats/route.ts
+++ b/src/app/api/websites/[websiteId]/event-data/stats/route.ts
@@ -27,7 +27,7 @@ export async function GET(
return unauthorized();
}
- const filters = await getQueryFilters(query, websiteId, auth.user?.id);
+ const filters = await getQueryFilters(query, websiteId);
const data = await getEventDataStats(websiteId, filters);
diff --git a/src/app/api/websites/[websiteId]/event-data/values/route.ts b/src/app/api/websites/[websiteId]/event-data/values/route.ts
index ed01fb2b6..12e8f2dc0 100644
--- a/src/app/api/websites/[websiteId]/event-data/values/route.ts
+++ b/src/app/api/websites/[websiteId]/event-data/values/route.ts
@@ -30,7 +30,7 @@ export async function GET(
}
const { propertyName } = query;
- const filters = await getQueryFilters(query, websiteId, auth.user?.id);
+ const filters = await getQueryFilters(query, websiteId);
const data = await getEventDataValues(websiteId, {
...filters,
diff --git a/src/app/api/websites/[websiteId]/events/route.ts b/src/app/api/websites/[websiteId]/events/route.ts
index dfabb87fb..74ec3ece4 100644
--- a/src/app/api/websites/[websiteId]/events/route.ts
+++ b/src/app/api/websites/[websiteId]/events/route.ts
@@ -29,7 +29,7 @@ export async function GET(
return unauthorized();
}
- const filters = await getQueryFilters(query, websiteId, auth.user?.id);
+ const filters = await getQueryFilters(query, websiteId);
const data = await getWebsiteEvents(websiteId, filters);
diff --git a/src/app/api/websites/[websiteId]/events/series/route.ts b/src/app/api/websites/[websiteId]/events/series/route.ts
index d5b925590..977e9c813 100644
--- a/src/app/api/websites/[websiteId]/events/series/route.ts
+++ b/src/app/api/websites/[websiteId]/events/series/route.ts
@@ -29,7 +29,7 @@ export async function GET(
return unauthorized();
}
- const filters = await getQueryFilters(query, websiteId, auth.user?.id);
+ const filters = await getQueryFilters(query, websiteId);
const data = await getEventStats(websiteId, filters);
diff --git a/src/app/api/websites/[websiteId]/export/route.ts b/src/app/api/websites/[websiteId]/export/route.ts
index f9749f34e..eec81c6d4 100644
--- a/src/app/api/websites/[websiteId]/export/route.ts
+++ b/src/app/api/websites/[websiteId]/export/route.ts
@@ -28,7 +28,7 @@ export async function GET(
return unauthorized();
}
- const filters = await getQueryFilters(query, websiteId, auth.user?.id);
+ const filters = await getQueryFilters(query, websiteId);
const [events, pages, referrers, browsers, os, devices, countries] = await Promise.all([
getEventMetrics(websiteId, { type: 'event' }, filters),
diff --git a/src/app/api/websites/[websiteId]/metrics/expanded/route.ts b/src/app/api/websites/[websiteId]/metrics/expanded/route.ts
index 7e6fbbfdf..d52c17736 100644
--- a/src/app/api/websites/[websiteId]/metrics/expanded/route.ts
+++ b/src/app/api/websites/[websiteId]/metrics/expanded/route.ts
@@ -37,7 +37,7 @@ export async function GET(
}
const { type, limit, offset, search } = query;
- const filters = await getQueryFilters(query, websiteId, auth.user?.id);
+ const filters = await getQueryFilters(query, websiteId);
if (search) {
filters[type] = `c.${search}`;
diff --git a/src/app/api/websites/[websiteId]/metrics/route.ts b/src/app/api/websites/[websiteId]/metrics/route.ts
index 2d0e6a600..12784adbe 100644
--- a/src/app/api/websites/[websiteId]/metrics/route.ts
+++ b/src/app/api/websites/[websiteId]/metrics/route.ts
@@ -37,7 +37,7 @@ export async function GET(
}
const { type, limit, offset, search } = query;
- const filters = await getQueryFilters(query, websiteId, auth.user?.id);
+ const filters = await getQueryFilters(query, websiteId);
if (search) {
filters[type] = `c.${search}`;
diff --git a/src/app/api/websites/[websiteId]/pageviews/route.ts b/src/app/api/websites/[websiteId]/pageviews/route.ts
index dc921bc0c..af59bce46 100644
--- a/src/app/api/websites/[websiteId]/pageviews/route.ts
+++ b/src/app/api/websites/[websiteId]/pageviews/route.ts
@@ -27,7 +27,7 @@ export async function GET(
return unauthorized();
}
- const filters = await getQueryFilters(query, websiteId, auth.user?.id);
+ const filters = await getQueryFilters(query, websiteId);
const [pageviews, sessions] = await Promise.all([
getPageviewStats(websiteId, filters),
diff --git a/src/app/api/websites/[websiteId]/session-data/properties/route.ts b/src/app/api/websites/[websiteId]/session-data/properties/route.ts
index a0aed73ce..2d8db1535 100644
--- a/src/app/api/websites/[websiteId]/session-data/properties/route.ts
+++ b/src/app/api/websites/[websiteId]/session-data/properties/route.ts
@@ -27,7 +27,7 @@ export async function GET(
return unauthorized();
}
- const filters = await getQueryFilters(query, websiteId, auth.user?.id);
+ const filters = await getQueryFilters(query, websiteId);
const data = await getSessionDataProperties(websiteId, filters);
diff --git a/src/app/api/websites/[websiteId]/session-data/values/route.ts b/src/app/api/websites/[websiteId]/session-data/values/route.ts
index db7106548..7d06870ac 100644
--- a/src/app/api/websites/[websiteId]/session-data/values/route.ts
+++ b/src/app/api/websites/[websiteId]/session-data/values/route.ts
@@ -29,7 +29,7 @@ export async function GET(
}
const { propertyName } = query;
- const filters = await getQueryFilters(query, websiteId, auth.user?.id);
+ const filters = await getQueryFilters(query, websiteId);
const data = await getSessionDataValues(websiteId, {
...filters,
diff --git a/src/app/api/websites/[websiteId]/sessions/[sessionId]/activity/route.ts b/src/app/api/websites/[websiteId]/sessions/[sessionId]/activity/route.ts
index 3e70bea0a..41b766d03 100644
--- a/src/app/api/websites/[websiteId]/sessions/[sessionId]/activity/route.ts
+++ b/src/app/api/websites/[websiteId]/sessions/[sessionId]/activity/route.ts
@@ -25,7 +25,7 @@ export async function GET(
return unauthorized();
}
- const filters = await getQueryFilters(query, websiteId, auth.user?.id);
+ const filters = await getQueryFilters(query, websiteId);
const data = await getSessionActivity(websiteId, sessionId, filters);
diff --git a/src/app/api/websites/[websiteId]/sessions/route.ts b/src/app/api/websites/[websiteId]/sessions/route.ts
index f344476c3..ed4757a1c 100644
--- a/src/app/api/websites/[websiteId]/sessions/route.ts
+++ b/src/app/api/websites/[websiteId]/sessions/route.ts
@@ -28,7 +28,7 @@ export async function GET(
return unauthorized();
}
- const filters = await getQueryFilters(query, websiteId, auth.user?.id);
+ const filters = await getQueryFilters(query, websiteId);
const data = await getWebsiteSessions(websiteId, filters);
diff --git a/src/app/api/websites/[websiteId]/sessions/stats/route.ts b/src/app/api/websites/[websiteId]/sessions/stats/route.ts
index 74b4e5e80..459830edf 100644
--- a/src/app/api/websites/[websiteId]/sessions/stats/route.ts
+++ b/src/app/api/websites/[websiteId]/sessions/stats/route.ts
@@ -27,7 +27,7 @@ export async function GET(
return unauthorized();
}
- const filters = await getQueryFilters(query, websiteId, auth.user?.id);
+ const filters = await getQueryFilters(query, websiteId);
const metrics = await getWebsiteSessionStats(websiteId, filters);
diff --git a/src/app/api/websites/[websiteId]/sessions/weekly/route.ts b/src/app/api/websites/[websiteId]/sessions/weekly/route.ts
index f6dfd206b..b9ccf3ef0 100644
--- a/src/app/api/websites/[websiteId]/sessions/weekly/route.ts
+++ b/src/app/api/websites/[websiteId]/sessions/weekly/route.ts
@@ -28,7 +28,7 @@ export async function GET(
return unauthorized();
}
- const filters = await getQueryFilters(query, websiteId, auth.user?.id);
+ const filters = await getQueryFilters(query, websiteId);
const data = await getWeeklyTraffic(websiteId, filters);
diff --git a/src/app/api/websites/[websiteId]/stats/route.ts b/src/app/api/websites/[websiteId]/stats/route.ts
index 2bf862cdc..07c8b9699 100644
--- a/src/app/api/websites/[websiteId]/stats/route.ts
+++ b/src/app/api/websites/[websiteId]/stats/route.ts
@@ -27,7 +27,7 @@ export async function GET(
return unauthorized();
}
- const filters = await getQueryFilters(query, websiteId, auth.user?.id);
+ const filters = await getQueryFilters(query, websiteId);
const data = await getWebsiteStats(websiteId, filters);
diff --git a/src/app/api/websites/[websiteId]/values/route.ts b/src/app/api/websites/[websiteId]/values/route.ts
index c2c95b375..172325e3f 100644
--- a/src/app/api/websites/[websiteId]/values/route.ts
+++ b/src/app/api/websites/[websiteId]/values/route.ts
@@ -42,7 +42,7 @@ export async function GET(
value: segment.name,
}));
} else {
- const filters = await getQueryFilters(query, websiteId, auth.user?.id);
+ const filters = await getQueryFilters(query, websiteId);
values = await getValues(websiteId, FILTER_COLUMNS[type], filters);
}
diff --git a/src/lib/request.ts b/src/lib/request.ts
index d6543b184..7f9163cca 100644
--- a/src/lib/request.ts
+++ b/src/lib/request.ts
@@ -81,12 +81,12 @@ export function getRequestFilters(query: Record<string, any>) {
return result;
}
-export async function setWebsiteDate(websiteId: string, userId: string, data: Record<string, any>) {
+export async function setWebsiteDate(websiteId: string, data: Record<string, any>) {
const website = await fetchWebsite(websiteId);
const cloudMode = !!process.env.CLOUD_MODE;
if (cloudMode && website && !website.teamId) {
- const account = await fetchAccount(userId);
+ const account = await fetchAccount(website.userId);
if (!account?.hasSubscription) {
data.startDate = maxDate(data.startDate, startOfMonth(subMonths(new Date(), 6)));
@@ -103,13 +103,12 @@ export async function setWebsiteDate(websiteId: string, userId: string, data: Re
export async function getQueryFilters(
params: Record<string, any>,
websiteId?: string,
- userId?: string,
): Promise<QueryFilters> {
const dateRange = getRequestDateRange(params);
const filters = getRequestFilters(params);
if (websiteId) {
- await setWebsiteDate(websiteId, userId, dateRange);
+ await setWebsiteDate(websiteId, dateRange);
if (params.segment) {
const segmentParams = (await getWebsiteSegment(websiteId, params.segment))