🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Refactor DisabledOverlay and enhance site access checks
Bill Yange177d5ba65b5
diff --git a/client/src/components/DisabledOverlay.tsx b/client/src/components/DisabledOverlay.tsxindex 9cfa0d75a..701b832b2 100644--- a/client/src/components/DisabledOverlay.tsx+++ b/client/src/components/DisabledOverlay.tsx@@ -51,7 +51,7 @@ function ownerMessage(message: string, featurePath?: string, requiredPlan?: "pro);}-function userMessage(message: string, featurePath?: string, requiredPlan?: "pro" | "standard") {+function userMessage(message: string, featurePath?: string) {return (<div className="bg-neutral-900 rounded-lg border border-neutral-700 shadow-xl flex flex-col gap-3 p-4"><div className="flex gap-3">@@ -117,9 +117,7 @@ export const DisabledOverlay: React.FC<DisabledOverlayProps> = ({<div className="absolute inset-0 flex items-center justify-center z-10" style={borderRadiusStyle}>{showMessage && (<div className="flex items-center justify-center">- {site?.isOwner- ? ownerMessage(message, featurePath, requiredPlan)- : userMessage(message, featurePath, requiredPlan)}+ {site?.isOwner ? ownerMessage(message, featurePath, requiredPlan) : userMessage(message, featurePath)}</div>)}</div>diff --git a/server/src/api/sites/getSite.ts b/server/src/api/sites/getSite.tsindex 90bdf7c88..932cfe698 100644--- a/server/src/api/sites/getSite.ts+++ b/server/src/api/sites/getSite.ts@@ -2,7 +2,7 @@ import { eq } from "drizzle-orm";import { FastifyReply, FastifyRequest } from "fastify";import { db } from "../../db/postgres/postgres.js";import { sites } from "../../db/postgres/schema.js";-import { getUserHasAccessToSitePublic } from "../../lib/auth-utils.js";+import { getUserHasAccessToSitePublic, getUserHasAdminAccessToSite } from "../../lib/auth-utils.js";interface GetSiteParams {Params: {@@ -12,7 +12,6 @@ interface GetSiteParams {export async function getSite(request: FastifyRequest<GetSiteParams>, reply: FastifyReply) {const { id } = request.params;- const userId = request.user?.id;try {// Get site info@@ -24,11 +23,12 @@ export async function getSite(request: FastifyRequest<GetSiteParams>, reply: Fasreturn reply.status(404).send({ error: "Site not found" });}- // Check if user is authorized to access this site- const isOwner = site.createdBy === userId;+ // Check user access to site and owner status in parallel+ const [userHasAccessToSite, isOwner] = await Promise.all([+ getUserHasAccessToSitePublic(request, site.siteId),+ getUserHasAdminAccessToSite(request, site.siteId),+ ]);- // Check user access to site- const userHasAccessToSite = await getUserHasAccessToSitePublic(request, site.siteId);if (!userHasAccessToSite) {return reply.status(403).send({ error: "Forbidden" });}diff --git a/server/src/api/sites/getSitesFromOrg.ts b/server/src/api/sites/getSitesFromOrg.tsindex f1ad63a57..780aa5df0 100644--- a/server/src/api/sites/getSitesFromOrg.ts+++ b/server/src/api/sites/getSitesFromOrg.ts@@ -89,7 +89,7 @@ export async function getSitesFromOrg(const enhancedSitesData = sitesData.map(site => ({...site,sessionsLast24Hours: sessionCountMap.get(site.siteId) || 0,- isOwner: isOwner,+ isOwner: memberCheck[0]?.role !== "member",}));// Sort by sessions descending