mirror of
https://github.com/umami-software/umami.git
synced 2026-02-23 05:55:35 +01:00
Compare commits
No commits in common. "03933bea7a4f715e0b3d6024ec3bff8db58b0c7e" and "a4a9d6c227bdd93c4e260b73027adeb3fa01238a" have entirely different histories.
03933bea7a
...
a4a9d6c227
2 changed files with 4 additions and 28 deletions
|
|
@ -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(userId, filters));
|
return json(await getAllUserWebsitesIncludingTeamOwner(auth.user.id, filters));
|
||||||
}
|
}
|
||||||
|
|
||||||
return json(await getUserWebsites(userId, filters));
|
return json(await getUserWebsites(userId, filters));
|
||||||
|
|
|
||||||
|
|
@ -2,34 +2,10 @@ 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 { getQueryFilters, parseRequest } from '@/lib/request';
|
import { 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 async function GET(request: Request) {
|
export { GET } from '@/app/api/users/[userId]/websites/route';
|
||||||
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({
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue