🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Implement member site access management features (#803)
Bill Yang2fca6642dd07
diff --git a/client/src/api/admin/endpoints/auth.ts b/client/src/api/admin/endpoints/auth.tsindex b6745632d..a4996230e 100644--- a/client/src/api/admin/endpoints/auth.ts+++ b/client/src/api/admin/endpoints/auth.ts@@ -12,9 +12,28 @@ export type GetOrganizationMembersResponse = {name: string | null;email: string;};+ siteAccess: {+ hasRestrictedSiteAccess: boolean;+ siteIds: number[];+ };}[];};export function getOrganizationMembers(organizationId: string) {return authedFetch<GetOrganizationMembersResponse>(`/organizations/${organizationId}/members`);}++export function updateMemberSiteAccess(+ organizationId: string,+ memberId: string,+ data: { hasRestrictedSiteAccess: boolean; siteIds: number[] }+) {+ return authedFetch(+ `/organizations/${organizationId}/members/${memberId}/sites`,+ undefined,+ {+ method: "PUT",+ data,+ }+ );+}diff --git a/client/src/app/globals.css b/client/src/app/globals.cssindex 9181e1d78..b24637051 100644--- a/client/src/app/globals.css+++ b/client/src/app/globals.css@@ -1,4 +1,4 @@-@import 'tailwindcss';+@import "tailwindcss";@plugin 'tailwindcss-animate';@@ -477,7 +477,7 @@--accent-foreground: 0 0% 98%;--destructive: 0 62.8% 30.6%;--destructive-foreground: 0 0% 98%;- --border: 0 0% 9%;+ --border: 0 0% 12%;--input: 240 3.7% 15.9%;--ring: 240 4.9% 83.9%;diff --git a/client/src/app/settings/organization/members/components/InviteMemberDialog.tsx b/client/src/app/settings/organization/members/components/InviteMemberDialog.tsxindex 5dc2cea9f..c417050c3 100644--- a/client/src/app/settings/organization/members/components/InviteMemberDialog.tsx+++ b/client/src/app/settings/organization/members/components/InviteMemberDialog.tsx@@ -1,6 +1,13 @@"use client";+import { useMutation, useQueryClient } from "@tanstack/react-query";+import { UserPlus } from "lucide-react";+import { useMemo, useState } from "react";+import { toast } from "sonner";++import { authedFetch } from "@/api/utils";import { Button } from "@/components/ui/button";+import { Checkbox } from "@/components/ui/checkbox";import {Dialog,DialogContent,@@ -13,14 +20,13 @@ import {import { Input } from "@/components/ui/input";import { Label } from "@/components/ui/label";import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";-import { UserPlus } from "lucide-react";-import { useMemo, useState } from "react";-import { toast } from "sonner";-import { Alert } from "../../../../../components/ui/alert";-import { Tooltip, TooltipContent, TooltipTrigger } from "../../../../../components/ui/tooltip";-import { authClient } from "../../../../../lib/auth";-import { IS_CLOUD, STANDARD_TEAM_LIMIT } from "../../../../../lib/const";-import { SubscriptionData, useStripeSubscription } from "../../../../../lib/subscription/useStripeSubscription";+import { Alert } from "@/components/ui/alert";+import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";+import { authClient } from "@/lib/auth";+import { IS_CLOUD, STANDARD_TEAM_LIMIT } from "@/lib/const";+import { SubscriptionData, useStripeSubscription } from "@/lib/subscription/useStripeSubscription";++import { SiteAccessMultiSelect } from "./SiteAccessMultiSelect";interface InviteMemberDialogProps {organizationId: string;@@ -43,6 +49,7 @@ const getMemberLimit = (subscription: SubscriptionData | undefined) => {export function InviteMemberDialog({ organizationId, onSuccess, memberCount }: InviteMemberDialogProps) {const { data: subscription } = useStripeSubscription();+ const queryClient = useQueryClient();const isOverMemberLimit = useMemo(() => {if (!IS_CLOUD) return false;@@ -52,36 +59,64 @@ export function InviteMemberDialog({ organizationId, onSuccess, memberCount }: Iconst [email, setEmail] = useState("");const [role, setRole] = useState<"admin" | "member" | "owner">("member");-- const [isLoading, setIsLoading] = useState(false);+ const [restrictSiteAccess, setRestrictSiteAccess] = useState(false);+ const [selectedSiteIds, setSelectedSiteIds] = useState<number[]>([]);const [open, setOpen] = useState(false);const [error, setError] = useState("");- const handleInvite = async () => {- if (!email) {- setError("Email is required");- return;- }-- setIsLoading(true);- try {- await authClient.organization.inviteMember({+ const inviteMutation = useMutation({+ mutationFn: async () => {+ // Create the invitation via BetterAuth+ const result = await authClient.organization.inviteMember({email,role,organizationId,resend: true,});+ // If role is "member" and site access is restricted, update the invitation+ if (role === "member" && restrictSiteAccess && result.data?.id) {+ await authedFetch(`/organizations/${organizationId}/invitations/${result.data.id}/sites`, undefined, {+ method: "PUT",+ data: {+ hasRestrictedSiteAccess: true,+ siteIds: selectedSiteIds,+ },+ });+ }++ return result;+ },+ onSuccess: () => {+ queryClient.invalidateQueries({ queryKey: ["organizationInvitations"] });toast.success(`Invitation sent to ${email}`);setOpen(false);onSuccess();setEmail("");setRole("member");- } catch (error: any) {- setError(error.message || "Failed to send invitation");- } finally {- setIsLoading(false);+ setRestrictSiteAccess(false);+ setSelectedSiteIds([]);+ setError("");+ },+ onError: (err: any) => {+ setError(err.message || "Failed to send invitation");+ },+ });++ const handleInvite = () => {+ setError("");++ if (!email) {+ setError("Email is required");+ return;}++ if (role === "member" && restrictSiteAccess && selectedSiteIds.length === 0) {+ setError("Please select at least one site or disable site restrictions");+ return;+ }++ inviteMutation.mutate();};if (isOverMemberLimit) {@@ -102,6 +137,7 @@ export function InviteMemberDialog({ organizationId, onSuccess, memberCount }: I</Tooltip>);}+return (<Dialog open={open} onOpenChange={setOpen}><DialogTrigger asChild>@@ -128,7 +164,16 @@ export function InviteMemberDialog({ organizationId, onSuccess, memberCount }: I</div><div className="grid gap-2"><Label htmlFor="role">Role</Label>- <Select value={role} onValueChange={value => setRole(value as "admin" | "member")}>+ <Select+ value={role}+ onValueChange={value => {+ setRole(value as "admin" | "member" | "owner");+ if (value !== "member") {+ setRestrictSiteAccess(false);+ setSelectedSiteIds([]);+ }+ }}+ ><SelectTrigger><SelectValue placeholder="Select a role" /></SelectTrigger>@@ -139,14 +184,43 @@ export function InviteMemberDialog({ organizationId, onSuccess, memberCount }: I</SelectContent></Select></div>++ {role === "member" && (+ <div className="grid gap-3">+ <div className="flex items-center space-x-2">+ <Checkbox+ id="restrict-site-access"+ checked={restrictSiteAccess}+ onCheckedChange={checked => {+ setRestrictSiteAccess(!!checked);+ if (!checked) {+ setSelectedSiteIds([]);+ }+ }}+ />+ <Label htmlFor="restrict-site-access" className="cursor-pointer">+ Restrict access to specific sites+ </Label>+ </div>+ {restrictSiteAccess && (+ <div className="pl-6">+ <SiteAccessMultiSelect selectedSiteIds={selectedSiteIds} onChange={setSelectedSiteIds} />+ <p className="text-xs text-muted-foreground mt-2">+ This member will only have access to the selected sites.+ </p>+ </div>+ )}+ </div>+ )}+{error && <Alert variant="destructive">{error}</Alert>}</div><DialogFooter><Button variant="outline" onClick={() => setOpen(false)}>Cancel</Button>- <Button onClick={handleInvite} disabled={isLoading} variant="success">- {isLoading ? "Inviting..." : "Invite"}+ <Button onClick={handleInvite} disabled={inviteMutation.isPending} variant="success">+ {inviteMutation.isPending ? "Inviting..." : "Invite"}</Button></DialogFooter></DialogContent>diff --git a/client/src/app/settings/organization/members/components/MemberSiteAccessDialog.tsx b/client/src/app/settings/organization/members/components/MemberSiteAccessDialog.tsxnew file mode 100644index 000000000..90a001ea4--- /dev/null+++ b/client/src/app/settings/organization/members/components/MemberSiteAccessDialog.tsx@@ -0,0 +1,149 @@+"use client";++import { useMutation, useQueryClient } from "@tanstack/react-query";+import { useEffect, useState } from "react";+import { toast } from "sonner";++import { GetOrganizationMembersResponse, updateMemberSiteAccess } from "@/api/admin/endpoints/auth";+import { Button } from "@/components/ui/button";+import { Checkbox } from "@/components/ui/checkbox";+import {+ Dialog,+ DialogContent,+ DialogDescription,+ DialogFooter,+ DialogHeader,+ DialogTitle,+} from "@/components/ui/dialog";+import { Label } from "@/components/ui/label";+import { authClient } from "@/lib/auth";++import { SiteAccessMultiSelect } from "./SiteAccessMultiSelect";++type Member = GetOrganizationMembersResponse["data"][0];++interface MemberSiteAccessDialogProps {+ member: Member | null;+ open: boolean;+ onClose: () => void;+ onSuccess: () => void;+}++export function MemberSiteAccessDialog({+ member,+ open,+ onClose,+ onSuccess,+}: MemberSiteAccessDialogProps) {+ const { data: activeOrganization } = authClient.useActiveOrganization();+ const queryClient = useQueryClient();++ const [restrictSiteAccess, setRestrictSiteAccess] = useState(false);+ const [selectedSiteIds, setSelectedSiteIds] = useState<number[]>([]);++ // Initialize form state when dialog opens or member changes+ useEffect(() => {+ if (open && member?.siteAccess) {+ setRestrictSiteAccess(member.siteAccess.hasRestrictedSiteAccess);+ setSelectedSiteIds(member.siteAccess.siteIds);+ }+ }, [open, member]);++ const updateMutation = useMutation({+ mutationFn: () =>+ updateMemberSiteAccess(activeOrganization!.id, member!.id, {+ hasRestrictedSiteAccess: restrictSiteAccess,+ siteIds: selectedSiteIds,+ }),+ onSuccess: () => {+ queryClient.invalidateQueries({ queryKey: ["organizationMembers"] });+ toast.success("Site access updated successfully");+ onSuccess();+ onClose();+ },+ onError: (error: any) => {+ toast.error(error.message || "Failed to update site access");+ },+ });++ const handleSave = () => {+ if (!member || !activeOrganization?.id) return;++ if (restrictSiteAccess && selectedSiteIds.length === 0) {+ toast.error("Please select at least one site or disable site restrictions");+ return;+ }++ updateMutation.mutate();+ };++ if (!member) return null;++ const isRestrictable = member.role === "member";++ return (+ <Dialog open={open} onOpenChange={() => onClose()}>+ <DialogContent className="max-w-lg">+ <DialogHeader>+ <DialogTitle>Site Access for {member.user.name || member.user.email}</DialogTitle>+ <DialogDescription>+ {isRestrictable+ ? "Configure which sites this member can access."+ : "Admin and owner roles have access to all sites and cannot be restricted."}+ </DialogDescription>+ </DialogHeader>++ {isRestrictable ? (+ <div className="grid gap-4 py-4">+ <div className="flex items-center space-x-2">+ <Checkbox+ id="restrict-access"+ checked={restrictSiteAccess}+ onCheckedChange={checked => {+ setRestrictSiteAccess(!!checked);+ if (!checked) {+ setSelectedSiteIds([]);+ }+ }}+ />+ <Label htmlFor="restrict-access" className="cursor-pointer">+ Restrict access to specific sites+ </Label>+ </div>++ {restrictSiteAccess ? (+ <div className="pl-6">+ <SiteAccessMultiSelect selectedSiteIds={selectedSiteIds} onChange={setSelectedSiteIds} />+ <p className="text-xs text-muted-foreground mt-2">+ This member will only have access to the selected sites.+ </p>+ </div>+ ) : (+ <p className="text-sm text-muted-foreground pl-6">+ This member has access to all sites in the organization.+ </p>+ )}+ </div>+ ) : (+ <div className="py-4 text-center">+ <p className="text-muted-foreground">+ {member.role === "owner" ? "Organization owners" : "Admins"} automatically have access to all+ sites.+ </p>+ </div>+ )}++ <DialogFooter>+ <Button variant="outline" onClick={onClose}>+ Cancel+ </Button>+ {isRestrictable && (+ <Button onClick={handleSave} disabled={updateMutation.isPending}>+ {updateMutation.isPending ? "Saving..." : "Save Changes"}+ </Button>+ )}+ </DialogFooter>+ </DialogContent>+ </Dialog>+ );+}diff --git a/client/src/app/settings/organization/members/components/SiteAccessMultiSelect.tsx b/client/src/app/settings/organization/members/components/SiteAccessMultiSelect.tsxnew file mode 100644index 000000000..bd570d36e--- /dev/null+++ b/client/src/app/settings/organization/members/components/SiteAccessMultiSelect.tsx@@ -0,0 +1,74 @@+"use client";++import { Checkbox } from "@/components/ui/checkbox";+import { Label } from "@/components/ui/label";+import { authClient } from "@/lib/auth";+import { useGetSitesFromOrg } from "@/api/admin/hooks/useSites";++interface SiteAccessMultiSelectProps {+ selectedSiteIds: number[];+ onChange: (siteIds: number[]) => void;+ disabled?: boolean;+}++export function SiteAccessMultiSelect({ selectedSiteIds, onChange, disabled = false }: SiteAccessMultiSelectProps) {+ const { data: activeOrganization } = authClient.useActiveOrganization();+ const { data: sitesData, isLoading } = useGetSitesFromOrg(activeOrganization?.id);++ const sites = sitesData?.sites || [];++ const handleToggle = (siteId: number) => {+ if (selectedSiteIds.includes(siteId)) {+ onChange(selectedSiteIds.filter(id => id !== siteId));+ } else {+ onChange([...selectedSiteIds, siteId]);+ }+ };++ const handleSelectAll = () => {+ if (selectedSiteIds.length === sites.length) {+ onChange([]);+ } else {+ onChange(sites.map(s => s.siteId));+ }+ };++ if (isLoading) {+ return <div className="text-sm text-muted-foreground">Loading sites...</div>;+ }++ if (sites.length === 0) {+ return <div className="text-sm text-muted-foreground">No sites in this organization</div>;+ }++ return (+ <div className="space-y-3">+ <div className="flex items-center space-x-2">+ <Checkbox+ id="select-all"+ checked={selectedSiteIds.length === sites.length}+ onCheckedChange={handleSelectAll}+ disabled={disabled}+ />+ <Label htmlFor="select-all" className="text-sm font-medium cursor-pointer">+ Select all sites ({sites.length})+ </Label>+ </div>+ <div className="border rounded-lg divide-y max-h-48 overflow-y-auto">+ {sites.map(site => (+ <div key={site.siteId} className="flex items-center space-x-3 p-2.5 hover:bg-muted/50">+ <Checkbox+ id={`site-${site.siteId}`}+ checked={selectedSiteIds.includes(site.siteId)}+ onCheckedChange={() => handleToggle(site.siteId)}+ disabled={disabled}+ />+ <Label htmlFor={`site-${site.siteId}`} className="flex-1 cursor-pointer text-sm">+ <span className="font-medium">{site.name}</span>+ </Label>+ </div>+ ))}+ </div>+ </div>+ );+}diff --git a/client/src/app/settings/organization/members/page.tsx b/client/src/app/settings/organization/members/page.tsxindex cc5a702f4..053c61b32 100644--- a/client/src/app/settings/organization/members/page.tsx+++ b/client/src/app/settings/organization/members/page.tsx@@ -3,6 +3,7 @@ import { DateTime } from "luxon";import { getTimezone } from "../../../../lib/store";import { Card, CardContent, CardHeader, CardTitle } from "../../../../components/ui/card";import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "../../../../components/ui/table";+import { Badge } from "../../../../components/ui/badge";import { authClient } from "../../../../lib/auth";import { useEffect, useState } from "react";@@ -18,7 +19,9 @@ import { CreateUserDialog } from "./components/CreateUserDialog";import { DeleteOrganizationDialog } from "./components/DeleteOrganizationDialog";import { Invitations } from "./components/Invitations";import { InviteMemberDialog } from "./components/InviteMemberDialog";+import { MemberSiteAccessDialog } from "./components/MemberSiteAccessDialog";import { RemoveMemberDialog } from "./components/RemoveMemberDialog";+import { GetOrganizationMembersResponse } from "../../../../api/admin/endpoints/auth";// Types for our componentexport type Organization = {@@ -38,11 +41,16 @@ export type Member = {id: string;name: string | null;email: string;- image: string | null;+ };+ siteAccess?: {+ hasRestrictedSiteAccess: boolean;+ siteIds: number[];};};// Organization Component with Members Table+type MemberData = GetOrganizationMembersResponse["data"][0];+function Organization({org,}: {@@ -55,6 +63,7 @@ function Organization({}) {const [name, setName] = useState(org.name);const [isUpdating, setIsUpdating] = useState(false);+ const [selectedMemberForAccess, setSelectedMemberForAccess] = useState<MemberData | null>(null);useEffect(() => {setName(org.name);@@ -158,6 +167,7 @@ function Organization({<TableHead>Name</TableHead><TableHead>Email</TableHead><TableHead>Role</TableHead>+ <TableHead>Site Access</TableHead><TableHead>Joined</TableHead>{isOwner && <TableHead className="w-12">Actions</TableHead>}</TableRow>@@ -176,6 +186,9 @@ function Organization({<TableCell><div className="h-4 bg-muted animate-pulse rounded w-16"></div></TableCell>+ <TableCell>+ <div className="h-4 bg-muted animate-pulse rounded w-16"></div>+ </TableCell><TableCell><div className="h-4 bg-muted animate-pulse rounded w-20"></div></TableCell>@@ -188,11 +201,26 @@ function Organization({))) : (<>- {members?.data?.map((member: any) => (+ {members?.data?.map((member: MemberData) => (<TableRow key={member.id}><TableCell>{member.user?.name || "—"}</TableCell><TableCell>{member.user?.email}</TableCell><TableCell className="capitalize">{member.role}</TableCell>+ <TableCell>+ {member.role === "member" ? (+ <Badge+ variant={member.siteAccess?.hasRestrictedSiteAccess ? "default" : "secondary"}+ className={isAdmin ? "cursor-pointer hover:opacity-80" : ""}+ onClick={() => isAdmin && setSelectedMemberForAccess(member)}+ >+ {member.siteAccess?.hasRestrictedSiteAccess+ ? `${member.siteAccess.siteIds.length} site${member.siteAccess.siteIds.length !== 1 ? "s" : ""}`+ : "All sites"}+ </Badge>+ ) : (+ <Badge variant="outline">All sites</Badge>+ )}+ </TableCell><TableCell>{DateTime.fromSQL(member.createdAt, { zone: "utc" }).setZone(getTimezone())@@ -209,7 +237,7 @@ function Organization({))}{(!members?.data || members.data.length === 0) && (<TableRow>- <TableCell colSpan={isOwner ? 5 : 4} className="text-center py-6 text-muted-foreground">+ <TableCell colSpan={isOwner ? 6 : 5} className="text-center py-6 text-muted-foreground">No members found</TableCell></TableRow>@@ -218,6 +246,14 @@ function Organization({)}</TableBody></Table>++ {/* Member Site Access Dialog */}+ <MemberSiteAccessDialog+ member={selectedMemberForAccess}+ open={!!selectedMemberForAccess}+ onClose={() => setSelectedMemberForAccess(null)}+ onSuccess={handleRefresh}+ /></CardContent></Card>diff --git a/server/src/api/memberAccess/index.ts b/server/src/api/memberAccess/index.tsnew file mode 100644index 000000000..5bacd4a75--- /dev/null+++ b/server/src/api/memberAccess/index.ts@@ -0,0 +1,2 @@+export { updateMemberSiteAccess } from "./updateMemberSiteAccess.js";+export { updateInvitationSiteAccess } from "./updateInvitationSiteAccess.js";diff --git a/server/src/api/memberAccess/updateInvitationSiteAccess.ts b/server/src/api/memberAccess/updateInvitationSiteAccess.tsnew file mode 100644index 000000000..88cffa6d7--- /dev/null+++ b/server/src/api/memberAccess/updateInvitationSiteAccess.ts@@ -0,0 +1,75 @@+import { and, eq } from "drizzle-orm";+import { FastifyReply, FastifyRequest } from "fastify";++import { db } from "../../db/postgres/postgres.js";+import { invitation, sites } from "../../db/postgres/schema.js";++interface UpdateInvitationSiteAccessParams {+ organizationId: string;+ invitationId: string;+}++interface UpdateInvitationSiteAccessBody {+ hasRestrictedSiteAccess: boolean;+ siteIds: number[];+}++export async function updateInvitationSiteAccess(+ request: FastifyRequest<{+ Params: UpdateInvitationSiteAccessParams;+ Body: UpdateInvitationSiteAccessBody;+ }>,+ reply: FastifyReply+) {+ const { organizationId, invitationId } = request.params;+ const { hasRestrictedSiteAccess, siteIds } = request.body;++ try {+ // Verify the invitation exists and belongs to this organization+ const invitationRecord = await db+ .select()+ .from(invitation)+ .where(and(eq(invitation.id, invitationId), eq(invitation.organizationId, organizationId)))+ .limit(1);++ if (invitationRecord.length === 0) {+ return reply.status(404).send({ error: "Invitation not found" });+ }++ // Validate that all siteIds belong to this organization+ if (siteIds && siteIds.length > 0) {+ const validSites = await db+ .select({ siteId: sites.siteId })+ .from(sites)+ .where(eq(sites.organizationId, organizationId));++ const validSiteIds = new Set(validSites.map(s => s.siteId));+ const invalidSiteIds = siteIds.filter(id => !validSiteIds.has(id));++ if (invalidSiteIds.length > 0) {+ return reply.status(400).send({+ error: `Invalid site IDs: ${invalidSiteIds.join(", ")}. Sites must belong to this organization.`,+ });+ }+ }++ // Update the invitation with site access info+ await db+ .update(invitation)+ .set({+ hasRestrictedSiteAccess,+ siteIds: siteIds || [],+ })+ .where(eq(invitation.id, invitationId));++ return reply.status(200).send({+ success: true,+ invitationId,+ hasRestrictedSiteAccess,+ siteIds,+ });+ } catch (error) {+ console.error("Error updating invitation site access:", error);+ return reply.status(500).send({ error: "Failed to update invitation site access" });+ }+}diff --git a/server/src/api/memberAccess/updateMemberSiteAccess.ts b/server/src/api/memberAccess/updateMemberSiteAccess.tsnew file mode 100644index 000000000..35c396be3--- /dev/null+++ b/server/src/api/memberAccess/updateMemberSiteAccess.ts@@ -0,0 +1,119 @@+import { and, eq, inArray } from "drizzle-orm";+import { FastifyReply, FastifyRequest } from "fastify";++import { db } from "../../db/postgres/postgres.js";+import { member, memberSiteAccess, sites, user } from "../../db/postgres/schema.js";+import { invalidateSitesAccessCache } from "../../lib/auth-utils.js";++interface UpdateMemberSiteAccessParams {+ organizationId: string;+ memberId: string;+}++interface UpdateMemberSiteAccessBody {+ hasRestrictedSiteAccess: boolean;+ siteIds: number[];+}++export async function updateMemberSiteAccess(+ request: FastifyRequest<{+ Params: UpdateMemberSiteAccessParams;+ Body: UpdateMemberSiteAccessBody;+ }>,+ reply: FastifyReply+) {+ const { organizationId, memberId } = request.params;+ const { hasRestrictedSiteAccess, siteIds } = request.body;+ const currentUserId = request.user?.id;++ try {+ // Get the member record+ const memberRecord = await db+ .select({+ id: member.id,+ userId: member.userId,+ role: member.role,+ organizationId: member.organizationId,+ })+ .from(member)+ .where(and(eq(member.id, memberId), eq(member.organizationId, organizationId)))+ .limit(1);++ if (memberRecord.length === 0) {+ return reply.status(404).send({ error: "Member not found" });+ }++ const memberData = memberRecord[0];++ // Don't allow restricting admin or owner roles+ if (memberData.role === "admin" || memberData.role === "owner") {+ return reply.status(400).send({+ error: "Cannot restrict site access for admin or owner roles",+ });+ }++ // Validate that all siteIds belong to this organization+ if (siteIds && siteIds.length > 0) {+ const validSites = await db+ .select({ siteId: sites.siteId })+ .from(sites)+ .where(and(eq(sites.organizationId, organizationId), inArray(sites.siteId, siteIds)));++ const validSiteIds = new Set(validSites.map(s => s.siteId));+ const invalidSiteIds = siteIds.filter(id => !validSiteIds.has(id));++ if (invalidSiteIds.length > 0) {+ return reply.status(400).send({+ error: `Invalid site IDs: ${invalidSiteIds.join(", ")}. Sites must belong to this organization.`,+ });+ }+ }++ // Update member's hasRestrictedSiteAccess flag+ await db+ .update(member)+ .set({ hasRestrictedSiteAccess })+ .where(eq(member.id, memberId));++ // Delete existing site access entries+ await db.delete(memberSiteAccess).where(eq(memberSiteAccess.memberId, memberId));++ // Insert new site access entries if restricted and has site IDs+ if (hasRestrictedSiteAccess && siteIds && siteIds.length > 0) {+ await db.insert(memberSiteAccess).values(+ siteIds.map(siteId => ({+ memberId: memberId,+ siteId: siteId,+ createdBy: currentUserId || null,+ }))+ );+ }++ // Invalidate the cache for this user+ invalidateSitesAccessCache(memberData.userId);++ // Fetch the updated site access+ const updatedSiteAccess = await db+ .select({+ siteId: memberSiteAccess.siteId,+ siteName: sites.name,+ siteDomain: sites.domain,+ })+ .from(memberSiteAccess)+ .innerJoin(sites, eq(memberSiteAccess.siteId, sites.siteId))+ .where(eq(memberSiteAccess.memberId, memberId));++ return reply.status(200).send({+ memberId: memberId,+ hasRestrictedSiteAccess,+ siteAccess: updatedSiteAccess.map(record => ({+ siteId: record.siteId,+ name: record.siteName,+ domain: record.siteDomain,+ })),+ });+ } catch (error) {+ console.error("Error updating member site access:", error);+ return reply.status(500).send({ error: "Failed to update member site access" });+ }+}diff --git a/server/src/api/sites/getSitesFromOrg.ts b/server/src/api/sites/getSitesFromOrg.tsindex bae3ca3ff..558ce0ccc 100644--- a/server/src/api/sites/getSitesFromOrg.ts+++ b/server/src/api/sites/getSitesFromOrg.ts@@ -2,7 +2,7 @@ import { eq, and } 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 } from "../../db/postgres/schema.js";+import { sites, member, organization, memberSiteAccess } from "../../db/postgres/schema.js";import { IS_CLOUD, DEFAULT_EVENT_LIMIT } from "../../lib/const.js";import { processResults } from "../analytics/utils/utils.js";import { getSubscriptionInner } from "../stripe/getSubscription.js";@@ -21,7 +21,7 @@ export async function getSitesFromOrg(const userId = req.user?.id;// Run all database queries concurrently- const [memberCheck, sitesData, orgInfo] = await Promise.all([+ const [memberCheck, allSitesData, orgInfo] = await Promise.all([userId? db.select()@@ -33,6 +33,21 @@ export async function getSitesFromOrg(db.select().from(organization).where(eq(organization.id, organizationId)).limit(1),]);+ // Filter sites based on member's access restrictions+ let 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));+ }+// Query session counts for the sitesconst sessionCountMap = new Map<number, number>();@@ -80,7 +95,7 @@ export async function getSitesFromOrg(const enhancedSitesData = sitesData.map(site => ({...site,sessionsLast24Hours: sessionCountMap.get(site.siteId) || 0,- isOwner: memberCheck[0]?.role !== "member",+ isOwner: memberRecord?.role !== "member",}));// Sort by sessions descendingdiff --git a/server/src/api/user/listOrganizationMembers.ts b/server/src/api/user/listOrganizationMembers.tsindex 0d84e8769..d4bf0e385 100644--- a/server/src/api/user/listOrganizationMembers.ts+++ b/server/src/api/user/listOrganizationMembers.ts@@ -1,7 +1,7 @@-import { eq } from "drizzle-orm";+import { eq, inArray } from "drizzle-orm";import { FastifyReply, FastifyRequest } from "fastify";import { db } from "../../db/postgres/postgres.js";-import { member, user } from "../../db/postgres/schema.js";+import { member, memberSiteAccess, user } from "../../db/postgres/schema.js";interface ListOrganizationMembersRequest {Params: {@@ -23,6 +23,7 @@ export async function listOrganizationMembers(userId: member.userId,organizationId: member.organizationId,createdAt: member.createdAt,+ hasRestrictedSiteAccess: member.hasRestrictedSiteAccess,// User fieldsuserName: user.name,userEmail: user.email,@@ -33,6 +34,27 @@ export async function listOrganizationMembers(.leftJoin(user, eq(member.userId, user.id)).where(eq(member.organizationId, organizationId));+ // Get site access records for all members+ const memberIds = organizationMembers.map(m => m.id);+ const siteAccessRecords =+ memberIds.length > 0+ ? await db+ .select({+ memberId: memberSiteAccess.memberId,+ siteId: memberSiteAccess.siteId,+ })+ .from(memberSiteAccess)+ .where(inArray(memberSiteAccess.memberId, memberIds))+ : [];++ // Create maps for quick lookup+ const siteIdsMap = new Map<string, number[]>();+ for (const record of siteAccessRecords) {+ const existing = siteIdsMap.get(record.memberId) || [];+ existing.push(record.siteId);+ siteIdsMap.set(record.memberId, existing);+ }+// Transform the results to the expected formatreturn reply.send({success: true,@@ -47,6 +69,10 @@ export async function listOrganizationMembers(name: m.userName,email: m.userEmail,},+ siteAccess: {+ hasRestrictedSiteAccess: m.hasRestrictedSiteAccess,+ siteIds: siteIdsMap.get(m.id) || [],+ },})),});} catch (error) {diff --git a/server/src/db/postgres/schema.ts b/server/src/db/postgres/schema.tsindex 7c9960767..8baf0df29 100644--- a/server/src/db/postgres/schema.ts+++ b/server/src/db/postgres/schema.ts@@ -149,6 +149,8 @@ export const member = pgTable("member", {.references(() => user.id, { onDelete: "cascade" }),role: text().notNull(),createdAt: timestamp({ mode: "string" }).notNull(),+ // Site access restriction: false = all sites (default), true = only sites in member_site_access+ hasRestrictedSiteAccess: boolean("has_restricted_site_access").default(false).notNull(),});// Invitation table (BetterAuth)@@ -162,8 +164,33 @@ export const invitation = pgTable("invitation", {role: text().notNull(),status: text().notNull(),expiresAt: timestamp({ mode: "string" }).notNull(),+ // Site access restriction for the invited member+ hasRestrictedSiteAccess: boolean("has_restricted_site_access").default(false).notNull(),+ siteIds: jsonb("site_ids").default([]).$type<number[]>(), // Array of site IDs to grant access to});+// Member site access junction table - stores which sites a member has access to+// Only used when member.hasRestrictedSiteAccess = true+export const memberSiteAccess = pgTable(+ "member_site_access",+ {+ id: serial("id").primaryKey().notNull(),+ memberId: text("member_id")+ .notNull()+ .references(() => member.id, { onDelete: "cascade" }),+ siteId: integer("site_id")+ .notNull()+ .references(() => sites.siteId, { onDelete: "cascade" }),+ createdAt: timestamp("created_at", { mode: "string" }).defaultNow().notNull(),+ createdBy: text("created_by").references(() => user.id, { onDelete: "set null" }),+ },+ (table) => [+ unique("member_site_access_unique").on(table.memberId, table.siteId),+ index("member_site_access_member_idx").on(table.memberId),+ index("member_site_access_site_idx").on(table.siteId),+ ]+);+// Session table (BetterAuth)export const session = pgTable("session",diff --git a/server/src/index.ts b/server/src/index.tsindex 1bf907a1c..9cdd3cc7c 100644--- a/server/src/index.ts+++ b/server/src/index.ts@@ -97,6 +97,7 @@ import {listOrganizationMembers,updateAccountSettings,} from "./api/user/index.js";+import { updateInvitationSiteAccess, updateMemberSiteAccess } from "./api/memberAccess/index.js";import { initializeClickhouse } from "./db/clickhouse/clickhouse.js";import { initPostgres } from "./db/postgres/initPostgres.js";import { mapHeaders } from "./lib/auth-utils.js";@@ -318,6 +319,16 @@ async function organizationsRoutes(fastify: FastifyInstance) {fastify.post("/organizations/:organizationId/sites", orgAdminParams, addSite);fastify.get("/organizations/:organizationId/members", orgMember, listOrganizationMembers);fastify.post("/organizations/:organizationId/members", orgMember, addUserToOrganization);++ // Member site access management (admin/owner only)+ fastify.put("/organizations/:organizationId/members/:memberId/sites", orgAdminParams, updateMemberSiteAccess);++ // Invitation site access management (admin/owner only)+ fastify.put(+ "/organizations/:organizationId/invitations/:invitationId/sites",+ orgAdminParams,+ updateInvitationSiteAccess+ );}async function userRoutes(fastify: FastifyInstance) {diff --git a/server/src/lib/auth-utils.ts b/server/src/lib/auth-utils.tsindex 0f0a2d943..522f301b8 100644--- a/server/src/lib/auth-utils.ts+++ b/server/src/lib/auth-utils.ts@@ -2,7 +2,7 @@ import { and, eq, inArray } from "drizzle-orm";import { FastifyRequest } from "fastify";import NodeCache from "node-cache";import { db } from "../db/postgres/postgres.js";-import { member, sites, user } from "../db/postgres/schema.js";+import { member, memberSiteAccess, sites, user } from "../db/postgres/schema.js";import { auth } from "./auth.js";import { siteConfig } from "./siteConfig.js";import { logger } from "./logger/logger.js";@@ -66,7 +66,12 @@ export async function getSitesUserHasAccessTo(req: FastifyRequest, adminOnly = fconst [isAdmin, memberRecords] = await Promise.all([getIsUserAdmin(req),db- .select({ organizationId: member.organizationId, role: member.role })+ .select({+ id: member.id,+ organizationId: member.organizationId,+ role: member.role,+ hasRestrictedSiteAccess: member.hasRestrictedSiteAccess,+ }).from(member).where(eq(member.userId, userId)),]);@@ -80,15 +85,65 @@ export async function getSitesUserHasAccessTo(req: FastifyRequest, adminOnly = freturn [];}- // Extract organization IDs- const organizationIds = memberRecords- .filter(record => !adminOnly || record.role !== "member")- .map(record => record.organizationId);+ // Separate members by access type+ // 1. Admin/owner members - full access to their orgs+ // 2. Unrestricted members - full access to their orgs+ // 3. Restricted members - only access to specific sites via member_site_access+ const fullAccessOrgIds: string[] = [];+ const restrictedMemberIds: string[] = [];++ for (const record of memberRecords) {+ // If adminOnly is true, skip members with "member" role+ if (adminOnly && record.role === "member") {+ continue;+ }- // Get sites for these organizations- const siteRecords = await db.select().from(sites).where(inArray(sites.organizationId, organizationIds));+ // Admin/owner roles always have full access+ if (record.role === "admin" || record.role === "owner") {+ fullAccessOrgIds.push(record.organizationId);+ }+ // Member role with hasRestrictedSiteAccess = true - only specific sites+ else if (record.role === "member" && record.hasRestrictedSiteAccess) {+ restrictedMemberIds.push(record.id);+ }+ // Member role with hasRestrictedSiteAccess = false - full org access+ else {+ fullAccessOrgIds.push(record.organizationId);+ }+ }++ // Fetch sites in parallel+ const [orgSites, restrictedSites] = await Promise.all([+ // Get all sites from orgs with full access+ fullAccessOrgIds.length > 0+ ? db.select().from(sites).where(inArray(sites.organizationId, fullAccessOrgIds))+ : Promise.resolve([]),+ // Get specific sites for restricted members+ restrictedMemberIds.length > 0+ ? (async () => {+ const siteAccess = await db+ .select({ siteId: memberSiteAccess.siteId })+ .from(memberSiteAccess)+ .where(inArray(memberSiteAccess.memberId, restrictedMemberIds));+ const siteIds = siteAccess.map(s => s.siteId);+ if (siteIds.length === 0) return [];+ return db.select().from(sites).where(inArray(sites.siteId, siteIds));+ })()+ : Promise.resolve([]),+ ]);- return siteRecords;+ // Combine and dedupe by siteId+ const siteMap = new Map<number, (typeof orgSites)[0]>();+ for (const site of orgSites) {+ siteMap.set(site.siteId, site);+ }+ for (const site of restrictedSites) {+ if (!siteMap.has(site.siteId)) {+ siteMap.set(site.siteId, site);+ }+ }++ return Array.from(siteMap.values());} catch (error) {console.error("Error getting sites user has access to:", error);// Remove from cache on error so it can be retried@@ -103,6 +158,12 @@ export async function getSitesUserHasAccessTo(req: FastifyRequest, adminOnly = freturn promise;}+// Cache invalidation helper - call this when member site access changes+export function invalidateSitesAccessCache(userId: string) {+ sitesAccessCache.del(`${userId}:true`);+ sitesAccessCache.del(`${userId}:false`);+}+export async function checkApiKey(req: FastifyRequest, options: { organizationId?: string; siteId?: string | number }) {// Check if a valid API key was provided// Priority: 1. Authorization: Bearer header (recommended), 2. Query parameter (testing only)diff --git a/server/src/lib/auth.ts b/server/src/lib/auth.tsindex 1ff06d121..45f788114 100644--- a/server/src/lib/auth.ts+++ b/server/src/lib/auth.ts@@ -2,12 +2,12 @@ import { betterAuth } from "better-auth";import { createAuthMiddleware } from "better-auth/api";import { admin, captcha, emailOTP, organization, apiKey } from "better-auth/plugins";import dotenv from "dotenv";-import { asc, eq } from "drizzle-orm";+import { and, asc, eq } from "drizzle-orm";import pg from "pg";import { db } from "../db/postgres/postgres.js";import * as schema from "../db/postgres/schema.js";-import { user } from "../db/postgres/schema.js";+import { invitation, member, memberSiteAccess, user } from "../db/postgres/schema.js";import { DISABLE_SIGNUP, IS_CLOUD } from "./const.js";import { sendEmail, sendInvitationEmail, sendWelcomeEmail } from "./email/email.js";@@ -17,16 +17,14 @@ const pluginList = [admin(),apiKey(),organization({- // Allow users to create organizationsallowUserToCreateOrganization: true,- // Set the creator role to ownercreatorRole: "owner",- sendInvitationEmail: async invitation => {- const inviteLink = `${process.env.BASE_URL}/invitation?invitationId=${invitation.invitation.id}&organization=${invitation.organization.name}&inviterEmail=${invitation.inviter.user.email}`;+ 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(- invitation.email,- invitation.inviter.user.email,- invitation.organization.name,+ invitationData.email,+ invitationData.inviter.user.email,+ invitationData.organization.name,inviteLink);},@@ -207,6 +205,68 @@ export const auth = betterAuth({sendWelcomeEmail(newSession.user.email, newSession.user.name);}}++ // Handle invitation acceptance - copy site access from invitation to member+ if (ctx.path === "/organization/accept-invitation") {+ try {+ const body = ctx.body as { invitationId?: string } | null;+ const invitationId = body?.invitationId;++ 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) {+ const { organizationId, email, hasRestrictedSiteAccess, siteIds } = invitationRecord[0];++ if (hasRestrictedSiteAccess) {+ // Find the user by email+ const userRecord = await db.select({ id: user.id }).from(user).where(eq(user.email, email)).limit(1);++ if (userRecord.length > 0) {+ 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, userRecord[0].id)))+ .limit(1);++ if (memberRecord.length > 0) {+ const memberId = memberRecord[0].id;++ // Update member with hasRestrictedSiteAccess+ await tx.update(member).set({ hasRestrictedSiteAccess: true }).where(eq(member.id, memberId));++ // Insert site access entries+ const siteIdArray = (siteIds || []) as number[];+ if (siteIdArray.length > 0) {+ await tx.insert(memberSiteAccess).values(+ siteIdArray.map(siteId => ({+ memberId: memberId,+ siteId: siteId,+ }))+ );+ }+ }+ });+ }+ }+ }+ }+ } catch (error) {+ console.error("Error copying site access from invitation to member:", error);+ }+ }}),},});