🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Enhance organization access control in getMyOrganizations API
Bill Yang1e2e594ff05a
diff --git a/server/src/api/user/getMyOrganizations.ts b/server/src/api/user/getMyOrganizations.tsindex bf3a19919..3d0c312fa 100644--- a/server/src/api/user/getMyOrganizations.ts+++ b/server/src/api/user/getMyOrganizations.ts@@ -1,7 +1,16 @@import { FastifyRequest, FastifyReply } from "fastify";import { db } from "../../db/postgres/postgres.js";-import { eq } from "drizzle-orm";-import { member, organization, sites, user } from "../../db/postgres/schema.js";+import { and, eq, inArray } from "drizzle-orm";+import {+ member,+ memberSiteAccess,+ organization,+ sites,+ team,+ teamMember,+ teamSiteAccess,+ user,+} from "../../db/postgres/schema.js";import { getUserIdFromRequest } from "../../lib/auth-utils.js";export const getMyOrganizations = async (request: FastifyRequest, reply: FastifyReply) => {@@ -28,7 +37,7 @@ export const getMyOrganizations = async (request: FastifyRequest, reply: Fastify// For each organization, get all members with user details and sitesconst organizationsWithMembersAndSites = await Promise.all(userOrganizations.map(async org => {- const [organizationMembers, organizationSites] = await Promise.all([+ const [organizationMembers, allOrgSites, callerMember] = await Promise.all([db.select({id: member.id,@@ -59,8 +68,63 @@ export const getMyOrganizations = async (request: FastifyRequest, reply: Fastify}).from(sites).where(eq(sites.organizationId, org.id)),+ db+ .select({+ id: member.id,+ role: member.role,+ hasRestrictedSiteAccess: member.hasRestrictedSiteAccess,+ })+ .from(member)+ .where(and(eq(member.organizationId, org.id), eq(member.userId, userId)))+ .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.+ 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)+ );+ }+ }+return {id: org.id,name: org.name,diff --git a/server/src/lib/auth.ts b/server/src/lib/auth.tsindex b73396de6..a0ef35c7e 100644--- a/server/src/lib/auth.ts+++ b/server/src/lib/auth.ts@@ -10,6 +10,7 @@ import { apiKey } from "@better-auth/api-key"import { db } from "../db/postgres/postgres.js";import * as schema from "../db/postgres/schema.js";import { invitation, member, memberSiteAccess, user } from "../db/postgres/schema.js";+import { invalidateSitesAccessCache } from "./auth-utils.js";import { API_RATE_LIMIT_WINDOW, DISABLE_SIGNUP, IS_CLOUD, STANDARD_API_RATE_LIMIT } from "./const.js";import {addContactToAudience,@@ -43,6 +44,20 @@ const pluginList = [teams: {enabled: true,},+ organizationHooks: {+ afterRemoveMember: async ({ member: removedMember, user: removedUser, organization: org }) => {+ // Clear any pending/accepted invitations for this user+org so a stale+ // invite can't be re-accepted and recreate access after removal.+ try {+ await db+ .delete(invitation)+ .where(and(eq(invitation.email, removedUser.email), eq(invitation.organizationId, org.id)));+ } catch (error) {+ console.error("Error deleting invitations for removed member:", error);+ }+ invalidateSitesAccessCache(removedMember.userId);+ },+ },sendInvitationEmail: async invitationData => {const inviteLink = `${process.env.BASE_URL}/invitation?invitationId=${invitationData.invitation.id}&organization=${invitationData.organization.name}&inviterEmail=${invitationData.inviter.user.email}`;await sendInvitationEmail(@@ -256,62 +271,82 @@ export const auth = betterAuth({after: createAuthMiddleware(async ctx => {// Handle invitation acceptance - copy site access from invitation to memberif (ctx.path === "/organization/accept-invitation") {+ const body = ctx.body as { invitationId?: string } | null;+ const invitationId = body?.invitationId;+ if (!invitationId) return;+try {- const body = ctx.body as { invitationId?: string } | null;- const invitationId = body?.invitationId;+ const invitationRecord = await db+ .select({+ organizationId: invitation.organizationId,+ email: invitation.email,+ hasRestrictedSiteAccess: invitation.hasRestrictedSiteAccess,+ siteIds: invitation.siteIds,+ })+ .from(invitation)+ .where(eq(invitation.id, invitationId))+ .limit(1);- if (invitationId) {- // Query the invitation to get site access settings and org/email info- const invitationRecord = await db- .select({- organizationId: invitation.organizationId,- email: invitation.email,- hasRestrictedSiteAccess: invitation.hasRestrictedSiteAccess,- siteIds: invitation.siteIds,- })- .from(invitation)- .where(eq(invitation.id, invitationId))- .limit(1);+ if (invitationRecord.length === 0) return;+ const { organizationId, email, hasRestrictedSiteAccess, siteIds } = invitationRecord[0];+ if (!hasRestrictedSiteAccess) return;- if (invitationRecord.length > 0) {- const { organizationId, email, hasRestrictedSiteAccess, siteIds } = invitationRecord[0];- const userRecord = await db.select({ id: user.id }).from(user).where(eq(user.email, email)).limit(1);+ const userRecord = await db.select({ id: user.id }).from(user).where(eq(user.email, email)).limit(1);+ if (userRecord.length === 0) return;- if (userRecord.length > 0) {- const userId = userRecord[0].id;+ const memberRecord = await db+ .select({ id: member.id })+ .from(member)+ .where(and(eq(member.organizationId, organizationId), eq(member.userId, userRecord[0].id)))+ .limit(1);+ if (memberRecord.length === 0) return;+ const memberId = memberRecord[0].id;- await db.transaction(async tx => {- // Find the member by organizationId + userId- const memberRecord = await tx- .select({ id: member.id })- .from(member)- .where(and(eq(member.organizationId, organizationId), eq(member.userId, userId)))- .limit(1);+ // Fail-safe ordering: flip the member to restricted BEFORE inserting the+ // granted-site rows. If the insert step then fails, the member is left+ // with hasRestrictedSiteAccess=true and zero rows in memberSiteAccess —+ // i.e. locked out, which is safe. The previous transaction-based+ // implementation would silently leave the member unrestricted (full+ // org access) on any failure.+ await db.update(member).set({ hasRestrictedSiteAccess: true }).where(eq(member.id, memberId));- if (memberRecord.length > 0) {- const memberId = memberRecord[0].id;+ const siteIdArray = (siteIds || []) as number[];+ if (siteIdArray.length > 0) {+ await db.insert(memberSiteAccess).values(+ siteIdArray.map(siteId => ({+ memberId,+ siteId,+ }))+ );+ }++ invalidateSitesAccessCache(userRecord[0].id);+ } catch (error) {+ console.error("Error applying invitation site restrictions:", error);+ }+ }- // Copy site access restrictions- if (hasRestrictedSiteAccess) {- await tx.update(member).set({ hasRestrictedSiteAccess: true }).where(eq(member.id, memberId));+ // Handle self-removal via /organization/leave. Better-auth does NOT call+ // organizationHooks.afterRemoveMember for this path, so the cleanup+ // (invitation purge + access-cache invalidation) has to live here.+ if (ctx.path === "/organization/leave") {+ try {+ const session = (ctx.context as any).session;+ const userId = session?.user?.id;+ const userEmail = session?.user?.email;+ const body = ctx.body as { organizationId?: string } | null;+ const organizationId = body?.organizationId;- const siteIdArray = (siteIds || []) as number[];- if (siteIdArray.length > 0) {- await tx.insert(memberSiteAccess).values(- siteIdArray.map(siteId => ({- memberId: memberId,- siteId: siteId,- }))- );- }- }- }- });- }+ if (userId && organizationId) {+ if (userEmail) {+ await db+ .delete(invitation)+ .where(and(eq(invitation.email, userEmail), eq(invitation.organizationId, organizationId)));}+ invalidateSitesAccessCache(userId);}} catch (error) {- console.error("Error copying site access from invitation to member:", error);+ console.error("Error cleaning up after organization leave:", error);}}}),