🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
fix teams (#1039)
Goldflag8a9487ad0830
diff --git a/client/messages/cs.json b/client/messages/cs.jsonindex ebd8ee66b..a43297142 100644--- a/client/messages/cs.json+++ b/client/messages/cs.json@@ -1555,5 +1555,8 @@"QOaR8l": "","IQ5tZg": "","+B+qvw": "",- "vDpLV2": ""+ "vDpLV2": "",+ "qO9iuL": "Přístup udělen prostřednictvím webů tohoto týmu",+ "9YyR5G": "Tento člen bude mít přístup k vybraným webům a také k webům uděleným prostřednictvím jeho týmů ({teams}).",+ "wDjYR2": "Tento člen má přístup k webům uděleným prostřednictvím jeho týmů ({teams}) a také ke všem webům nepřiřazeným žádnému týmu."}diff --git a/client/messages/de.json b/client/messages/de.jsonindex bbe337823..1188b50d0 100644--- a/client/messages/de.json+++ b/client/messages/de.json@@ -1555,5 +1555,8 @@"QOaR8l": "Formular an \"{action}\" gesendet","IQ5tZg": "Formular abgesendet","+B+qvw": "{type}eingabefeld \"{name}\" geändert",- "vDpLV2": "{type}eingabefeld geändert"+ "vDpLV2": "{type}eingabefeld geändert",+ "qO9iuL": "Zugriff über die Websites dieses Teams",+ "9YyR5G": "Dieses Mitglied hat Zugriff auf die ausgewählten Websites sowie auf Websites, die über seine Teams ({teams}) gewährt werden.",+ "wDjYR2": "Dieses Mitglied hat Zugriff auf Websites, die über seine Teams ({teams}) gewährt werden, sowie auf alle Websites, die keinem Team zugewiesen sind."}diff --git a/client/messages/en.json b/client/messages/en.jsonindex a6833b2ae..9fe63ca42 100644--- a/client/messages/en.json+++ b/client/messages/en.json@@ -1555,5 +1555,8 @@"QOaR8l": "Submitted form to \"{action}\"","IQ5tZg": "Submitted form","+B+qvw": "Changed {type}input \"{name}\"",- "vDpLV2": "Changed {type}input"+ "vDpLV2": "Changed {type}input",+ "qO9iuL": "Access granted through this team's sites",+ "9YyR5G": "This member will have access to the selected sites, plus sites granted through their teams ({teams}).",+ "wDjYR2": "This member has access to sites granted through their teams ({teams}), plus any site not assigned to a team."}diff --git a/client/messages/es.json b/client/messages/es.jsonindex 3d02e923b..14f6f400a 100644--- a/client/messages/es.json+++ b/client/messages/es.json@@ -1555,5 +1555,8 @@"QOaR8l": "Formulario enviado a \"{action}\"","IQ5tZg": "Formulario enviado","+B+qvw": "{type}campo de entrada \"{name}\" cambiado",- "vDpLV2": "{type}campo de entrada cambiado"+ "vDpLV2": "{type}campo de entrada cambiado",+ "qO9iuL": "Acceso concedido a través de los sitios de este equipo",+ "9YyR5G": "Este miembro tendrá acceso a los sitios seleccionados, además de los sitios concedidos a través de sus equipos ({teams}).",+ "wDjYR2": "Este miembro tiene acceso a los sitios concedidos a través de sus equipos ({teams}), además de cualquier sitio no asignado a un equipo."}diff --git a/client/messages/fr.json b/client/messages/fr.jsonindex b51cd68e0..03b821d22 100644--- a/client/messages/fr.json+++ b/client/messages/fr.json@@ -1555,5 +1555,8 @@"QOaR8l": "Formulaire soumis à \"{action}\"","IQ5tZg": "Formulaire soumis","+B+qvw": "{type}champ de saisie \"{name}\" modifié",- "vDpLV2": "{type}champ de saisie modifié"+ "vDpLV2": "{type}champ de saisie modifié",+ "qO9iuL": "Accès accordé via les sites de cette équipe",+ "9YyR5G": "Ce membre aura accès aux sites sélectionnés, ainsi qu'aux sites accordés via ses équipes ({teams}).",+ "wDjYR2": "Ce membre a accès aux sites accordés via ses équipes ({teams}), ainsi qu'à tout site non attribué à une équipe."}diff --git a/client/messages/it.json b/client/messages/it.jsonindex 891e99dad..008ef1ea2 100644--- a/client/messages/it.json+++ b/client/messages/it.json@@ -1555,5 +1555,8 @@"QOaR8l": "Modulo inviato a \"{action}\"","IQ5tZg": "Modulo inviato","+B+qvw": "{type}campo di input \"{name}\" modificato",- "vDpLV2": "{type}campo di input modificato"+ "vDpLV2": "{type}campo di input modificato",+ "qO9iuL": "Accesso concesso tramite i siti di questo team",+ "9YyR5G": "Questo membro avrà accesso ai siti selezionati, oltre ai siti concessi tramite i suoi team ({teams}).",+ "wDjYR2": "Questo membro ha accesso ai siti concessi tramite i suoi team ({teams}), oltre a qualsiasi sito non assegnato a un team."}diff --git a/client/messages/ja.json b/client/messages/ja.jsonindex 1334431f4..0b2ac0fe9 100644--- a/client/messages/ja.json+++ b/client/messages/ja.json@@ -1555,5 +1555,8 @@"QOaR8l": "「{action}」にフォームを送信しました","IQ5tZg": "フォームを送信しました","+B+qvw": "{type}入力フィールド「{name}」を変更しました",- "vDpLV2": "{type}入力フィールドを変更しました"+ "vDpLV2": "{type}入力フィールドを変更しました",+ "qO9iuL": "このチームのサイトを通じて付与されたアクセス",+ "9YyR5G": "このメンバーは、選択したサイトに加えて、所属チーム({teams})を通じて付与されたサイトにアクセスできます。",+ "wDjYR2": "このメンバーは、所属チーム({teams})を通じて付与されたサイトに加えて、チームに割り当てられていないすべてのサイトにアクセスできます。"}diff --git a/client/messages/ko.json b/client/messages/ko.jsonindex c6845e861..f7e0e1ffc 100644--- a/client/messages/ko.json+++ b/client/messages/ko.json@@ -1555,5 +1555,8 @@"QOaR8l": "\"{action}\"에 양식 제출됨","IQ5tZg": "양식 제출됨","+B+qvw": "{type}입력 필드 \"{name}\" 변경됨",- "vDpLV2": "{type}입력 필드 변경됨"+ "vDpLV2": "{type}입력 필드 변경됨",+ "qO9iuL": "이 팀의 사이트를 통해 부여된 액세스",+ "9YyR5G": "이 멤버는 선택한 사이트와 함께 소속 팀({teams})을 통해 부여된 사이트에 액세스할 수 있습니다.",+ "wDjYR2": "이 멤버는 소속 팀({teams})을 통해 부여된 사이트와 함께 팀에 할당되지 않은 모든 사이트에 액세스할 수 있습니다."}diff --git a/client/messages/pl.json b/client/messages/pl.jsonindex 119c0b96c..0589d5781 100644--- a/client/messages/pl.json+++ b/client/messages/pl.json@@ -1555,5 +1555,8 @@"QOaR8l": "Przesłano formularz do \"{action}\"","IQ5tZg": "Przesłano formularz","+B+qvw": "Zmieniono {type}pole wprowadzania \"{name}\"",- "vDpLV2": "Zmieniono {type}pole wprowadzania"+ "vDpLV2": "Zmieniono {type}pole wprowadzania",+ "qO9iuL": "Dostęp przyznany poprzez witryny tego zespołu",+ "9YyR5G": "Ten członek będzie mieć dostęp do wybranych witryn oraz do witryn przyznanych poprzez jego zespoły ({teams}).",+ "wDjYR2": "Ten członek ma dostęp do witryn przyznanych poprzez jego zespoły ({teams}) oraz do wszystkich witryn nieprzypisanych do żadnego zespołu."}diff --git a/client/messages/pt.json b/client/messages/pt.jsonindex 9d82c2f57..417a41c0b 100644--- a/client/messages/pt.json+++ b/client/messages/pt.json@@ -1555,5 +1555,8 @@"QOaR8l": "Formulário enviado para \"{action}\"","IQ5tZg": "Formulário enviado","+B+qvw": "{type}campo de entrada \"{name}\" alterado",- "vDpLV2": "{type}campo de entrada alterado"+ "vDpLV2": "{type}campo de entrada alterado",+ "qO9iuL": "Acesso concedido através dos sites desta equipe",+ "9YyR5G": "Este membro terá acesso aos sites selecionados, além dos sites concedidos através de suas equipes ({teams}).",+ "wDjYR2": "Este membro tem acesso aos sites concedidos através de suas equipes ({teams}), além de qualquer site não atribuído a uma equipe."}diff --git a/client/messages/uk.json b/client/messages/uk.jsonindex 5713ba885..a0be0a4ee 100644--- a/client/messages/uk.json+++ b/client/messages/uk.json@@ -1555,5 +1555,8 @@"QOaR8l": "","IQ5tZg": "","+B+qvw": "",- "vDpLV2": ""+ "vDpLV2": "",+ "qO9iuL": "Доступ надано через сайти цієї команди",+ "9YyR5G": "Цей учасник матиме доступ до вибраних сайтів, а також до сайтів, наданих через його команди ({teams}).",+ "wDjYR2": "Цей учасник має доступ до сайтів, наданих через його команди ({teams}), а також до будь-яких сайтів, не призначених жодній команді."}diff --git a/client/messages/zh.json b/client/messages/zh.jsonindex 5182963e2..5b56c2941 100644--- a/client/messages/zh.json+++ b/client/messages/zh.json@@ -1555,5 +1555,8 @@"QOaR8l": "已提交表单到 \"{action}\"","IQ5tZg": "已提交表单","+B+qvw": "已更改 {type}输入框 \"{name}\"",- "vDpLV2": "已更改 {type}输入框"+ "vDpLV2": "已更改 {type}输入框",+ "qO9iuL": "通过此团队的网站授予的访问权限",+ "9YyR5G": "该成员将可以访问所选网站,以及通过其团队({teams})授予的网站。",+ "wDjYR2": "该成员可以访问通过其团队({teams})授予的网站,以及任何未分配给团队的网站。"}diff --git a/client/src/api/admin/endpoints/auth.ts b/client/src/api/admin/endpoints/auth.tsindex a4996230e..8925a619f 100644--- a/client/src/api/admin/endpoints/auth.ts+++ b/client/src/api/admin/endpoints/auth.ts@@ -16,6 +16,10 @@ export type GetOrganizationMembersResponse = {hasRestrictedSiteAccess: boolean;siteIds: number[];};+ teams: {+ id: string;+ name: string;+ }[];}[];};diff --git a/client/src/app/settings/organization/components/EditMemberDialog.tsx b/client/src/app/settings/organization/components/EditMemberDialog.tsxindex 5fd96110a..6a19f2700 100644--- a/client/src/app/settings/organization/components/EditMemberDialog.tsx+++ b/client/src/app/settings/organization/components/EditMemberDialog.tsx@@ -201,12 +201,22 @@ export function EditMemberDialog({<div className="pl-6"><SiteAccessMultiSelect selectedSiteIds={selectedSiteIds} onChange={setSelectedSiteIds} /><p className="text-xs text-neutral-500 dark:text-neutral-300 mt-2">- {t("This member will only have access to the selected sites.")}+ {member.teams?.length+ ? t(+ "This member will have access to the selected sites, plus sites granted through their teams ({teams}).",+ { teams: member.teams.map(team => team.name).join(", ") }+ )+ : t("This member will only have access to the selected sites.")}</p></div>) : (<p className="text-sm text-neutral-500 dark:text-neutral-300 pl-6">- {t("This member has access to all sites in the organization.")}+ {member.teams?.length+ ? t(+ "This member has access to sites granted through their teams ({teams}), plus any site not assigned to a team.",+ { teams: member.teams.map(team => team.name).join(", ") }+ )+ : t("This member has access to all sites in the organization.")}</p>)}</>diff --git a/client/src/app/settings/organization/components/MembersTable.tsx b/client/src/app/settings/organization/components/MembersTable.tsxindex 27d831d8f..549563775 100644--- a/client/src/app/settings/organization/components/MembersTable.tsx+++ b/client/src/app/settings/organization/components/MembersTable.tsx@@ -122,17 +122,28 @@ export function MembersTable({</TableCell><TableCell>{member.role === "member" ? (- <Badge- variant={- member.siteAccess?.hasRestrictedSiteAccess ? "default" : "secondary"- }- >- {member.siteAccess?.hasRestrictedSiteAccess- ? t("{count} sites", {+ <div className="flex flex-wrap gap-1">+ {member.siteAccess?.hasRestrictedSiteAccess && (+ <Badge variant="default">+ {t("{count} sites", {count: String(member.siteAccess.siteIds.length),- })- : t("All sites")}- </Badge>+ })}+ </Badge>+ )}+ {member.teams?.map(team => (+ <Badge+ key={team.id}+ variant="outline"+ title={t("Access granted through this team's sites")}+ >+ {team.name}+ </Badge>+ ))}+ {!member.siteAccess?.hasRestrictedSiteAccess &&+ !member.teams?.length && (+ <Badge variant="secondary">{t("All sites")}</Badge>+ )}+ </div>) : (<Badge variant="outline">{t("All sites")}</Badge>)}diff --git a/server/package-lock.json b/server/package-lock.jsonindex 92270af44..6b6c7c265 100644--- a/server/package-lock.json+++ b/server/package-lock.json@@ -53,6 +53,7 @@"zod": "3.24.4"},"devDependencies": {+ "@electric-sql/pglite": "^0.5.4","@types/jsdom": "^21.1.7","@types/luxon": "3.7.1","@types/node": "^20.14.8",@@ -1439,6 +1440,13 @@"dev": true,"license": "Apache-2.0"},+ "node_modules/@electric-sql/pglite": {+ "version": "0.5.4",+ "resolved": "https://registry.npmjs.org/@electric-sql/pglite/-/pglite-0.5.4.tgz",+ "integrity": "sha512-yYZUyyXrHU7tPlCjwZQJ6hIG9DscdCCn7Uk0mYKwC1FeHX286AbcmFveMiRBEak8e9iPupjsoVImN3yJZVed2g==",+ "dev": true,+ "license": "Apache-2.0"+ },"node_modules/@emnapi/core": {"version": "1.7.1","resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.7.1.tgz",diff --git a/server/package.json b/server/package.jsonindex d2c485953..628166ba5 100644--- a/server/package.json+++ b/server/package.json@@ -74,6 +74,7 @@"zod": "3.24.4"},"devDependencies": {+ "@electric-sql/pglite": "^0.5.4","@types/jsdom": "^21.1.7","@types/luxon": "3.7.1","@types/node": "^20.14.8",diff --git a/server/src/api/sites/getSitesFromOrg.ts b/server/src/api/sites/getSitesFromOrg.tsindex 8bb81b054..ef898123a 100644--- a/server/src/api/sites/getSitesFromOrg.ts+++ b/server/src/api/sites/getSitesFromOrg.ts@@ -1,18 +1,11 @@-import { eq, and, inArray } from "drizzle-orm";+import { and, eq } from "drizzle-orm";import { FastifyRequest, FastifyReply } from "fastify";import { clickhouse } from "../../db/clickhouse/clickhouse.js";import { db } from "../../db/postgres/postgres.js";-import {- sites,- member,- organization,- memberSiteAccess,- team,- teamMember,- teamSiteAccess,-} from "../../db/postgres/schema.js";+import { sites, member, organization, team, teamSiteAccess } from "../../db/postgres/schema.js";import { IS_CLOUD, DEFAULT_EVENT_LIMIT } from "../../lib/const.js";import { getUserIdFromRequest } from "../../lib/auth-utils.js";+import { filterSitesByMemberAccess } from "../../lib/siteAccess.js";import { processResults } from "../analytics/utils/utils.js";import { getSubscriptionInner } from "../stripe/getSubscription.js";@@ -43,57 +36,18 @@ export async function getSitesFromOrg(db.select().from(organization).where(eq(organization.id, organizationId)).limit(1),]);- // Filter sites based on member's access restrictions+ // Filter sites based on member's access restrictions and teamslet sitesData = allSitesData;const memberRecord = memberCheck[0];- if (memberRecord?.role === "member" && memberRecord.hasRestrictedSiteAccess) {- // Get the sites this member has access to- const accessibleSites = await db- .select({ siteId: memberSiteAccess.siteId })- .from(memberSiteAccess)- .where(eq(memberSiteAccess.memberId, memberRecord.id));-- const accessibleSiteIds = new Set(accessibleSites.map(s => s.siteId));- sitesData = allSitesData.filter(site => accessibleSiteIds.has(site.siteId));- }-- // Team-based filtering for regular membersif (memberRecord?.role === "member" && userId) {- // Find all team-gated site IDs in this org- const allTeamSites = await db- .select({ siteId: teamSiteAccess.siteId })- .from(teamSiteAccess)- .innerJoin(team, eq(teamSiteAccess.teamId, team.id))- .where(eq(team.organizationId, organizationId));-- const teamGatedSiteIds = new Set(allTeamSites.map(s => s.siteId));-- if (teamGatedSiteIds.size > 0) {- // Find teams the user belongs to in this org- const userTeams = await db- .select({ teamId: teamMember.teamId })- .from(teamMember)- .innerJoin(team, eq(teamMember.teamId, team.id))- .where(and(eq(teamMember.userId, userId), eq(team.organizationId, organizationId)));-- const userTeamIds = userTeams.map(t => t.teamId);-- // Get sites accessible through user's teams- const userTeamSiteIds = new Set<number>();- if (userTeamIds.length > 0) {- const userTeamSites = await db- .select({ siteId: teamSiteAccess.siteId })- .from(teamSiteAccess)- .where(inArray(teamSiteAccess.teamId, userTeamIds));- for (const s of userTeamSites) {- userTeamSiteIds.add(s.siteId);- }- }-- // Keep sites that are NOT team-gated OR are in the user's teams- sitesData = sitesData.filter(site => !teamGatedSiteIds.has(site.siteId) || userTeamSiteIds.has(site.siteId));- }+ sitesData = await filterSitesByMemberAccess(+ allSitesData,+ organizationId,+ userId,+ memberRecord.id,+ memberRecord.hasRestrictedSiteAccess+ );}// Query session counts for the sitesdiff --git a/server/src/api/user/getMyOrganizations.ts b/server/src/api/user/getMyOrganizations.tsindex 3d0c312fa..2673105a2 100644--- a/server/src/api/user/getMyOrganizations.ts+++ b/server/src/api/user/getMyOrganizations.ts@@ -1,17 +1,9 @@import { FastifyRequest, FastifyReply } from "fastify";import { db } from "../../db/postgres/postgres.js";-import { and, eq, inArray } from "drizzle-orm";-import {- member,- memberSiteAccess,- organization,- sites,- team,- teamMember,- teamSiteAccess,- user,-} from "../../db/postgres/schema.js";+import { and, eq } from "drizzle-orm";+import { member, organization, sites, user } from "../../db/postgres/schema.js";import { getUserIdFromRequest } from "../../lib/auth-utils.js";+import { filterSitesByMemberAccess } from "../../lib/siteAccess.js";export const getMyOrganizations = async (request: FastifyRequest, reply: FastifyReply) => {try {@@ -79,50 +71,19 @@ export const getMyOrganizations = async (request: FastifyRequest, reply: Fastify.limit(1),]);- // Filter sites based on the caller's per-member access restrictions.- // Admins/owners see everything; restricted members see only their granted- // sites; regular members are still filtered by team-gated sites.+ // Filter sites based on the caller's per-member access restrictions+ // and teams. Admins/owners see everything.let organizationSites = allOrgSites;const callerMemberRecord = callerMember[0];if (callerMemberRecord?.role === "member") {- if (callerMemberRecord.hasRestrictedSiteAccess) {- const accessibleSites = await db- .select({ siteId: memberSiteAccess.siteId })- .from(memberSiteAccess)- .where(eq(memberSiteAccess.memberId, callerMemberRecord.id));- const accessibleSiteIds = new Set(accessibleSites.map(s => s.siteId));- organizationSites = organizationSites.filter(s => accessibleSiteIds.has(s.siteId));- }-- const teamGated = await db- .select({ siteId: teamSiteAccess.siteId })- .from(teamSiteAccess)- .innerJoin(team, eq(teamSiteAccess.teamId, team.id))- .where(eq(team.organizationId, org.id));- const teamGatedSiteIds = new Set(teamGated.map(s => s.siteId));-- if (teamGatedSiteIds.size > 0) {- const userTeams = await db- .select({ teamId: teamMember.teamId })- .from(teamMember)- .innerJoin(team, eq(teamMember.teamId, team.id))- .where(and(eq(teamMember.userId, userId), eq(team.organizationId, org.id)));- const userTeamIds = userTeams.map(t => t.teamId);-- const userTeamSiteIds = new Set<number>();- if (userTeamIds.length > 0) {- const userTeamSites = await db- .select({ siteId: teamSiteAccess.siteId })- .from(teamSiteAccess)- .where(inArray(teamSiteAccess.teamId, userTeamIds));- for (const s of userTeamSites) userTeamSiteIds.add(s.siteId);- }-- organizationSites = organizationSites.filter(- s => !teamGatedSiteIds.has(s.siteId) || userTeamSiteIds.has(s.siteId)- );- }+ organizationSites = await filterSitesByMemberAccess(+ allOrgSites,+ org.id,+ userId,+ callerMemberRecord.id,+ callerMemberRecord.hasRestrictedSiteAccess+ );}return {diff --git a/server/src/api/user/listOrganizationMembers.ts b/server/src/api/user/listOrganizationMembers.tsindex d4bf0e385..fa854d377 100644--- a/server/src/api/user/listOrganizationMembers.ts+++ b/server/src/api/user/listOrganizationMembers.ts@@ -1,7 +1,7 @@-import { eq, inArray } from "drizzle-orm";+import { and, eq, inArray } from "drizzle-orm";import { FastifyReply, FastifyRequest } from "fastify";import { db } from "../../db/postgres/postgres.js";-import { member, memberSiteAccess, user } from "../../db/postgres/schema.js";+import { member, memberSiteAccess, team, teamMember, user } from "../../db/postgres/schema.js";interface ListOrganizationMembersRequest {Params: {@@ -34,18 +34,31 @@ export async function listOrganizationMembers(.leftJoin(user, eq(member.userId, user.id)).where(eq(member.organizationId, organizationId));- // Get site access records for all members+ // Get site access and team memberships for all membersconst memberIds = organizationMembers.map(m => m.id);- const siteAccessRecords =+ const memberUserIds = organizationMembers.map(m => m.userId);+ const [siteAccessRecords, teamMemberships] = await Promise.all([memberIds.length > 0- ? await db+ ? db.select({memberId: memberSiteAccess.memberId,siteId: memberSiteAccess.siteId,}).from(memberSiteAccess).where(inArray(memberSiteAccess.memberId, memberIds))- : [];+ : Promise.resolve([]),+ memberUserIds.length > 0+ ? db+ .select({+ userId: teamMember.userId,+ teamId: team.id,+ teamName: team.name,+ })+ .from(teamMember)+ .innerJoin(team, eq(teamMember.teamId, team.id))+ .where(and(inArray(teamMember.userId, memberUserIds), eq(team.organizationId, organizationId)))+ : Promise.resolve([]),+ ]);// Create maps for quick lookupconst siteIdsMap = new Map<string, number[]>();@@ -55,6 +68,13 @@ export async function listOrganizationMembers(siteIdsMap.set(record.memberId, existing);}+ const teamsMap = new Map<string, { id: string; name: string }[]>();+ for (const record of teamMemberships) {+ const existing = teamsMap.get(record.userId) || [];+ existing.push({ id: record.teamId, name: record.teamName });+ teamsMap.set(record.userId, existing);+ }+// Transform the results to the expected formatreturn reply.send({success: true,@@ -73,6 +93,7 @@ export async function listOrganizationMembers(hasRestrictedSiteAccess: m.hasRestrictedSiteAccess,siteIds: siteIdsMap.get(m.id) || [],},+ teams: teamsMap.get(m.userId) || [],})),});} catch (error) {diff --git a/server/src/lib/auth-utils.test.ts b/server/src/lib/auth-utils.test.tsnew file mode 100644index 000000000..f0123d080--- /dev/null+++ b/server/src/lib/auth-utils.test.ts@@ -0,0 +1,230 @@+import { eq } from "drizzle-orm";+import { beforeAll, beforeEach, describe, expect, it, vi } from "vitest";++// Better-auth pulls in email, stripe, and env config at import time — stub the+// session API so getIsUserAdmin sees no session and auth never initializes.+vi.mock("./auth.js", () => ({+ auth: {+ api: {+ getSession: vi.fn(async () => null),+ verifyApiKey: vi.fn(async () => ({ valid: false })),+ },+ },+}));++// Replace the postgres-js connection with an in-memory PGlite database so the+// real drizzle queries in auth-utils run against real SQL.+vi.mock("../db/postgres/postgres.js", async () => {+ const { PGlite } = await import("@electric-sql/pglite");+ const { drizzle } = await import("drizzle-orm/pglite");+ const schema = await import("../db/postgres/schema.js");+ const client = new PGlite();+ const db = drizzle(client, { schema });+ return { db, sql: client };+});++import { db, sql } from "../db/postgres/postgres.js";+import { member, memberSiteAccess, sites, team, teamMember, teamSiteAccess } from "../db/postgres/schema.js";+import { getSitesUserHasAccessTo, invalidateSitesAccessCache } from "./auth-utils.js";+import { filterSitesByMemberAccess } from "./siteAccess.js";++// Only the tables getSitesUserHasAccessTo touches. Column names must match the+// drizzle schema exactly (unnamed columns use their TS property name verbatim).+const DDL = `+CREATE TABLE "member" (+ "id" text PRIMARY KEY,+ "organizationId" text NOT NULL,+ "userId" text NOT NULL,+ "role" text NOT NULL,+ "createdAt" timestamp NOT NULL DEFAULT now(),+ "has_restricted_site_access" boolean NOT NULL DEFAULT false+);+CREATE TABLE "member_site_access" (+ "id" serial PRIMARY KEY,+ "member_id" text NOT NULL,+ "site_id" integer NOT NULL,+ "created_at" timestamp NOT NULL DEFAULT now(),+ "created_by" text+);+CREATE TABLE "team" (+ "id" text PRIMARY KEY,+ "name" text NOT NULL,+ "organizationId" text NOT NULL,+ "createdAt" timestamp NOT NULL DEFAULT now(),+ "updatedAt" timestamp+);+CREATE TABLE "teamMember" (+ "id" text PRIMARY KEY,+ "teamId" text NOT NULL,+ "userId" text NOT NULL,+ "createdAt" timestamp+);+CREATE TABLE "team_site_access" (+ "id" serial PRIMARY KEY,+ "team_id" text NOT NULL,+ "site_id" integer NOT NULL,+ "created_at" timestamp NOT NULL DEFAULT now()+);+CREATE TABLE "sites" (+ "id" text,+ "site_id" serial PRIMARY KEY,+ "name" text NOT NULL,+ "type" text,+ "domain" text NOT NULL,+ "created_at" timestamp DEFAULT now(),+ "updated_at" timestamp DEFAULT now(),+ "created_by" text,+ "organization_id" text,+ "public" boolean DEFAULT false,+ "embed_enabled" boolean DEFAULT false,+ "saltUserIds" boolean DEFAULT false,+ "blockBots" boolean DEFAULT true NOT NULL,+ "excluded_ips" jsonb DEFAULT '[]',+ "excluded_countries" jsonb DEFAULT '[]',+ "excluded_paths" jsonb DEFAULT '[]',+ "excluded_hostnames" jsonb DEFAULT '[]',+ "excluded_user_agents" jsonb DEFAULT '[]',+ "sessionReplay" boolean DEFAULT false,+ "webVitals" boolean DEFAULT false,+ "trackErrors" boolean DEFAULT false,+ "trackOutbound" boolean DEFAULT true,+ "trackUrlParams" boolean DEFAULT true,+ "trackInitialPageView" boolean DEFAULT true,+ "trackSpaNavigation" boolean DEFAULT true,+ "trackIp" boolean DEFAULT false,+ "trackButtonClicks" boolean DEFAULT false,+ "trackCopy" boolean DEFAULT false,+ "trackFormInteractions" boolean DEFAULT false,+ "api_key" text,+ "private_link_key" text,+ "tags" jsonb DEFAULT '[]'+);+`;++const ORG = "org_1";+const NOW = "2026-01-01 00:00:00";++function reqFor(userId: string) {+ return { user: { id: userId }, headers: {} } as any;+}++async function siteIdsFor(userId: string): Promise<number[]> {+ invalidateSitesAccessCache(userId);+ const result = await getSitesUserHasAccessTo(reqFor(userId));+ return result.map((s: { siteId: number }) => s.siteId).sort((a: number, b: number) => a - b);+}++beforeAll(async () => {+ await (sql as any).exec(DDL);+});++beforeEach(async () => {+ await (sql as any).exec(+ `TRUNCATE "member", "member_site_access", "team", "teamMember", "team_site_access", "sites"`+ );++ // Org with 13 sites:+ // 1-11 gated by team "bbc", 12 gated by team "other", 13 not team-gated+ await db.insert(sites).values(+ Array.from({ length: 13 }, (_, i) => ({+ id: `hex${i + 1}`, // explicit: the schema default needs pgcrypto, absent in PGlite+ siteId: i + 1,+ name: `site-${i + 1}`,+ domain: `site${i + 1}.example.com`,+ organizationId: ORG,+ }))+ );+ await db.insert(team).values([+ { id: "team_bbc", name: "BBC", organizationId: ORG, createdAt: NOW },+ { id: "team_other", name: "Other", organizationId: ORG, createdAt: NOW },+ ]);+ await db.insert(teamSiteAccess).values([+ ...Array.from({ length: 11 }, (_, i) => ({ teamId: "team_bbc", siteId: i + 1 })),+ { teamId: "team_other", siteId: 12 },+ ]);++ // Peer: member role, on team BBC+ await db.insert(member).values({+ id: "member_peer",+ organizationId: ORG,+ userId: "user_peer",+ role: "member",+ createdAt: NOW,+ hasRestrictedSiteAccess: false,+ });+ await db.insert(teamMember).values({ id: "tm_1", teamId: "team_bbc", userId: "user_peer" });++ // An owner for the admin-path sanity check+ await db.insert(member).values({+ id: "member_owner",+ organizationId: ORG,+ userId: "user_owner",+ role: "owner",+ createdAt: NOW,+ hasRestrictedSiteAccess: false,+ });+});++describe("getSitesUserHasAccessTo — team-based access", () => {+ it("unrestricted member on a team sees their team's sites plus non-gated sites", async () => {+ expect(await siteIdsFor("user_peer")).toEqual([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 13]);+ });++ it("owner sees every site regardless of team gating", async () => {+ expect(await siteIdsFor("user_owner")).toEqual([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13]);+ });++ it("restricted member keeps team-granted sites in addition to explicit site grants", async () => {+ // Grant site 13 (not team-gated) explicitly — the reported bug: this wipes+ // out the member's team-based access instead of adding to it.+ await db.update(member).set({ hasRestrictedSiteAccess: true }).where(eq(member.id, "member_peer"));+ await db.insert(memberSiteAccess).values({ memberId: "member_peer", siteId: 13 });++ expect(await siteIdsFor("user_peer")).toEqual([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 13]);+ });++ it("explicitly granted site stays accessible even when gated by a team the member is not on", async () => {+ // Grant site 12 (gated by team "other") — currently the team filter deletes+ // the granted site too, leaving the member with access to nothing.+ await db.update(member).set({ hasRestrictedSiteAccess: true }).where(eq(member.id, "member_peer"));+ await db.insert(memberSiteAccess).values({ memberId: "member_peer", siteId: 12 });++ expect(await siteIdsFor("user_peer")).toEqual([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]);+ });++ it("restricted member with no team and no grants sees nothing", async () => {+ await db.delete(teamMember);+ await db.update(member).set({ hasRestrictedSiteAccess: true }).where(eq(member.id, "member_peer"));++ expect(await siteIdsFor("user_peer")).toEqual([]);+ });+});++// Shared filter used by getSitesFromOrg, getMyOrganizations, and weekly reports+describe("filterSitesByMemberAccess", () => {+ const orgSites = Array.from({ length: 13 }, (_, i) => ({ siteId: i + 1 }));++ async function filteredIdsFor(restricted: boolean): Promise<number[]> {+ const result = await filterSitesByMemberAccess(orgSites, ORG, "user_peer", "member_peer", restricted);+ return result.map(s => s.siteId).sort((a, b) => a - b);+ }++ it("unrestricted member on a team sees their team's sites plus non-gated sites", async () => {+ expect(await filteredIdsFor(false)).toEqual([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 13]);+ });++ it("restricted member keeps team-granted sites in addition to explicit site grants", async () => {+ await db.insert(memberSiteAccess).values({ memberId: "member_peer", siteId: 13 });+ expect(await filteredIdsFor(true)).toEqual([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 13]);+ });++ it("explicitly granted site stays accessible even when gated by a team the member is not on", async () => {+ await db.insert(memberSiteAccess).values({ memberId: "member_peer", siteId: 12 });+ expect(await filteredIdsFor(true)).toEqual([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]);+ });++ it("restricted member with no team and no grants sees nothing", async () => {+ await db.delete(teamMember);+ expect(await filteredIdsFor(true)).toEqual([]);+ });+});diff --git a/server/src/lib/auth-utils.ts b/server/src/lib/auth-utils.tsindex 823d5dabc..9a1bb0eae 100644--- a/server/src/lib/auth-utils.ts+++ b/server/src/lib/auth-utils.ts@@ -179,6 +179,19 @@ export async function getSitesUserHasAccessTo(req: FastifyRequest, adminOnly = f}}+ // Team access is additive: a restricted member's siteMap only has+ // their explicit grants, so team-granted sites must be added back+ const memberOrgIdSet = new Set(memberOrgIds);+ const missingTeamSiteIds = Array.from(userTeamSiteIds).filter(id => !siteMap.has(id));+ if (missingTeamSiteIds.length > 0) {+ const teamSites = await db.select().from(sites).where(inArray(sites.siteId, missingTeamSiteIds));+ for (const site of teamSites) {+ if (site.organizationId && memberOrgIdSet.has(site.organizationId)) {+ siteMap.set(site.siteId, site);+ }+ }+ }+// For sites from admin/owner orgs, keep all (no team filtering)// For sites from member orgs, apply team filteringconst adminOrgSiteIds = new Set<number>();@@ -195,9 +208,17 @@ export async function getSitesUserHasAccessTo(req: FastifyRequest, adminOnly = f}}+ // Explicit per-member grants always win over team gating+ const explicitGrantSiteIds = new Set(restrictedSites.map(s => s.siteId));+// Remove team-gated sites the user can't access (only for member-role orgs)for (const [siteId] of siteMap) {- if (teamGatedSiteIds.has(siteId) && !userTeamSiteIds.has(siteId) && !adminOrgSiteIds.has(siteId)) {+ if (+ teamGatedSiteIds.has(siteId) &&+ !userTeamSiteIds.has(siteId) &&+ !adminOrgSiteIds.has(siteId) &&+ !explicitGrantSiteIds.has(siteId)+ ) {siteMap.delete(siteId);}}diff --git a/server/src/lib/siteAccess.ts b/server/src/lib/siteAccess.tsnew file mode 100644index 000000000..52ee513de--- /dev/null+++ b/server/src/lib/siteAccess.ts@@ -0,0 +1,71 @@+import { and, eq, inArray } from "drizzle-orm";+import { db } from "../db/postgres/postgres.js";+import { memberSiteAccess, team, teamMember, teamSiteAccess } from "../db/postgres/schema.js";++/**+ * Filters an organization's sites down to what a member-role user can access.+ *+ * Access is the union of:+ * - explicit per-member grants (member_site_access) — these always apply,+ * even to sites gated by a team the member is not on+ * - sites granted through the member's teams — always additive, regardless+ * of whether the member has restricted site access+ * - sites not gated by any team — only when the member is unrestricted+ *+ * Callers must handle admin/owner roles themselves (they bypass filtering).+ */+export async function filterSitesByMemberAccess<T extends { siteId: number }>(+ orgSites: T[],+ organizationId: string,+ userId: string,+ memberId: string,+ hasRestrictedSiteAccess: boolean+): Promise<T[]> {+ const [explicitGrants, teamGated, userTeams] = await Promise.all([+ hasRestrictedSiteAccess+ ? db+ .select({ siteId: memberSiteAccess.siteId })+ .from(memberSiteAccess)+ .where(eq(memberSiteAccess.memberId, memberId))+ : Promise.resolve([]),+ db+ .select({ siteId: teamSiteAccess.siteId })+ .from(teamSiteAccess)+ .innerJoin(team, eq(teamSiteAccess.teamId, team.id))+ .where(eq(team.organizationId, organizationId)),+ db+ .select({ teamId: teamMember.teamId })+ .from(teamMember)+ .innerJoin(team, eq(teamMember.teamId, team.id))+ .where(and(eq(teamMember.userId, userId), eq(team.organizationId, organizationId))),+ ]);++ const explicitSiteIds = new Set(explicitGrants.map(g => g.siteId));+ const teamGatedSiteIds = new Set(teamGated.map(s => s.siteId));++ const userTeamSiteIds = new Set<number>();+ if (userTeams.length > 0) {+ const userTeamSites = await db+ .select({ siteId: teamSiteAccess.siteId })+ .from(teamSiteAccess)+ .where(+ inArray(+ teamSiteAccess.teamId,+ userTeams.map(t => t.teamId)+ )+ );+ for (const s of userTeamSites) {+ userTeamSiteIds.add(s.siteId);+ }+ }++ return orgSites.filter(site => {+ if (explicitSiteIds.has(site.siteId) || userTeamSiteIds.has(site.siteId)) {+ return true;+ }+ if (hasRestrictedSiteAccess) {+ return false;+ }+ return !teamGatedSiteIds.has(site.siteId);+ });+}diff --git a/server/src/services/weekyReports/weeklyReportService.ts b/server/src/services/weekyReports/weeklyReportService.tsindex 0204ec862..1ac481898 100644--- a/server/src/services/weekyReports/weeklyReportService.ts+++ b/server/src/services/weekyReports/weeklyReportService.ts@@ -2,11 +2,12 @@ import * as cron from "node-cron";import { DateTime } from "luxon";import { eq } from "drizzle-orm";import { db } from "../../db/postgres/postgres.js";-import { organization, member, user, sites, memberSiteAccess } from "../../db/postgres/schema.js";+import { organization, member, user, sites } from "../../db/postgres/schema.js";import { clickhouse } from "../../db/clickhouse/clickhouse.js";import { processResults } from "../../api/analytics/utils/utils.js";import { createServiceLogger } from "../../lib/logger/logger.js";import { sendWeeklyReportEmail } from "../../lib/email/email.js";+import { filterSitesByMemberAccess } from "../../lib/siteAccess.js";import { IS_CLOUD } from "../../lib/const.js";import type { OverviewData, MetricData, SiteReport, OrganizationReport } from "./weeklyReportTypes.js";@@ -324,6 +325,7 @@ class WeeklyReportService {.select({memberId: member.id,userId: member.userId,+ role: member.role,email: user.email,name: user.name,sendAutoEmailReports: user.sendAutoEmailReports,@@ -340,26 +342,24 @@ class WeeklyReportService {continue;}- // Get allowed sites for this member- let allowedSiteIds: Set<number> | null = null;- if (memberData.hasRestrictedSiteAccess) {- const accessRecords = await db- .select({ siteId: memberSiteAccess.siteId })- .from(memberSiteAccess)- .where(eq(memberSiteAccess.memberId, memberData.memberId));- allowedSiteIds = new Set(accessRecords.map((r) => r.siteId));+ // Only report on sites the member can actually access+ let allowedSites = report.sites;+ if (memberData.role === "member") {+ allowedSites = await filterSitesByMemberAccess(+ report.sites,+ report.organizationId,+ memberData.userId,+ memberData.memberId,+ memberData.hasRestrictedSiteAccess+ );// Skip this member entirely if they have no site access- if (allowedSiteIds.size === 0) {+ if (allowedSites.length === 0) {continue;}}- for (const site of report.sites) {- // Skip sites the member doesn't have access to- if (allowedSiteIds && !allowedSiteIds.has(site.siteId)) {- continue;- }+ for (const site of allowedSites) {try {await sendWeeklyReportEmail(memberData.email, memberData.name, report.organizationName, site);