diff --git a/src/app/api/me/websites/route.ts b/src/app/api/me/websites/route.ts index 9ec39c78d..0880f84e1 100644 --- a/src/app/api/me/websites/route.ts +++ b/src/app/api/me/websites/route.ts @@ -2,7 +2,7 @@ import { z } from 'zod'; import { getQueryFilters, parseRequest } from '@/lib/request'; import { json } from '@/lib/response'; import { pagingParams } from '@/lib/schema'; -import { getAllUserWebsitesIncludingTeamOwner, getUserWebsites } from '@/queries/prisma'; +import { getAllUserWebsitesIncludingTeamAccess, getUserWebsites } from '@/queries/prisma'; export async function GET(request: Request) { const schema = z.object({ @@ -19,7 +19,7 @@ export async function GET(request: Request) { const filters = await getQueryFilters(query); if (query.includeTeams) { - return json(await getAllUserWebsitesIncludingTeamOwner(auth.user.id, filters)); + return json(await getAllUserWebsitesIncludingTeamAccess(auth.user.id, filters)); } return json(await getUserWebsites(auth.user.id, filters)); diff --git a/src/app/api/users/[userId]/websites/route.ts b/src/app/api/users/[userId]/websites/route.ts index 1107d8e16..4587354fb 100644 --- a/src/app/api/users/[userId]/websites/route.ts +++ b/src/app/api/users/[userId]/websites/route.ts @@ -2,7 +2,7 @@ import { z } from 'zod'; import { getQueryFilters, parseRequest } from '@/lib/request'; import { json, unauthorized } from '@/lib/response'; import { pagingParams, searchParams } from '@/lib/schema'; -import { getAllUserWebsitesIncludingTeamOwner, getUserWebsites } from '@/queries/prisma/website'; +import { getAllUserWebsitesIncludingTeamAccess, getUserWebsites } from '@/queries/prisma/website'; export async function GET(request: Request, { params }: { params: Promise<{ userId: string }> }) { const schema = z.object({ @@ -26,7 +26,7 @@ export async function GET(request: Request, { params }: { params: Promise<{ user const filters = await getQueryFilters(query); if (query.includeTeams) { - return json(await getAllUserWebsitesIncludingTeamOwner(userId, filters)); + return json(await getAllUserWebsitesIncludingTeamAccess(userId, filters)); } return json(await getUserWebsites(userId, filters)); diff --git a/src/app/api/websites/route.ts b/src/app/api/websites/route.ts index d54aeac62..288ddfe30 100644 --- a/src/app/api/websites/route.ts +++ b/src/app/api/websites/route.ts @@ -7,7 +7,7 @@ import { json, unauthorized } from '@/lib/response'; import { pagingParams, searchParams } from '@/lib/schema'; import { canCreateTeamWebsite, canCreateWebsite } from '@/permissions'; import { createShare, createWebsite, getWebsiteCount } from '@/queries/prisma'; -import { getAllUserWebsitesIncludingTeamOwner, getUserWebsites } from '@/queries/prisma/website'; +import { getAllUserWebsitesIncludingTeamAccess, getUserWebsites } from '@/queries/prisma/website'; const CLOUD_WEBSITE_LIMIT = 3; @@ -29,7 +29,7 @@ export async function GET(request: Request) { const filters = await getQueryFilters(query); if (query.includeTeams) { - return json(await getAllUserWebsitesIncludingTeamOwner(userId, filters)); + return json(await getAllUserWebsitesIncludingTeamAccess(userId, filters)); } return json(await getUserWebsites(userId, filters)); diff --git a/src/queries/prisma/website.ts b/src/queries/prisma/website.ts index 6c69431e7..ae7ea6c96 100644 --- a/src/queries/prisma/website.ts +++ b/src/queries/prisma/website.ts @@ -42,7 +42,7 @@ export async function getWebsites(criteria: Prisma.WebsiteFindManyArgs, filters: return attachShareIdToWebsites(websites); } -export async function getAllUserWebsitesIncludingTeamOwner(userId: string, filters?: QueryFilters) { +export async function getAllUserWebsitesIncludingTeamAccess(userId: string, filters?: QueryFilters) { return getWebsites( { where: { @@ -53,7 +53,7 @@ export async function getAllUserWebsitesIncludingTeamOwner(userId: string, filte deletedAt: null, members: { some: { - role: ROLES.teamOwner, + role: { in: [ROLES.teamOwner, ROLES.teamManager] }, userId, }, },