watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-14 01:25:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merged auth into new parseRequest method.

Browse source
This commit is contained in:
Mike Cao 2025-01-25 00:19:22 -08:00
parent e51f182403
commit 2d6428172b
39 changed files with 296 additions and 316 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/app/api/websites/[websiteId]/events/route.ts
View file

@ -1,7 +1,7 @@
import { z } from 'zod';
import { checkRequest } from 'lib/request';
import { badRequest, unauthorized, json } from 'lib/response';
import { canViewWebsite, checkAuth } from 'lib/auth';
import { parseRequest } from 'lib/request';
import { unauthorized, json } from 'lib/response';
import { canViewWebsite } from 'lib/auth';
import { pagingParams } from 'lib/schema';
import { getWebsiteEvents } from 'queries';
@ -15,18 +15,16 @@ export async function GET(
...pagingParams,
});
const { query, error } = await checkRequest(request, schema);
const { auth, query, error } = await parseRequest(request, schema);
if (error) {
return badRequest(error);
return error();
}
const { websiteId } = await params;
const { startAt, endAt } = query;
const auth = await checkAuth(request);
if (!auth || !(await canViewWebsite(auth, websiteId))) {
if (!(await canViewWebsite(auth, websiteId))) {
return unauthorized();
}

14
src/app/api/websites/[websiteId]/events/series/route.ts
View file

@ -1,7 +1,7 @@
import { z } from 'zod';
import { checkRequest, getRequestDateRange, getRequestFilters } from 'lib/request';
import { badRequest, unauthorized, json } from 'lib/response';
import { canViewWebsite, checkAuth } from 'lib/auth';
import { parseRequest, getRequestDateRange, getRequestFilters } from 'lib/request';
import { unauthorized, json } from 'lib/response';
import { canViewWebsite } from 'lib/auth';
import { filterParams, timezoneParam, unitParam } from 'lib/schema';
import { getEventMetrics } from 'queries';
@ -17,19 +17,17 @@ export async function GET(
...filterParams,
});
const { query, error } = await checkRequest(request, schema);
const { auth, query, error } = await parseRequest(request, schema);
if (error) {
return badRequest(error);
return error();
}
const { websiteId } = await params;
const { timezone } = query;
const { startDate, endDate, unit } = await getRequestDateRange(request);
const auth = await checkAuth(request);
if (!auth || !(await canViewWebsite(auth, websiteId))) {
if (!(await canViewWebsite(auth, websiteId))) {
return unauthorized();
}