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.

refactor 6 month retention. use auth instead of cache:website

Francis Cao741c6039e600
diff --git a/src/app/api/reports/attribution/route.ts b/src/app/api/reports/attribution/route.ts
index bd7d86dc7..c487120f1 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, body.parameters);
- const filters = await getQueryFilters(body.filters, websiteId);
+ const parameters = await setWebsiteDate(websiteId, auth.user.id, body.parameters);
+ const filters = await getQueryFilters(body.filters, websiteId, auth.user.id);
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 3c5931458..4464afaaa 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, body.parameters);
- const filters = await getQueryFilters(body.filters, websiteId);
+ const parameters = await setWebsiteDate(websiteId, auth.user.id, body.parameters);
+ const filters = await getQueryFilters(body.filters, websiteId, auth.user.id);
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 c13f6f1c8..0d1fbf593 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, body.parameters);
- const filters = await getQueryFilters(body.filters, websiteId);
+ const parameters = await setWebsiteDate(websiteId, auth.user.id, body.parameters);
+ const filters = await getQueryFilters(body.filters, websiteId, auth.user.id);
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 3bd0415d6..4f376bd1d 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, body.parameters);
- const filters = await getQueryFilters(body.filters, websiteId);
+ const parameters = await setWebsiteDate(websiteId, auth.user.id, body.parameters);
+ const filters = await getQueryFilters(body.filters, websiteId, auth.user.id);
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 d1a7d698b..33e226619 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);
- const parameters = await setWebsiteDate(websiteId, body.parameters);
+ const filters = await getQueryFilters(body.filters, websiteId, auth.user.id);
+ const parameters = await setWebsiteDate(websiteId, auth.user.id, 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 6a556612b..1d3d54bf6 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, body.parameters);
- const filters = await getQueryFilters(body.filters, websiteId);
+ const parameters = await setWebsiteDate(websiteId, auth.user.id, body.parameters);
+ const filters = await getQueryFilters(body.filters, websiteId, auth.user.id);
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 577fdab79..6c6ff9065 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);
- const parameters = await setWebsiteDate(websiteId, body.parameters);
+ const filters = await getQueryFilters(body.filters, websiteId, auth.user.id);
+ const parameters = await setWebsiteDate(websiteId, auth.user.id, 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 eb6ee6ed8..dec689967 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);
+ const filters = await getQueryFilters(query, websiteId, auth.user.id);
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 bce6a977c..b6b3bd787 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);
+ const filters = await getQueryFilters(query, websiteId, auth.user.id);
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 52d15cfbd..ad4be6612 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);
+ const filters = await getQueryFilters(query, websiteId, auth.user.id);
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 042e989a4..141f0531b 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);
+ const filters = await getQueryFilters(query, websiteId, auth.user.id);
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 12e8f2dc0..10f8847b0 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);
+ const filters = await getQueryFilters(query, websiteId, auth.user.id);
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 74ec3ece4..69dcaf057 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);
+ const filters = await getQueryFilters(query, websiteId, auth.user.id);
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 977e9c813..8df3d36c1 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);
+ const filters = await getQueryFilters(query, websiteId, auth.user.id);
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 eec81c6d4..9e20cd009 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);
+ const filters = await getQueryFilters(query, websiteId, auth.user.id);
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 d52c17736..bb84bf139 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);
+ const filters = await getQueryFilters(query, websiteId, auth.user.id);
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 12784adbe..2b1487f21 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);
+ const filters = await getQueryFilters(query, websiteId, auth.user.id);
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 af59bce46..628d53358 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);
+ const filters = await getQueryFilters(query, websiteId, auth.user.id);
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 2d8db1535..227700d23 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);
+ const filters = await getQueryFilters(query, websiteId, auth.user.id);
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 7d06870ac..4c1f3f251 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);
+ const filters = await getQueryFilters(query, websiteId, auth.user.id);
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 41b766d03..40ad362cb 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);
+ const filters = await getQueryFilters(query, websiteId, auth.user.id);
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 ed4757a1c..e0d00cf59 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);
+ const filters = await getQueryFilters(query, websiteId, auth.user.id);
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 459830edf..7393b5804 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);
+ const filters = await getQueryFilters(query, websiteId, auth.user.id);
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 b9ccf3ef0..075ddea59 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);
+ const filters = await getQueryFilters(query, websiteId, auth.user.id);
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 07c8b9699..f307325a6 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);
+ const filters = await getQueryFilters(query, websiteId, auth.user.id);
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 172325e3f..7b8bd58e3 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);
+ const filters = await getQueryFilters(query, websiteId, auth.user.id);
values = await getValues(websiteId, FILTER_COLUMNS[type], filters);
}
diff --git a/src/app/api/websites/route.ts b/src/app/api/websites/route.ts
index e2b26c108..dd8e0ffdd 100644
--- a/src/app/api/websites/route.ts
+++ b/src/app/api/websites/route.ts
@@ -1,6 +1,6 @@
import { z } from 'zod';
import { uuid } from '@/lib/crypto';
-import redis from '@/lib/redis';
+import { fetchAccount } from '@/lib/load';
import { getQueryFilters, parseRequest } from '@/lib/request';
import { json, unauthorized } from '@/lib/response';
import { pagingParams, searchParams } from '@/lib/schema';
@@ -52,7 +52,7 @@ export async function POST(request: Request) {
const { id, name, domain, shareId, teamId } = body;
if (process.env.CLOUD_MODE && !teamId) {
- const account = await redis.client.get(`account:${auth.user.id}`);
+ const account = await fetchAccount(auth.user.id);
if (!account?.hasSubscription) {
const count = await getWebsiteCount(auth.user.id);
diff --git a/src/lib/load.ts b/src/lib/load.ts
index d143344a5..bf527975f 100644
--- a/src/lib/load.ts
+++ b/src/lib/load.ts
@@ -39,14 +39,8 @@ export async function fetchSession(websiteId: string, sessionId: string): Promis
return session;
}
-export async function fetchAccount(websiteId: string) {
- let account = null;
-
- const cache = await redis.client.get(`cache:website:${websiteId}`);
-
- if (cache) {
- account = await redis.client.get(`account:${cache.account_id}`);
- }
+export async function fetchAccount(userId: string) {
+ const account = await redis.client.get(`account:${userId}`);
return account;
}
diff --git a/src/lib/request.ts b/src/lib/request.ts
index f5b984810..e6450bf31 100644
--- a/src/lib/request.ts
+++ b/src/lib/request.ts
@@ -17,7 +17,7 @@ export async function parseRequest(
const url = new URL(request.url);
let query = Object.fromEntries(url.searchParams);
let body = await getJsonBody(request);
- let error: () => undefined | undefined;
+ let error: () => undefined | undefined | Response;
let auth = null;
if (schema) {
@@ -81,12 +81,12 @@ export function getRequestFilters(query: Record<string, any>) {
return result;
}
-export async function setWebsiteDate(websiteId: string, data: Record<string, any>) {
+export async function setWebsiteDate(websiteId: string, userId: string, data: Record<string, any>) {
const website = await fetchWebsite(websiteId);
const cloudMode = !!process.env.CLOUD_MODE;
- if (cloudMode) {
- const account = await fetchAccount(websiteId);
+ if (cloudMode && !website.teamId) {
+ const account = await fetchAccount(userId);
if (!account?.hasSubscription) {
data.startDate = maxDate(data.startDate, startOfMonth(subMonths(new Date(), 6)));
@@ -103,12 +103,13 @@ export async function setWebsiteDate(websiteId: string, data: Record<string, any
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, dateRange);
+ await setWebsiteDate(websiteId, userId, dateRange);
if (params.segment) {
const segmentParams = (await getWebsiteSegment(websiteId, params.segment))