Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

Implement admin role checks in SiteSettings and enhance auth middleware

Bill Yangda70d0cbc735
diff --git a/client/src/components/SiteSettings/SiteSettings.tsx b/client/src/components/SiteSettings/SiteSettings.tsx
index a5777d279..8551125d4 100644
--- a/client/src/components/SiteSettings/SiteSettings.tsx
+++ b/client/src/components/SiteSettings/SiteSettings.tsx
@@ -19,6 +19,7 @@ import { Button } from "@/components/ui/button";
import { Dialog, DialogClose, DialogContent, DialogTitle, DialogTrigger } from "@/components/ui/dialog";
import { Switch } from "@/components/ui/switch";
import { toast } from "@/components/ui/sonner";
+import { authClient } from "@/lib/auth";
import { cn } from "@/lib/utils";
import { ScriptBuilder } from "./ScriptBuilder";
@@ -59,9 +60,10 @@ type TabKey =
function SiteSettingsInner({ siteMetadata, trigger }: { siteMetadata: SiteResponse; trigger?: React.ReactNode }) {
const t = useExtracted();
+ const { data: session } = authClient.useSession();
const { data: userOrganizationsData } = useUserOrganizations();
const siteOrgMembership = userOrganizationsData?.find(org => org.id === siteMetadata.organizationId);
- const disabled = !siteOrgMembership?.role || siteOrgMembership.role === "member";
+ const disabled = session?.user.role !== "admin" && (!siteOrgMembership?.role || siteOrgMembership.role === "member");
const [dialogOpen, setDialogOpen] = useState(false);
const [activeTab, setActiveTab] = useState<TabKey>("general");
diff --git a/server/src/lib/auth-middleware.test.ts b/server/src/lib/auth-middleware.test.ts
index 0c0d3f0fb..a4bb75acd 100644
--- a/server/src/lib/auth-middleware.test.ts
+++ b/server/src/lib/auth-middleware.test.ts
@@ -45,6 +45,7 @@ describe("auth middleware scope enforcement", () => {
mocks.getUserHasAdminAccessToSite.mockResolvedValue(false);
mocks.getUserHasAccessToSitePublic.mockResolvedValue(false);
mocks.getUserIsInOrg.mockResolvedValue(false);
+ mocks.getIsUserAdmin.mockResolvedValue(false);
mocks.checkApiKey.mockResolvedValue(invalidResult);
app = Fastify();
@@ -116,6 +117,16 @@ describe("auth middleware scope enforcement", () => {
expect(response.statusCode).toBe(200);
});
+ it("allows Better Auth system admins on site-admin routes without organization-admin access", async () => {
+ mocks.getIsUserAdmin.mockResolvedValue(true);
+ mocks.getSessionFromReq.mockResolvedValue({ user: { id: "system_admin", role: "admin" } });
+
+ const response = await app.inject({ method: "DELETE", url: "/sites/5" });
+
+ expect(response.statusCode).toBe(200);
+ expect(mocks.getUserHasAdminAccessToSite).not.toHaveBeenCalled();
+ });
+
it("falls through to session access when the bearer scope is insufficient", async () => {
mocks.checkApiKey.mockResolvedValue(bearerResult({ goals: ["read"] }));
mocks.getUserHasAccessToSite.mockResolvedValue(true);
diff --git a/server/src/lib/auth-middleware.ts b/server/src/lib/auth-middleware.ts
index b0f9712d3..dcbec681b 100644
--- a/server/src/lib/auth-middleware.ts
+++ b/server/src/lib/auth-middleware.ts
@@ -184,6 +184,15 @@ export function requireSiteAdminAccess(scope?: RouteScope): AuthMiddleware {
scopeDenied = true;
}
+ // Better Auth system admins have account-wide authority and do not need
+ // an admin/owner membership in the organization that owns the site.
+ const isSystemAdmin = await getIsUserAdmin(request);
+ if (isSystemAdmin) {
+ const session = await getSessionFromReq(request);
+ if (session?.user) request.user = session.user;
+ return;
+ }
+
// Check session-based admin access
const hasAdminAccess = await getUserHasAdminAccessToSite(request, siteId);
if (hasAdminAccess) {