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

18
src/app/api/teams/[teamId]/users/route.ts
View file

@ -1,7 +1,7 @@
import { z } from 'zod';
import { unauthorized, json, badRequest } from 'lib/response';
import { canAddUserToTeam, canUpdateTeam, checkAuth } from 'lib/auth';
import { checkRequest } from 'lib/request';
import { canAddUserToTeam, canUpdateTeam } from 'lib/auth';
import { parseRequest } from 'lib/request';
import { pagingParams, roleParam } from 'lib/schema';
import { createTeamUser, getTeamUser, getTeamUsers } from 'queries';
@ -10,16 +10,14 @@ export async function GET(request: Request, { params }: { params: Promise<{ team
...pagingParams,
});
const { query, error } = await checkRequest(request, schema);
const { auth, query, error } = await parseRequest(request, schema);
if (error) {
return badRequest(error);
return error();
}
const { teamId } = await params;
const auth = await checkAuth(request);
if (!(await canUpdateTeam(auth, teamId))) {
return unauthorized('You must be the owner of this team.');
}
@ -55,17 +53,15 @@ export async function POST(
role: roleParam,
});
const { body, error } = await checkRequest(request, schema);
const { auth, body, error } = await parseRequest(request, schema);
if (error) {
return badRequest(error);
return error();
}
const { teamId } = await params;
const auth = await checkAuth(request);
if (!auth || !(await canAddUserToTeam(auth))) {
if (!(await canAddUserToTeam(auth))) {
return unauthorized();
}