watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-08 14:47:14 +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

13
src/app/api/users/[userId]/usage/route.ts
View file

@ -1,10 +1,9 @@
import { z } from 'zod';
import { json, unauthorized, badRequest } from 'lib/response';
import { json, unauthorized } from 'lib/response';
import { getAllUserWebsitesIncludingTeamOwner } from 'queries/prisma/website';
import { getEventUsage } from 'queries/analytics/events/getEventUsage';
import { getEventDataUsage } from 'queries/analytics/events/getEventDataUsage';
import { checkAuth } from 'lib/auth';
import { checkRequest } from 'lib/request';
import { parseRequest } from 'lib/request';
export async function GET(request: Request, { params }: { params: Promise<{ userId: string }> }) {
const schema = z.object({
@ -12,15 +11,13 @@ export async function GET(request: Request, { params }: { params: Promise<{ user
endAt: z.coerce.number().int(),
});
const { query, error } = await checkRequest(request, schema);
const { auth, query, error } = await parseRequest(request, schema);
if (error) {
return badRequest(error);
return error();
}
const auth = await checkAuth(request);
if (!auth || !auth.user.isAdmin) {
if (!auth.user.isAdmin) {
return unauthorized();
}