Skip to content

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

Refactor site access checks and loading states in SiteSettings component

Bill Yangc2682cc2c651
diff --git a/client/src/components/SiteSettings/SiteSettings.tsx b/client/src/components/SiteSettings/SiteSettings.tsx
index e2deaa022..0e78019fd 100644
--- a/client/src/components/SiteSettings/SiteSettings.tsx
+++ b/client/src/components/SiteSettings/SiteSettings.tsx
@@ -52,12 +52,8 @@ export function SiteSettings({
}) {
const { data: siteMetadata, isLoading, error } = useGetSite(siteId);
- if (isLoading) {
- return <div className="loading-spinner">Loading...</div>;
- }
-
- if (error || !siteMetadata) {
- return <div>Error loading site settings</div>;
+ if (isLoading || !siteMetadata || error) {
+ return null;
}
return <SiteSettingsInner siteMetadata={siteMetadata} trigger={trigger} />;
diff --git a/server/src/api/analytics/createFunnel.ts b/server/src/api/analytics/createFunnel.ts
index 010bda609..78d45b484 100644
--- a/server/src/api/analytics/createFunnel.ts
+++ b/server/src/api/analytics/createFunnel.ts
@@ -1,8 +1,8 @@
-import { FastifyRequest, FastifyReply } from "fastify";
+import { eq } from "drizzle-orm";
+import { FastifyReply, FastifyRequest } from "fastify";
import { db } from "../../db/postgres/postgres.js";
import { reports } from "../../db/postgres/schema.js";
import { getUserHasAccessToSite } from "../../lib/auth-utils.js";
-import { eq } from "drizzle-orm";
type FunnelStep = {
value: string;
diff --git a/server/src/api/analytics/deleteReport.ts b/server/src/api/analytics/deleteReport.ts
index ef98c326a..90d22f7d4 100644
--- a/server/src/api/analytics/deleteReport.ts
+++ b/server/src/api/analytics/deleteReport.ts
@@ -2,7 +2,10 @@ import { FastifyRequest, FastifyReply } from "fastify";
import { db } from "../../db/postgres/postgres.js";
import { reports } from "../../db/postgres/schema.js";
import { eq } from "drizzle-orm";
-import { getUserHasAccessToSite } from "../../lib/auth-utils.js";
+import {
+ getUserHasAccessToSite,
+ getUserHasAccessToSitePublic,
+} from "../../lib/auth-utils.js";
export async function deleteReport(
request: FastifyRequest<{
diff --git a/server/src/api/analytics/getFunnel.ts b/server/src/api/analytics/getFunnel.ts
index c107612ef..2d96e68aa 100644
--- a/server/src/api/analytics/getFunnel.ts
+++ b/server/src/api/analytics/getFunnel.ts
@@ -6,7 +6,7 @@ import {
processResults,
getFilterStatement,
} from "./utils.js";
-import { getUserHasAccessToSite } from "../../lib/auth-utils.js";
+import { getUserHasAccessToSitePublic } from "../../lib/auth-utils.js";
type FunnelStep = {
value: string;
@@ -56,7 +56,7 @@ export async function getFunnel(
}
// Check user access to site
- const userHasAccessToSite = await getUserHasAccessToSite(request, site);
+ const userHasAccessToSite = await getUserHasAccessToSitePublic(request, site);
if (!userHasAccessToSite) {
return reply.status(403).send({ error: "Forbidden" });
}
diff --git a/server/src/api/analytics/getFunnels.ts b/server/src/api/analytics/getFunnels.ts
index 4a745f089..b402897ad 100644
--- a/server/src/api/analytics/getFunnels.ts
+++ b/server/src/api/analytics/getFunnels.ts
@@ -1,7 +1,7 @@
import { FastifyRequest, FastifyReply } from "fastify";
import { db } from "../../db/postgres/postgres.js";
import { reports } from "../../db/postgres/schema.js";
-import { getUserHasAccessToSite } from "../../lib/auth-utils.js";
+import { getUserHasAccessToSitePublic } from "../../lib/auth-utils.js";
import { eq, and } from "drizzle-orm";
export async function getFunnels(
@@ -15,7 +15,7 @@ export async function getFunnels(
const { site } = request.params;
// Check user access to site
- const userHasAccessToSite = await getUserHasAccessToSite(request, site);
+ const userHasAccessToSite = await getUserHasAccessToSitePublic(request, site);
if (!userHasAccessToSite) {
return reply.status(403).send({ error: "Forbidden" });
}
diff --git a/server/src/api/analytics/getLiveUsercount.ts b/server/src/api/analytics/getLiveUsercount.ts
index 0d7021826..6ebfb7f47 100644
--- a/server/src/api/analytics/getLiveUsercount.ts
+++ b/server/src/api/analytics/getLiveUsercount.ts
@@ -1,6 +1,6 @@
import { FastifyReply, FastifyRequest } from "fastify";
import clickhouse from "../../db/clickhouse/clickhouse.js";
-import { getUserHasAccessToSite } from "../../lib/auth-utils.js";
+import { getUserHasAccessToSitePublic } from "../../lib/auth-utils.js";
import { processResults } from "./utils.js";
export const getLiveUsercount = async (
@@ -12,7 +12,7 @@ export const getLiveUsercount = async (
) => {
const { site } = req.params;
const { minutes } = req.query;
- const userHasAccessToSite = await getUserHasAccessToSite(req, site);
+ const userHasAccessToSite = await getUserHasAccessToSitePublic(req, site);
if (!userHasAccessToSite) {
return res.status(403).send({ error: "Forbidden" });
}
diff --git a/server/src/api/analytics/getOverview.ts b/server/src/api/analytics/getOverview.ts
index f41b8f671..17f552e09 100644
--- a/server/src/api/analytics/getOverview.ts
+++ b/server/src/api/analytics/getOverview.ts
@@ -5,7 +5,7 @@ import {
getTimeStatement,
processResults,
} from "./utils.js";
-import { getUserHasAccessToSite } from "../../lib/auth-utils.js";
+import { getUserHasAccessToSitePublic } from "../../lib/auth-utils.js";
import { FilterParameter } from "./types.js";
type GetOverviewResponse = {
@@ -113,7 +113,7 @@ export async function getOverview(
) {
const { startDate, endDate, timezone, filters, pastMinutes } = req.query;
const site = req.params.site;
- const userHasAccessToSite = await getUserHasAccessToSite(req, site);
+ const userHasAccessToSite = await getUserHasAccessToSitePublic(req, site);
if (!userHasAccessToSite) {
return res.status(403).send({ error: "Forbidden" });
}
diff --git a/server/src/api/analytics/getOverviewBucketed.ts b/server/src/api/analytics/getOverviewBucketed.ts
index 65a00c8fc..021ae96de 100644
--- a/server/src/api/analytics/getOverviewBucketed.ts
+++ b/server/src/api/analytics/getOverviewBucketed.ts
@@ -5,7 +5,7 @@ import {
getTimeStatement,
processResults,
} from "./utils.js";
-import { getUserHasAccessToSite } from "../../lib/auth-utils.js";
+import { getUserHasAccessToSitePublic } from "../../lib/auth-utils.js";
const TimeBucketToFn = {
minute: "toStartOfMinute",
@@ -196,7 +196,7 @@ export async function getOverviewBucketed(
req.query;
const site = req.params.site;
- const userHasAccessToSite = await getUserHasAccessToSite(req, site);
+ const userHasAccessToSite = await getUserHasAccessToSitePublic(req, site);
if (!userHasAccessToSite) {
return res.status(403).send({ error: "Forbidden" });
}
diff --git a/server/src/api/analytics/getRetention.ts b/server/src/api/analytics/getRetention.ts
index 71bfdb52a..61ee3d006 100644
--- a/server/src/api/analytics/getRetention.ts
+++ b/server/src/api/analytics/getRetention.ts
@@ -1,6 +1,6 @@
import { FastifyReply, FastifyRequest } from "fastify";
import clickhouse from "../../db/clickhouse/clickhouse.js";
-import { getUserHasAccessToSite } from "../../lib/auth-utils.js";
+import { getUserHasAccessToSitePublic } from "../../lib/auth-utils.js";
import { processResults } from "./utils.js";
// Define the expected shape of a single data row from the query
@@ -36,7 +36,7 @@ export const getRetention = async (
// Validate range parameter (between 7-365 days)
const timeRange = Math.min(365, Math.max(7, parseInt(range) || 90));
- const userHasAccessToSite = await getUserHasAccessToSite(req, site);
+ const userHasAccessToSite = await getUserHasAccessToSitePublic(req, site);
if (!userHasAccessToSite) {
return res.status(403).send({ error: "Forbidden" });
}
diff --git a/server/src/api/analytics/getSession.ts b/server/src/api/analytics/getSession.ts
index 0aa48e26d..1cb2b182a 100644
--- a/server/src/api/analytics/getSession.ts
+++ b/server/src/api/analytics/getSession.ts
@@ -1,6 +1,6 @@
import { FastifyReply, FastifyRequest } from "fastify";
import clickhouse from "../../db/clickhouse/clickhouse.js";
-import { getUserHasAccessToSite } from "../../lib/auth-utils.js";
+import { getUserHasAccessToSitePublic } from "../../lib/auth-utils.js";
import { processResults } from "./utils.js";
export interface SessionDetails {
@@ -56,7 +56,7 @@ export async function getSession(
) {
const { sessionId, site } = req.params;
- const userHasAccessToSite = await getUserHasAccessToSite(req, site);
+ const userHasAccessToSite = await getUserHasAccessToSitePublic(req, site);
if (!userHasAccessToSite) {
return res.status(403).send({ error: "Forbidden" });
}
diff --git a/server/src/api/analytics/getSessions.ts b/server/src/api/analytics/getSessions.ts
index 87f761489..a1818aa5a 100644
--- a/server/src/api/analytics/getSessions.ts
+++ b/server/src/api/analytics/getSessions.ts
@@ -5,7 +5,7 @@ import {
getTimeStatement,
processResults,
} from "./utils.js";
-import { getUserHasAccessToSite } from "../../lib/auth-utils.js";
+import { getUserHasAccessToSitePublic } from "../../lib/auth-utils.js";
export type GetSessionsResponse = {
session_id: string;
@@ -48,7 +48,7 @@ export async function getSessions(
) {
const { startDate, endDate, timezone, filters, page, userId } = req.query;
const site = req.params.site;
- const userHasAccessToSite = await getUserHasAccessToSite(req, site);
+ const userHasAccessToSite = await getUserHasAccessToSitePublic(req, site);
if (!userHasAccessToSite) {
return res.status(403).send({ error: "Forbidden" });
}
diff --git a/server/src/api/analytics/getSingleCol.ts b/server/src/api/analytics/getSingleCol.ts
index 5a87cf8e1..477d15bd5 100644
--- a/server/src/api/analytics/getSingleCol.ts
+++ b/server/src/api/analytics/getSingleCol.ts
@@ -6,7 +6,7 @@ import {
getTimeStatement,
processResults,
} from "./utils.js";
-import { getUserHasAccessToSite } from "../../lib/auth-utils.js";
+import { getUserHasAccessToSitePublic } from "../../lib/auth-utils.js";
import { FilterParameter } from "./types.js";
interface GenericRequest {
@@ -152,7 +152,7 @@ export async function getSingleCol(
const { parameter } = req.query;
const site = req.params.site;
- const userHasAccessToSite = await getUserHasAccessToSite(req, site);
+ const userHasAccessToSite = await getUserHasAccessToSitePublic(req, site);
if (!userHasAccessToSite) {
return res.status(403).send({ error: "Forbidden" });
}
diff --git a/server/src/api/analytics/getUserSessions.ts b/server/src/api/analytics/getUserSessions.ts
index df798a7e3..6eddf8762 100644
--- a/server/src/api/analytics/getUserSessions.ts
+++ b/server/src/api/analytics/getUserSessions.ts
@@ -5,7 +5,7 @@ import {
getTimeStatement,
processResults,
} from "./utils.js";
-import { getUserHasAccessToSite } from "../../lib/auth-utils.js";
+import { getUserHasAccessToSitePublic } from "../../lib/auth-utils.js";
// Individual pageview type
type Pageview = {
@@ -60,7 +60,7 @@ export async function getUserSessions(
const { startDate, endDate, timezone, site, filters } = req.query;
const userId = req.params.userId;
- const userHasAccessToSite = await getUserHasAccessToSite(req, site);
+ const userHasAccessToSite = await getUserHasAccessToSitePublic(req, site);
if (!userHasAccessToSite) {
return res.status(403).send({ error: "Forbidden" });
}
diff --git a/server/src/api/analytics/getUsers.ts b/server/src/api/analytics/getUsers.ts
index 34ba7988c..df471737c 100644
--- a/server/src/api/analytics/getUsers.ts
+++ b/server/src/api/analytics/getUsers.ts
@@ -5,7 +5,7 @@ import {
getTimeStatement,
processResults,
} from "./utils.js";
-import { getUserHasAccessToSite } from "../../lib/auth-utils.js";
+import { getUserHasAccessToSitePublic } from "../../lib/auth-utils.js";
export type GetUsersResponse = {
user_id: string;
@@ -55,7 +55,7 @@ export async function getUsers(
} = req.query;
const site = req.params.site;
- const userHasAccessToSite = await getUserHasAccessToSite(req, site);
+ const userHasAccessToSite = await getUserHasAccessToSitePublic(req, site);
if (!userHasAccessToSite) {
return res.status(403).send({ error: "Forbidden" });
}
diff --git a/server/src/api/sites/changeSiteDomain.ts b/server/src/api/sites/changeSiteDomain.ts
index fe68e1902..9e35b85ce 100644
--- a/server/src/api/sites/changeSiteDomain.ts
+++ b/server/src/api/sites/changeSiteDomain.ts
@@ -3,6 +3,7 @@ import { FastifyReply, FastifyRequest } from "fastify";
import { db } from "../../db/postgres/postgres.js";
import { sites } from "../../db/postgres/schema.js";
import { loadAllowedDomains } from "../../lib/allowedDomains.js";
+import { getUserHasAccessToSite } from "../../lib/auth-utils.js";
export async function changeSiteDomain(
request: FastifyRequest<{
@@ -15,6 +16,14 @@ export async function changeSiteDomain(
) {
const { siteId, newDomain } = request.body;
+ const userHasAccessToSite = await getUserHasAccessToSite(
+ request,
+ String(siteId)
+ );
+ if (!userHasAccessToSite) {
+ return reply.status(403).send({ error: "Forbidden" });
+ }
+
// Validate domain format using regex
const domainRegex =
/^(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,}$/;
diff --git a/server/src/api/sites/changeSitePublic.ts b/server/src/api/sites/changeSitePublic.ts
index 825257863..9c1dd9458 100644
--- a/server/src/api/sites/changeSitePublic.ts
+++ b/server/src/api/sites/changeSitePublic.ts
@@ -2,6 +2,7 @@ import { FastifyRequest, FastifyReply } from "fastify";
import { db } from "../../db/postgres/postgres.js";
import { sites } from "../../db/postgres/schema.js";
import { eq } from "drizzle-orm";
+import { getUserHasAccessToSite } from "../../lib/auth-utils.js";
interface ChangeSitePublicRequest {
Body: {
@@ -15,10 +16,13 @@ export async function changeSitePublic(
reply: FastifyReply
) {
const { siteId, isPublic } = request.body;
- const userId = request.user?.id;
- if (!userId) {
- return reply.status(401).send({ error: "Unauthorized" });
+ const userHasAccessToSite = await getUserHasAccessToSite(
+ request,
+ String(siteId)
+ );
+ if (!userHasAccessToSite) {
+ return reply.status(403).send({ error: "Forbidden" });
}
try {
@@ -32,9 +36,9 @@ export async function changeSitePublic(
}
// Check if user is authorized to modify the site
- if (site.createdBy !== userId) {
- return reply.status(403).send({ error: "Forbidden" });
- }
+ // if (site.createdBy !== userId) {
+ // return reply.status(403).send({ error: "Forbidden" });
+ // }
// Update site public status
await db
diff --git a/server/src/api/sites/deleteSite.ts b/server/src/api/sites/deleteSite.ts
index 303c5bf09..33020ff15 100644
--- a/server/src/api/sites/deleteSite.ts
+++ b/server/src/api/sites/deleteSite.ts
@@ -3,6 +3,7 @@ import { FastifyReply, FastifyRequest } from "fastify";
import { db } from "../../db/postgres/postgres.js";
import { sites } from "../../db/postgres/schema.js";
import { loadAllowedDomains } from "../../lib/allowedDomains.js";
+import { getUserHasAccessToSite } from "../../lib/auth-utils.js";
export async function deleteSite(
request: FastifyRequest<{ Params: { id: string } }>,
@@ -10,6 +11,11 @@ export async function deleteSite(
) {
const { id } = request.params;
+ const userHasAccessToSite = await getUserHasAccessToSite(request, id);
+ if (!userHasAccessToSite) {
+ return reply.status(403).send({ error: "Forbidden" });
+ }
+
await db.delete(sites).where(eq(sites.siteId, Number(id)));
// await clickhouse.query({
// query: `DELETE FROM pageviews WHERE site_id = ${id}`,
diff --git a/server/src/api/user/listUsers.ts b/server/src/api/user/listUsers.ts
deleted file mode 100644
index 04eb9d0e8..000000000
--- a/server/src/api/user/listUsers.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { FastifyReply, FastifyRequest } from "fastify";
-import { sql } from "../../db/postgres/postgres.js";
-
-type ListUsersResponse = {
- id: string;
- name: string;
- username: string;
- email: string;
- emailVerified: boolean;
- role: string;
- createdAt: string;
- updatedAt: string;
-}[];
-
-export async function listUsers(_: FastifyRequest, res: FastifyReply) {
- try {
- const users = await sql<ListUsersResponse[]>`SELECT * FROM "user"`;
- return res.send({ data: users });
- } catch (error) {
- console.error("Error fetching users:", error);
- return res.status(500).send({ error: "Failed to fetch users" });
- }
-}
diff --git a/server/src/index.ts b/server/src/index.ts
index 0494c0645..a3ea12a62 100644
--- a/server/src/index.ts
+++ b/server/src/index.ts
@@ -25,13 +25,13 @@ import { addSite } from "./api/sites/addSite.js";
import { changeSiteDomain } from "./api/sites/changeSiteDomain.js";
import { changeSitePublic } from "./api/sites/changeSitePublic.js";
import { deleteSite } from "./api/sites/deleteSite.js";
+import { getSite } from "./api/sites/getSite.js";
import { getSiteHasData } from "./api/sites/getSiteHasData.js";
import { getSites } from "./api/sites/getSites.js";
import { createAccount } from "./api/user/createAccount.js";
import { getUserOrganizations } from "./api/user/getUserOrganizations.js";
import { getUserSubscription } from "./api/user/getUserSubscription.js";
import { listOrganizationMembers } from "./api/user/listOrganizationMembers.js";
-import { listUsers } from "./api/user/listUsers.js";
import { initializeCronJobs } from "./cron/index.js";
import { initializeClickhouse } from "./db/clickhouse/clickhouse.js";
import { initializePostgres } from "./db/postgres/postgres.js";
@@ -41,7 +41,6 @@ import { mapHeaders } from "./lib/auth-utils.js";
import { auth } from "./lib/auth.js";
import { trackEvent } from "./tracker/trackEvent.js";
import { extractSiteId, isSitePublic } from "./utils.js";
-import { getSite } from "./api/sites/getSite.js";
const __filename = fileURLToPath(import.meta.url);
const __dirname = dirname(__filename);
@@ -114,6 +113,8 @@ const ANALYTICS_ROUTES = [
"/users/",
"/user/info/",
"/live-session-locations/",
+ "/funnels/",
+ "/funnel/",
"/get-site",
];
@@ -187,7 +188,6 @@ server.post("/change-site-public", changeSitePublic);
server.post("/delete-site/:id", deleteSite);
server.get("/get-sites", getSites);
server.get("/get-site/:id", getSite);
-server.get("/list-users", listUsers);
server.post("/create-account", createAccount);
server.get(
"/list-organization-members/:organizationId",
diff --git a/server/src/lib/auth-utils.ts b/server/src/lib/auth-utils.ts
index 37e25c18b..0dffcdc1f 100644
--- a/server/src/lib/auth-utils.ts
+++ b/server/src/lib/auth-utils.ts
@@ -61,9 +61,10 @@ export async function getSitesUserHasAccessTo(req: FastifyRequest) {
}
}
-export async function getUserHasAccessToSite(
+// for routes that are potentially public
+export async function getUserHasAccessToSitePublic(
req: FastifyRequest,
- siteId: string
+ siteId: string | number
) {
const [sites, isPublic] = await Promise.all([
getSitesUserHasAccessTo(req),
@@ -71,3 +72,11 @@ export async function getUserHasAccessToSite(
]);
return sites.some((site) => site.siteId === Number(siteId)) || isPublic;
}
+
+export async function getUserHasAccessToSite(
+ req: FastifyRequest,
+ siteId: string | number
+) {
+ const sites = await getSitesUserHasAccessTo(req);
+ return sites.some((site) => site.siteId === Number(siteId));
+}