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

Merge branch 'dev' of https://github.com/umami-software/umami into dev

Browse source
This commit is contained in:
Mike Cao 2025-09-17 08:38:19 -07:00
commit 23838c57fb
2 changed files with 28 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/app/api/users/[userId]/websites/route.ts
View file

@ -1,8 +1,8 @@
import { z } from 'zod'; import { z } from 'zod';
import { unauthorized, json } from '@/lib/response'; import { unauthorized, json } from '@/lib/response';
import { getAllUserWebsitesIncludingTeamOwner, getUserWebsites } from '@/queries/prisma/website';
import { pagingParams, searchParams } from '@/lib/schema'; import { pagingParams, searchParams } from '@/lib/schema';
import { getQueryFilters, parseRequest } from '@/lib/request'; import { getQueryFilters, parseRequest } from '@/lib/request';
import { getAllUserWebsitesIncludingTeamOwner, getUserWebsites } from '@/queries/prisma/website';
export async function GET(request: Request, { params }: { params: Promise<{ userId: string }> }) { export async function GET(request: Request, { params }: { params: Promise<{ userId: string }> }) {
const schema = z.object({ const schema = z.object({
@ -26,7 +26,7 @@ export async function GET(request: Request, { params }: { params: Promise<{ user
const filters = await getQueryFilters(query); const filters = await getQueryFilters(query);
if (query.includeTeams) { if (query.includeTeams) {
return json(await getAllUserWebsitesIncludingTeamOwner(auth.user.id, filters)); return json(await getAllUserWebsitesIncludingTeamOwner(userId, filters));
} }
return json(await getUserWebsites(userId, filters)); return json(await getUserWebsites(userId, filters));

28
src/app/api/websites/route.ts
View file

@ -2,10 +2,34 @@ import { z } from 'zod';
import { canCreateTeamWebsite, canCreateWebsite } from '@/permissions'; import { canCreateTeamWebsite, canCreateWebsite } from '@/permissions';
import { json, unauthorized } from '@/lib/response'; import { json, unauthorized } from '@/lib/response';
import { uuid } from '@/lib/crypto'; import { uuid } from '@/lib/crypto';
import { parseRequest } from '@/lib/request'; import { getQueryFilters, parseRequest } from '@/lib/request';
import { pagingParams, searchParams } from '@/lib/schema';
import { createWebsite } from '@/queries'; import { createWebsite } from '@/queries';
import { getAllUserWebsitesIncludingTeamOwner, getUserWebsites } from '@/queries/prisma/website';
export { GET } from '@/app/api/users/[userId]/websites/route'; export async function GET(request: Request) {
const schema = z.object({
...pagingParams,
...searchParams,
includeTeams: z.string().optional(),
});
const { auth, query, error } = await parseRequest(request, schema);
if (error) {
return error();
}
const userId = auth.user.id;
const filters = await getQueryFilters(query);
if (query.includeTeams) {
return json(await getAllUserWebsitesIncludingTeamOwner(userId, filters));
}
return json(await getUserWebsites(userId, filters));
}
export async function POST(request: Request) { export async function POST(request: Request) {
const schema = z.object({ const schema = z.object({