🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Refactor site data handling and public access checks
Bill Yangd7336f28aa5a
diff --git a/client/src/api/admin/sites.ts b/client/src/api/admin/sites.tsindex 1868acb6a..c5e783763 100644--- a/client/src/api/admin/sites.ts+++ b/client/src/api/admin/sites.ts@@ -3,7 +3,7 @@ import { BACKEND_URL } from "../../lib/const";import { useStore } from "../../lib/store";import { authedFetch, genericQuery, useGenericQuery } from "../utils";-export type GetSitesResponse = {+export type SiteResponse = {siteId: number;name: string;domain: string;@@ -11,11 +11,10 @@ export type GetSitesResponse = {updatedAt: string;createdBy: string;public: boolean;- overMonthlyLimit?: boolean;- monthlyEventCount?: number;- eventLimit?: number;- isOwner?: boolean;-}[];+ isOwner: boolean;+};++export type GetSitesResponse = SiteResponse[];export function useGetSites() {return useGenericQuery<GetSitesResponse>("get-sites");@@ -58,6 +57,19 @@ export function changeSiteDomain(siteId: number, newDomain: string) {});}+export function changeSitePublic(siteId: number, isPublic: boolean) {+ return authedFetch(`${BACKEND_URL}/change-site-public`, {+ method: "POST",+ body: JSON.stringify({+ siteId,+ isPublic,+ }),+ headers: {+ "Content-Type": "application/json",+ },+ });+}+export function useSiteHasData(siteId: string) {return useQuery({queryKey: ["site-has-data", siteId],@@ -73,14 +85,33 @@ export function useSiteHasData(siteId: string) {});}-export function useGetSiteMetadata(siteId?: string | number) {- const { data, isLoading } = useGetSites();- const { site } = useStore();+export function useGetSite(siteId?: string | number) {+ const { site: storeSelectedSite } = useStore();++ const siteIdToUse = siteId ?? storeSelectedSite;++ return useQuery({+ queryKey: ["get-site", siteIdToUse],+ queryFn: async () => {+ if (!siteIdToUse) {+ return null;+ }++ // Use regular fetch instead of authedFetch to support public sites+ const response = await authedFetch(+ `${BACKEND_URL}/get-site/${siteIdToUse}`+ );- const siteIdToUse = siteId ?? site;+ if (!response.ok) {+ if (response.status === 404) {+ return null;+ }+ throw new Error("Failed to fetch site");+ }- return {- siteMetadata: data?.find((site) => site.siteId === Number(siteIdToUse)),- isLoading,- };+ return response.json() as Promise<SiteResponse>;+ },+ staleTime: 60000, // 1 minute+ enabled: !!siteId,+ });}diff --git a/client/src/app/[site]/components/Header/Header.tsx b/client/src/app/[site]/components/Header/Header.tsxindex 43dfdfe16..bfaa00a2a 100644--- a/client/src/app/[site]/components/Header/Header.tsx+++ b/client/src/app/[site]/components/Header/Header.tsx@@ -1,15 +1,11 @@"use client";import { usePathname } from "next/navigation";-import { useGetSites } from "../../../../api/admin/sites";-import { UsageBanners } from "./UsageBanners";+import { useGetSite } from "../../../../api/admin/sites";export function Header() {- const { data: sites } = useGetSites();const pathname = usePathname();- const site = sites?.find(- (site) => site.siteId === Number(pathname.split("/")[1])- );+ const { data: site } = useGetSite(Number(pathname.split("/")[1]));return (<div className="flex flex-col">{/* <UsageBanners site={site} /> */}</div>diff --git a/client/src/app/[site]/components/Sidebar/Sidebar.tsx b/client/src/app/[site]/components/Sidebar/Sidebar.tsxindex 440c23165..b1411524d 100644--- a/client/src/app/[site]/components/Sidebar/Sidebar.tsx+++ b/client/src/app/[site]/components/Sidebar/Sidebar.tsx@@ -11,18 +11,15 @@ import {} from "lucide-react";import Link from "next/link";import { usePathname } from "next/navigation";-import { useGetSites } from "../../../../api/admin/sites";+import { useGetSite } from "../../../../api/admin/sites";import { SiteSettings } from "../../../../components/SiteSettings/SiteSettings";import LiveUserCount from "./LiveUserCount";import { SiteSelector } from "./SiteSelector";export function Sidebar() {- const { data: sites } = useGetSites();const pathname = usePathname();- const site = sites?.find(- (site) => site.siteId === Number(pathname.split("/")[1])- );+ const { data: site } = useGetSite(Number(pathname.split("/")[1]));// Check which tab is active based on the current pathconst getTabPath = (tabName: string) => {diff --git a/client/src/app/[site]/components/Sidebar/SiteSelector.tsx b/client/src/app/[site]/components/Sidebar/SiteSelector.tsxindex ceb89a8cd..7e478c851 100644--- a/client/src/app/[site]/components/Sidebar/SiteSelector.tsx+++ b/client/src/app/[site]/components/Sidebar/SiteSelector.tsx@@ -1,21 +1,56 @@import { Check } from "lucide-react";import { usePathname, useRouter } from "next/navigation";-import { useGetSites } from "../../../../api/admin/sites";+import { useGetSite, useGetSites } from "../../../../api/admin/sites";import {DropdownMenu,DropdownMenuContent,DropdownMenuItem,DropdownMenuTrigger,} from "../../../../components/ui/dropdown-menu";+import { userStore } from "../../../../lib/userStore";-export function SiteSelector() {+function SiteSelectorContent() {const { data: sites } = useGetSites();const pathname = usePathname();const router = useRouter();-const currentSiteId = Number(pathname.split("/")[1]);- const site = sites?.find((site) => site.siteId === currentSiteId);+ return (+ <DropdownMenuContent align="start">+ {sites?.map((site) => {+ const isSelected = site.siteId === currentSiteId;+ return (+ <DropdownMenuItem+ key={site.siteId}+ onClick={() => {+ router.push(`/${site.siteId}`);+ }}+ className={`flex items-center justify-between ${+ isSelected ? "bg-neutral-800" : ""+ }`}+ >+ <div className="flex items-center gap-2">+ <img+ className="w-4 h-4"+ src={`https://www.google.com/s2/favicons?domain=${site.domain}&sz=64`}+ alt={site.domain}+ />+ <span>{site.domain}</span>+ </div>+ {isSelected && <Check size={16} />}+ </DropdownMenuItem>+ );+ })}+ </DropdownMenuContent>+ );+}++export function SiteSelector() {+ const pathname = usePathname();++ const { user } = userStore();+ const currentSiteId = Number(pathname.split("/")[1]);+ const { data: site } = useGetSite(currentSiteId);return (<DropdownMenu>@@ -31,32 +66,7 @@ export function SiteSelector() {</div>)}</DropdownMenuTrigger>- <DropdownMenuContent align="start">- {sites?.map((site) => {- const isSelected = site.siteId === currentSiteId;- return (- <DropdownMenuItem- key={site.siteId}- onClick={() => {- router.push(`/${site.siteId}`);- }}- className={`flex items-center justify-between ${- isSelected ? "bg-neutral-800" : ""- }`}- >- <div className="flex items-center gap-2">- <img- className="w-4 h-4"- src={`https://www.google.com/s2/favicons?domain=${site.domain}&sz=64`}- alt={site.domain}- />- <span>{site.domain}</span>- </div>- {isSelected && <Check size={16} />}- </DropdownMenuItem>- );- })}- </DropdownMenuContent>+ {user && <SiteSelectorContent />}</DropdownMenu>);}diff --git a/client/src/app/[site]/components/SubHeader/SubHeader.tsx b/client/src/app/[site]/components/SubHeader/SubHeader.tsxindex 2f4b0ea86..d385577be 100644--- a/client/src/app/[site]/components/SubHeader/SubHeader.tsx+++ b/client/src/app/[site]/components/SubHeader/SubHeader.tsx@@ -6,8 +6,6 @@ import { FilterParameter, goBack, goForward, useStore } from "@/lib/store";import { ChevronLeft, ChevronRight } from "lucide-react";import { DateTime } from "luxon";-import { usePathname } from "next/navigation";-import { useGetSites } from "../../../../api/admin/sites";import { DateSelector } from "../../../../components/DateSelector/DateSelector";import { Time } from "../../../../components/DateSelector/types";@@ -42,10 +40,6 @@ export function SubHeader({availableFilters?: FilterParameter[];}) {const { time, setTime } = useStore();- const { data: sites } = useGetSites();- const pathname = usePathname();-- const site = sites?.find((site) => site.siteId === Number(pathname.slice(1)));return (<div className="flex gap-2 mb-3 mt-1 justify-between">diff --git a/client/src/app/[site]/layout.tsx b/client/src/app/[site]/layout.tsxindex 0c4bda64f..f2105190f 100644--- a/client/src/app/[site]/layout.tsx+++ b/client/src/app/[site]/layout.tsx@@ -4,7 +4,7 @@ import { useEffect } from "react";import { useStore } from "../../lib/store";import { useSyncStateWithUrl } from "../../lib/urlParams";import { Header } from "./components/Header/Header";-import { useSiteHasData, useGetSiteMetadata } from "../../api/admin/sites";+import { useSiteHasData, useGetSite } from "../../api/admin/sites";import { NoData } from "./components/NoData";import { TopBar } from "../../components/TopBar";import { Sidebar } from "./components/Sidebar/Sidebar";@@ -18,8 +18,8 @@ export default function SiteLayout({const { setSite, site } = useStore();const { data: siteHasData, isLoading } = useSiteHasData(site);- const { siteMetadata, isLoading: isLoadingSiteMetadata } =- useGetSiteMetadata();+ const { data: siteMetadata, isLoading: isLoadingSiteMetadata } =+ useGetSite(site);// Sync store state with URL parametersuseSyncStateWithUrl();diff --git a/client/src/app/[site]/main/components/sections/Pages.tsx b/client/src/app/[site]/main/components/sections/Pages.tsxindex 5f2862d6e..e0a26db6e 100644--- a/client/src/app/[site]/main/components/sections/Pages.tsx+++ b/client/src/app/[site]/main/components/sections/Pages.tsx@@ -1,10 +1,6 @@"use client";import { useState } from "react";-import {- GetSitesResponse,- useGetSiteMetadata,-} from "../../../../../api/admin/sites";import {Tabs,TabsContent,@@ -14,11 +10,12 @@ import {import { Card, CardContent } from "../../../../../components/ui/card";import { StandardSection } from "../../../components/shared/StandardSection/StandardSection";import { StandardSectionRealtime } from "../../../components/shared/StandardSection/StandardSectionRealtime";+import { useGetSite } from "../../../../../api/admin/sites";type Tab = "pages" | "entry_pages" | "exit_pages";export function Pages({ isRealtime = false }: { isRealtime?: boolean }) {- const { siteMetadata } = useGetSiteMetadata();+ const { data: siteMetadata } = useGetSite();const [tab, setTab] = useState<Tab>("pages");const ComponentToUse = isRealtime ? StandardSectionRealtime : StandardSection;diff --git a/client/src/app/[site]/main/page.tsx b/client/src/app/[site]/main/page.tsxindex ca2b6cac6..766e9cabf 100644--- a/client/src/app/[site]/main/page.tsx+++ b/client/src/app/[site]/main/page.tsx@@ -1,5 +1,5 @@"use client";-import { useGetSiteMetadata } from "../../../api/admin/sites";+import { useGetSite } from "../../../api/admin/sites";import { useStore } from "../../../lib/store";import { SubHeader } from "../components/SubHeader/SubHeader";import { MainSection } from "./components/MainSection/MainSection";@@ -21,8 +21,7 @@ export default function MainPage() {}function MainPageContent() {- const { siteMetadata, isLoading: isLoadingSiteMetadata } =- useGetSiteMetadata();+ const { data: siteMetadata, isLoading: isLoadingSiteMetadata } = useGetSite();if (isLoadingSiteMetadata || !siteMetadata) {return null;diff --git a/client/src/app/layout.tsx b/client/src/app/layout.tsxindex 81358f84f..6ced02893 100644--- a/client/src/app/layout.tsx+++ b/client/src/app/layout.tsx@@ -1,16 +1,15 @@"use client";-import { TopBar } from "@/components/TopBar";+import { BACKEND_URL } from "@/lib/const";import QueryProvider from "@/providers/QueryProvider";-import { ThemeProvider } from "@/providers/ThemeProvider";import type { Metadata } from "next";import { Inter } from "next/font/google";import { redirect, usePathname } from "next/navigation";-import { useEffect } from "react";-import { userStore } from "../lib/userStore";-import "./globals.css";+import { useEffect, useState } from "react";import { Toaster } from "../components/ui/sonner";import { TooltipProvider } from "../components/ui/tooltip";+import { userStore } from "../lib/userStore";+import "./globals.css";const inter = Inter({ subsets: ["latin"] });@@ -20,20 +19,68 @@ const metadata: Metadata = {};const publicRoutes = ["/login", "/signup"];+// Helper function to check if a site is public+async function checkIfSiteIsPublic(siteId: string): Promise<boolean> {+ try {+ const response = await fetch(`${BACKEND_URL}/site-has-data/${siteId}`);+ if (response.ok) {+ const data = await response.json();+ return !!data.public;+ }+ } catch (error) {+ console.error("Error checking if site is public:", error);+ }+ return false;+}+export default function RootLayout({children,}: {children: React.ReactNode;}) {const { user, isPending } = userStore();-const pathname = usePathname();+ const [isCheckingPublic, setIsCheckingPublic] = useState(false);+ const [isPublicSite, setIsPublicSite] = useState(false);++ useEffect(() => {+ // Check if the current path could be a site path+ // Extract potential siteId from path like /{siteId} or /{siteId}/something+ const pathSegments = pathname.split("/").filter(Boolean);+ if (pathSegments.length > 0) {+ const potentialSiteId = pathSegments[0];++ // Don't check for public site status on obvious non-site paths+ if (+ !publicRoutes.includes(`/${potentialSiteId}`) &&+ !["_next", "api", "settings", "subscribe"].includes(potentialSiteId)+ ) {+ setIsCheckingPublic(true);++ checkIfSiteIsPublic(potentialSiteId).then((isPublic) => {+ setIsPublicSite(isPublic);+ setIsCheckingPublic(false);+ });+ }+ }+ }, [pathname]);useEffect(() => {- if (!isPending && !user && !publicRoutes.includes(pathname)) {+ // Only redirect if:+ // 1. We're not checking public status anymore+ // 2. User is not logged in+ // 3. Not on a public route+ // 4. Not on a public site+ if (+ !isPending &&+ !isCheckingPublic &&+ !user &&+ !publicRoutes.includes(pathname) &&+ !isPublicSite+ ) {redirect("/login");}- }, [isPending, user, pathname]);+ }, [isPending, user, pathname, isCheckingPublic, isPublicSite]);return (<html lang="en" className="h-full dark">diff --git a/client/src/components/SiteSettings/SiteSettings.tsx b/client/src/components/SiteSettings/SiteSettings.tsxindex c9e41f419..e2deaa022 100644--- a/client/src/components/SiteSettings/SiteSettings.tsx+++ b/client/src/components/SiteSettings/SiteSettings.tsx@@ -34,9 +34,11 @@ import { Switch } from "@/components/ui/switch";import {changeSiteDomain,+ changeSitePublic,deleteSite,GetSitesResponse,- useGetSiteMetadata,+ SiteResponse,+ useGetSite,useGetSites,} from "@/api/admin/sites";import { BACKEND_URL } from "@/lib/const";@@ -48,10 +50,14 @@ export function SiteSettings({siteId: number;trigger?: React.ReactNode;}) {- const { siteMetadata } = useGetSiteMetadata(siteId);+ const { data: siteMetadata, isLoading, error } = useGetSite(siteId);- if (!siteMetadata) {- return null;+ if (isLoading) {+ return <div className="loading-spinner">Loading...</div>;+ }++ if (error || !siteMetadata) {+ return <div>Error loading site settings</div>;}return <SiteSettingsInner siteMetadata={siteMetadata} trigger={trigger} />;@@ -61,13 +67,15 @@ export function SiteSettingsInner({siteMetadata,trigger,}: {- siteMetadata: GetSitesResponse[number];+ siteMetadata: SiteResponse | GetSitesResponse[number];trigger?: React.ReactNode;}) {const { refetch } = useGetSites();const router = useRouter();const [newDomain, setNewDomain] = useState(siteMetadata.domain);const [isChangingDomain, setIsChangingDomain] = useState(false);+ const [isPublic, setIsPublic] = useState(siteMetadata.public || false);+ const [isChangingPublic, setIsChangingPublic] = useState(false);const [isDeleting, setIsDeleting] = useState(false);const [dialogOpen, setDialogOpen] = useState(false);@@ -129,6 +137,24 @@ export function SiteSettingsInner({}};+ const handlePublicToggle = async (checked: boolean) => {+ try {+ setIsChangingPublic(true);+ await changeSitePublic(siteMetadata.siteId, checked);+ setIsPublic(checked);+ toast.success(+ checked ? "Site analytics made public" : "Site analytics made private"+ );+ refetch();+ } catch (error) {+ console.error("Error changing public status:", error);+ toast.error("Failed to update public status");+ setIsPublic(!checked); // Revert UI state on error+ } finally {+ setIsChangingPublic(false);+ }+ };+if (!siteMetadata) {return null;}@@ -218,8 +244,30 @@ export function SiteSettingsInner({</div></div>+ {/* Public Analytics Section */}+ <div className="flex items-center justify-between">+ <div>+ <Label+ htmlFor="publicAnalytics"+ className="text-sm font-medium text-foreground block"+ >+ Public Analytics+ </Label>+ <p className="text-xs text-muted-foreground mt-1">+ When enabled, anyone can view your site analytics without+ logging in+ </p>+ </div>+ <Switch+ id="publicAnalytics"+ checked={isPublic}+ disabled={isChangingPublic}+ onCheckedChange={handlePublicToggle}+ />+ </div>+{/* Domain Settings Section */}- <div className="space-y-3 pt-3">+ <div className="space-y-3"><div><h4 className="text-sm font-semibold text-foreground">Change Domaindiff --git a/client/src/middleware.ts b/client/src/middleware.tsindex 900a3a4af..38fcfe5e6 100644--- a/client/src/middleware.ts+++ b/client/src/middleware.ts@@ -1,7 +1,7 @@import { NextResponse } from "next/server";import type { NextRequest } from "next/server";-export function middleware(request: NextRequest) {+export async function middleware(request: NextRequest) {const url = request.nextUrl.clone();const path = url.pathname;diff --git a/server/src/api/sites/changeSitePublic.ts b/server/src/api/sites/changeSitePublic.tsnew file mode 100644index 000000000..825257863--- /dev/null+++ b/server/src/api/sites/changeSitePublic.ts@@ -0,0 +1,53 @@+import { FastifyRequest, FastifyReply } from "fastify";+import { db } from "../../db/postgres/postgres.js";+import { sites } from "../../db/postgres/schema.js";+import { eq } from "drizzle-orm";++interface ChangeSitePublicRequest {+ Body: {+ siteId: number;+ isPublic: boolean;+ };+}++export async function changeSitePublic(+ request: FastifyRequest<ChangeSitePublicRequest>,+ reply: FastifyReply+) {+ const { siteId, isPublic } = request.body;+ const userId = request.user?.id;++ if (!userId) {+ return reply.status(401).send({ error: "Unauthorized" });+ }++ try {+ // Fetch site to check ownership+ const site = await db.query.sites.findFirst({+ where: eq(sites.siteId, siteId),+ });++ if (!site) {+ return reply.status(404).send({ error: "Site not found" });+ }++ // Check if user is authorized to modify the site+ if (site.createdBy !== userId) {+ return reply.status(403).send({ error: "Forbidden" });+ }++ // Update site public status+ await db+ .update(sites)+ .set({+ public: isPublic,+ updatedAt: new Date(),+ })+ .where(eq(sites.siteId, siteId));++ return reply.status(200).send({ success: true });+ } catch (error) {+ console.error("Error changing site public status:", error);+ return reply.status(500).send({ error: "Internal server error" });+ }+}diff --git a/server/src/api/sites/getSite.ts b/server/src/api/sites/getSite.tsnew file mode 100644index 000000000..591248cfa--- /dev/null+++ b/server/src/api/sites/getSite.ts@@ -0,0 +1,53 @@+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 { isSitePublic } from "../../utils.js";++interface GetSiteParams {+ Params: {+ id: string;+ };+}++export async function getSite(+ request: FastifyRequest<GetSiteParams>,+ reply: FastifyReply+) {+ const { id } = request.params;+ const userId = request.user?.id;++ try {+ // Get site info+ const site = await db.query.sites.findFirst({+ where: eq(sites.siteId, Number(id)),+ });++ if (!site) {+ return reply.status(404).send({ error: "Site not found" });+ }++ // Check if user is authorized to access this site+ const isPublic = await isSitePublic(id);+ const isOwner = site.createdBy === userId;++ // Only allow access if the site is public or the user is the owner+ if (!isPublic && !isOwner) {+ return reply.status(403).send({ error: "Access denied" });+ }++ return reply.status(200).send({+ siteId: site.siteId,+ name: site.name,+ domain: site.domain,+ createdAt: site.createdAt,+ updatedAt: site.updatedAt,+ createdBy: site.createdBy,+ public: site.public,+ isOwner: isOwner,+ });+ } catch (error) {+ console.error("Error retrieving site:", error);+ return reply.status(500).send({ error: "Internal server error" });+ }+}diff --git a/server/src/api/sites/getSiteHasData.ts b/server/src/api/sites/getSiteHasData.tsindex 6899d7c78..20bb8384b 100644--- a/server/src/api/sites/getSiteHasData.ts+++ b/server/src/api/sites/getSiteHasData.ts@@ -1,22 +1,40 @@-import { FastifyReply } from "fastify";--import { FastifyRequest } from "fastify";+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 clickhouse from "../../db/clickhouse/clickhouse.js";export async function getSiteHasData(- req: FastifyRequest<{ Params: { site: string } }>,+ request: FastifyRequest<{ Params: { site: string } }>,reply: FastifyReply) {+ const { site } = request.params;+try {- const sites: { count: number }[] = await clickhouse+ // Get site information including public status+ const siteInfo = await db.query.sites.findFirst({+ where: eq(sites.siteId, Number(site)),+ columns: {+ public: true,+ },+ });++ // Check if site has data using original method+ const pageviewsData: { count: number }[] = await clickhouse.query({- query: `SELECT count(*) as count FROM pageviews WHERE site_id = ${req.params.site}`,+ query: `SELECT count(*) as count FROM pageviews WHERE site_id = ${site}`,format: "JSONEachRow",}).then((res) => res.json());- return reply.status(200).send(sites[0].count > 0);- } catch (err) {- return reply.status(500).send(String(err));+ const hasData = pageviewsData[0].count > 0;++ return {+ hasData,+ public: siteInfo?.public || false,+ };+ } catch (error) {+ console.error("Error checking if site has data:", error);+ return reply.status(500).send({ error: "Internal server error" });}}diff --git a/server/src/index.ts b/server/src/index.tsindex d59f88816..0494c0645 100644--- a/server/src/index.ts+++ b/server/src/index.ts@@ -6,39 +6,42 @@ import cron from "node-cron";import { dirname, join } from "path";import { Headers, HeadersInit } from "undici";import { fileURLToPath } from "url";-import { createAccount } from "./api/user/createAccount.js";+import { createFunnel } from "./api/analytics/createFunnel.js";+import { deleteReport } from "./api/analytics/deleteReport.js";+import { getFunnel } from "./api/analytics/getFunnel.js";+import { getFunnels } from "./api/analytics/getFunnels.js";+import { getLiveSessionLocations } from "./api/analytics/getLiveSessionLocations.js";import { getLiveUsercount } from "./api/analytics/getLiveUsercount.js";import { getOverview } from "./api/analytics/getOverview.js";import { getOverviewBucketed } from "./api/analytics/getOverviewBucketed.js";-import { getSessions } from "./api/analytics/getSessions.js";+import { getRetention } from "./api/analytics/getRetention.js";import { getSession } from "./api/analytics/getSession.js";+import { getSessions } from "./api/analytics/getSessions.js";import { getSingleCol } from "./api/analytics/getSingleCol.js";+import { getUserInfo } from "./api/analytics/getUserInfo.js";import { getUserSessions } from "./api/analytics/getUserSessions.js";import { getUsers } from "./api/analytics/getUsers.js";-import { listUsers } from "./api/user/listUsers.js";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 { 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";import { cleanupOldSessions } from "./db/postgres/session-cleanup.js";import { allowList, loadAllowedDomains } from "./lib/allowedDomains.js";-import { auth } from "./lib/auth.js";import { mapHeaders } from "./lib/auth-utils.js";+import { auth } from "./lib/auth.js";import { trackEvent } from "./tracker/trackEvent.js";-import { listOrganizationMembers } from "./api/user/listOrganizationMembers.js";-import { getUserOrganizations } from "./api/user/getUserOrganizations.js";-import { initializeCronJobs } from "./cron/index.js";-import { getUserSubscription } from "./api/user/getUserSubscription.js";-import { getUserInfo } from "./api/analytics/getUserInfo.js";-import { getLiveSessionLocations } from "./api/analytics/getLiveSessionLocations.js";-import { getRetention } from "./api/analytics/getRetention.js";-import { getFunnel } from "./api/analytics/getFunnel.js";-import { createFunnel } from "./api/analytics/createFunnel.js";-import { getFunnels } from "./api/analytics/getFunnels.js";-import { deleteReport } from "./api/analytics/deleteReport.js";+import { extractSiteId, isSitePublic } from "./utils.js";+import { getSite } from "./api/sites/getSite.js";const __filename = fileURLToPath(import.meta.url);const __dirname = dirname(__filename);@@ -98,14 +101,48 @@ server.register(const PUBLIC_ROUTES = ["/health", "/track", "/script", "/auth", "/api/auth"];+// Define analytics routes that can be public+const ANALYTICS_ROUTES = [+ "/live-user-count/",+ "/overview/",+ "/overview-bucketed/",+ "/single-col/",+ "/retention/",+ "/site-has-data/",+ "/sessions/",+ "/session/",+ "/users/",+ "/user/info/",+ "/live-session-locations/",++ "/get-site",+];++// Check if a route is an analytics route+const isAnalyticsRoute = (path: string) => {+ return ANALYTICS_ROUTES.some((route) => path.startsWith(route));+};+server.addHook("onRequest", async (request, reply) => {const { url } = request.raw;+ if (!url) return;+// Bypass auth for health check and tracking- if (PUBLIC_ROUTES.includes(url ?? "")) {+ if (PUBLIC_ROUTES.some((route) => url.includes(route))) {return;}+ // Check if it's an analytics route and get site ID+ if (isAnalyticsRoute(url)) {+ const siteId = extractSiteId(url);++ if (siteId && (await isSitePublic(siteId))) {+ // Skip auth check for public sites+ return;+ }+ }+try {// Convert Fastify headers object into Fetch-compatible Headersconst headers = new Headers(request.headers as HeadersInit);@@ -138,16 +175,18 @@ server.get("/users/:site", getUsers);server.get("/user/:userId/sessions/:site", getUserSessions);server.get("/user/info/:userId/:site", getUserInfo);server.get("/live-session-locations/:site", getLiveSessionLocations);+server.get("/funnels/:site", getFunnels);server.post("/funnel/:site", getFunnel);server.post("/funnel/create/:site", createFunnel);-server.get("/funnels/:site", getFunnels);server.delete("/report/:reportId", deleteReport);// Administrativeserver.post("/add-site", addSite);server.post("/change-site-domain", changeSiteDomain);+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(diff --git a/server/src/lib/auth-utils.ts b/server/src/lib/auth-utils.tsindex 984861643..37e25c18b 100644--- a/server/src/lib/auth-utils.ts+++ b/server/src/lib/auth-utils.ts@@ -3,6 +3,7 @@ import { auth } from "./auth.js";import { sites, member } from "../db/postgres/schema.js";import { inArray, eq } from "drizzle-orm";import { db } from "../db/postgres/postgres.js";+import { isSitePublic } from "../utils.js";export function mapHeaders(headers: any) {const entries = Object.entries(headers);@@ -64,6 +65,9 @@ export async function getUserHasAccessToSite(req: FastifyRequest,siteId: string) {- const sites = await getSitesUserHasAccessTo(req);- return sites.some((site) => site.siteId === Number(siteId));+ const [sites, isPublic] = await Promise.all([+ getSitesUserHasAccessTo(req),+ isSitePublic(siteId),+ ]);+ return sites.some((site) => site.siteId === Number(siteId)) || isPublic;}diff --git a/server/src/utils.ts b/server/src/utils.tsindex d82ad8fa1..f7b746a3a 100644--- a/server/src/utils.ts+++ b/server/src/utils.ts@@ -1,5 +1,8 @@import { FastifyRequest } from "fastify";import crypto from "crypto";+import { db } from "./db/postgres/postgres.js";+import { sites } from "./db/postgres/schema.js";+import { eq } from "drizzle-orm";export function getUserId(ip: string, userAgent: string) {return crypto@@ -164,3 +167,35 @@ export const getIpAddress = (request: FastifyRequest): string => {// Fallback to direct IPreturn request.ip;};++// Check if a site is public+export const isSitePublic = async (siteId: string | number) => {+ try {+ const site = await db.query.sites.findFirst({+ where: eq(sites.siteId, Number(siteId)),+ columns: {+ public: true,+ },+ });+ return site?.public || false;+ } catch (err) {+ console.error("Error checking if site is public:", err);+ return false;+ }+};++// Extract site ID from path+export const extractSiteId = (path: string) => {+ // Remove query parameters if present+ const pathWithoutQuery = path.split("?")[0];++ // Handle route patterns:+ // /route/:site+ // /route/:sessionId/:site+ // /route/:userId/:site+ const segments = pathWithoutQuery.split("/").filter(Boolean);+ if (segments.length >= 2) {+ return segments[segments.length - 1];+ }+ return null;+};