Skip to content

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

Private link (#655)

Bill Yang7793cb3516f1
diff --git a/client/src/api/admin/privateLink.ts b/client/src/api/admin/privateLink.ts
new file mode 100644
index 000000000..16c85b2cd
--- /dev/null
+++ b/client/src/api/admin/privateLink.ts
@@ -0,0 +1,75 @@
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { authedFetch } from "../utils";
+
+interface PrivateLinkConfigResponse {
+ privateLinkKey: string | null;
+}
+
+interface UpdatePrivateLinkConfigResponse {
+ privateLinkKey: string | null;
+}
+
+// Get API config
+export const useGetPrivateLinkConfig = (siteId: number) => {
+ return useQuery({
+ queryKey: ["privateLinkConfig", siteId],
+ queryFn: async () => {
+ const response = await authedFetch<{
+ success: boolean;
+ data: PrivateLinkConfigResponse;
+ }>(`/site/${siteId}/private-link-config`);
+ return response.data;
+ },
+ enabled: !!siteId,
+ });
+};
+
+// Generate private link key
+export const useGeneratePrivateLinkKey = () => {
+ const queryClient = useQueryClient();
+
+ return useMutation({
+ mutationFn: async (siteId: number) => {
+ const response = await authedFetch<{
+ success: boolean;
+ data: UpdatePrivateLinkConfigResponse;
+ }>(
+ `/site/${siteId}/private-link-config`,
+ {},
+ {
+ method: "POST",
+ data: { action: "generate_private_link_key" },
+ }
+ );
+ return response.data;
+ },
+ onSuccess: (_, siteId) => {
+ queryClient.invalidateQueries({ queryKey: ["privateLinkConfig", siteId] });
+ },
+ });
+};
+
+// Revoke private link key
+export const useRevokePrivateLinkKey = () => {
+ const queryClient = useQueryClient();
+
+ return useMutation({
+ mutationFn: async (siteId: number) => {
+ const response = await authedFetch<{
+ success: boolean;
+ data: UpdatePrivateLinkConfigResponse;
+ }>(
+ `/site/${siteId}/private-link-config`,
+ {},
+ {
+ method: "POST",
+ data: { action: "revoke_private_link_key" },
+ }
+ );
+ return response.data;
+ },
+ onSuccess: (_, siteId) => {
+ queryClient.invalidateQueries({ queryKey: ["privateLinkConfig", siteId] });
+ },
+ });
+};
diff --git a/client/src/api/utils.ts b/client/src/api/utils.ts
index b2444d162..4ab068742 100644
--- a/client/src/api/utils.ts
+++ b/client/src/api/utils.ts
@@ -3,6 +3,7 @@ import { Time } from "../components/DateSelector/types";
import axios, { AxiosRequestConfig } from "axios";
import { BACKEND_URL } from "../lib/const";
import { timeZone } from "../lib/dateTimeUtils";
+import { useStore } from "../lib/store";
export function getStartAndEndDate(time: Time) {
if (time.mode === "range") {
@@ -69,12 +70,20 @@ export async function authedFetch<T>(
});
}
+ // Get private key from store and add to headers if present
+ const privateKey = useStore.getState().privateKey;
+ const headers = {
+ ...config.headers,
+ ...(privateKey ? { "x-private-key": privateKey } : {}),
+ };
+
try {
const response = await axios({
url: fullUrl,
params: processedParams,
withCredentials: true,
...config,
+ headers,
});
return response.data;
diff --git a/client/src/app/[site]/[privateKey]/errors/page.tsx b/client/src/app/[site]/[privateKey]/errors/page.tsx
new file mode 100644
index 000000000..0c04cff8b
--- /dev/null
+++ b/client/src/app/[site]/[privateKey]/errors/page.tsx
@@ -0,0 +1,2 @@
+// Re-export the errors page for private link routes
+export { default } from "../../errors/page";
diff --git a/client/src/app/[site]/[privateKey]/events/page.tsx b/client/src/app/[site]/[privateKey]/events/page.tsx
new file mode 100644
index 000000000..ffd0d2201
--- /dev/null
+++ b/client/src/app/[site]/[privateKey]/events/page.tsx
@@ -0,0 +1,2 @@
+// Re-export the events page for private link routes
+export { default } from "../../events/page";
diff --git a/client/src/app/[site]/[privateKey]/funnels/page.tsx b/client/src/app/[site]/[privateKey]/funnels/page.tsx
new file mode 100644
index 000000000..47a9b7080
--- /dev/null
+++ b/client/src/app/[site]/[privateKey]/funnels/page.tsx
@@ -0,0 +1,2 @@
+// Re-export the funnels page for private link routes
+export { default } from "../../funnels/page";
diff --git a/client/src/app/[site]/[privateKey]/globe/page.tsx b/client/src/app/[site]/[privateKey]/globe/page.tsx
new file mode 100644
index 000000000..6fac5f558
--- /dev/null
+++ b/client/src/app/[site]/[privateKey]/globe/page.tsx
@@ -0,0 +1,2 @@
+// Re-export the globe page for private link routes
+export { default } from "../../globe/page";
diff --git a/client/src/app/[site]/[privateKey]/goals/page.tsx b/client/src/app/[site]/[privateKey]/goals/page.tsx
new file mode 100644
index 000000000..c6fa01b04
--- /dev/null
+++ b/client/src/app/[site]/[privateKey]/goals/page.tsx
@@ -0,0 +1,2 @@
+// Re-export the goals page for private link routes
+export { default } from "../../goals/page";
diff --git a/client/src/app/[site]/[privateKey]/journeys/page.tsx b/client/src/app/[site]/[privateKey]/journeys/page.tsx
new file mode 100644
index 000000000..0a7108181
--- /dev/null
+++ b/client/src/app/[site]/[privateKey]/journeys/page.tsx
@@ -0,0 +1,2 @@
+// Re-export the journeys page for private link routes
+export { default } from "../../journeys/page";
diff --git a/client/src/app/[site]/[privateKey]/main/page.tsx b/client/src/app/[site]/[privateKey]/main/page.tsx
new file mode 100644
index 000000000..2dcc67bdc
--- /dev/null
+++ b/client/src/app/[site]/[privateKey]/main/page.tsx
@@ -0,0 +1,2 @@
+// Re-export the main page for private link routes
+export { default } from "../../main/page";
diff --git a/client/src/app/[site]/[privateKey]/pages/page.tsx b/client/src/app/[site]/[privateKey]/pages/page.tsx
new file mode 100644
index 000000000..f5a69f93f
--- /dev/null
+++ b/client/src/app/[site]/[privateKey]/pages/page.tsx
@@ -0,0 +1,2 @@
+// Re-export the pages page for private link routes
+export { default } from "../../pages/page";
diff --git a/client/src/app/[site]/[privateKey]/performance/page.tsx b/client/src/app/[site]/[privateKey]/performance/page.tsx
new file mode 100644
index 000000000..f4dbce16e
--- /dev/null
+++ b/client/src/app/[site]/[privateKey]/performance/page.tsx
@@ -0,0 +1,2 @@
+// Re-export the performance page for private link routes
+export { default } from "../../performance/page";
diff --git a/client/src/app/[site]/[privateKey]/realtime/page.tsx b/client/src/app/[site]/[privateKey]/realtime/page.tsx
new file mode 100644
index 000000000..7af47b02e
--- /dev/null
+++ b/client/src/app/[site]/[privateKey]/realtime/page.tsx
@@ -0,0 +1,2 @@
+// Re-export the realtime page for private link routes
+export { default } from "../../realtime/page";
diff --git a/client/src/app/[site]/[privateKey]/replay/page.tsx b/client/src/app/[site]/[privateKey]/replay/page.tsx
new file mode 100644
index 000000000..08c68960d
--- /dev/null
+++ b/client/src/app/[site]/[privateKey]/replay/page.tsx
@@ -0,0 +1,2 @@
+// Re-export the replay page for private link routes
+export { default } from "../../replay/page";
diff --git a/client/src/app/[site]/[privateKey]/reports/page.tsx b/client/src/app/[site]/[privateKey]/reports/page.tsx
new file mode 100644
index 000000000..e18df8288
--- /dev/null
+++ b/client/src/app/[site]/[privateKey]/reports/page.tsx
@@ -0,0 +1,2 @@
+// Re-export the reports page for private link routes
+export { default } from "../../reports/page";
diff --git a/client/src/app/[site]/[privateKey]/retention/page.tsx b/client/src/app/[site]/[privateKey]/retention/page.tsx
new file mode 100644
index 000000000..96ec63da4
--- /dev/null
+++ b/client/src/app/[site]/[privateKey]/retention/page.tsx
@@ -0,0 +1,2 @@
+// Re-export the retention page for private link routes
+export { default } from "../../retention/page";
diff --git a/client/src/app/[site]/[privateKey]/sessions/page.tsx b/client/src/app/[site]/[privateKey]/sessions/page.tsx
new file mode 100644
index 000000000..2fe511e85
--- /dev/null
+++ b/client/src/app/[site]/[privateKey]/sessions/page.tsx
@@ -0,0 +1,2 @@
+// Re-export the sessions page for private link routes
+export { default } from "../../sessions/page";
diff --git a/client/src/app/[site]/[privateKey]/user/[userId]/page.tsx b/client/src/app/[site]/[privateKey]/user/[userId]/page.tsx
new file mode 100644
index 000000000..2596b6eeb
--- /dev/null
+++ b/client/src/app/[site]/[privateKey]/user/[userId]/page.tsx
@@ -0,0 +1,2 @@
+// Re-export the user detail page for private link routes
+export { default } from "../../../user/[userId]/page";
diff --git a/client/src/app/[site]/[privateKey]/users/page.tsx b/client/src/app/[site]/[privateKey]/users/page.tsx
new file mode 100644
index 000000000..b3cb7c5a0
--- /dev/null
+++ b/client/src/app/[site]/[privateKey]/users/page.tsx
@@ -0,0 +1,2 @@
+// Re-export the users page for private link routes
+export { default } from "../../users/page";
diff --git a/client/src/app/[site]/components/Sidebar/Sidebar.tsx b/client/src/app/[site]/components/Sidebar/Sidebar.tsx
index e898a074c..a7d509351 100644
--- a/client/src/app/[site]/components/Sidebar/Sidebar.tsx
+++ b/client/src/app/[site]/components/Sidebar/Sidebar.tsx
@@ -34,13 +34,30 @@ function SidebarContent() {
// Check which tab is active based on the current path
const getTabPath = (tabName: string) => {
- return `/${pathname.split("/")[1]}/${tabName.toLowerCase()}${embed ? "?embed=true" : ""}`;
+ const segments = pathname.split("/").filter(Boolean);
+ const siteId = segments[0];
+
+ // Check if second segment is a private key (12 hex chars)
+ const hasPrivateKey = segments.length > 1 && /^[a-f0-9]{12}$/i.test(segments[1]);
+ const privateKey = hasPrivateKey ? segments[1] : null;
+
+ // Build path: /siteId/[privateKey]/tabName
+ const basePath = privateKey
+ ? `/${siteId}/${privateKey}/${tabName.toLowerCase()}`
+ : `/${siteId}/${tabName.toLowerCase()}`;
+
+ return `${basePath}${embed ? "?embed=true" : ""}`;
};
const isActiveTab = (tabName: string) => {
if (!pathname.includes("/")) return false;
- const route = pathname.split("/")[2] || "main";
+ const segments = pathname.split("/").filter(Boolean);
+ // Check if we have a private key (second segment is 12 hex chars)
+ const hasPrivateKey = segments.length > 1 && /^[a-f0-9]{12}$/i.test(segments[1]);
+
+ // Route is either segments[1] (no key) or segments[2] (with key)
+ const route = hasPrivateKey ? (segments[2] || "main") : (segments[1] || "main");
return route === tabName.toLowerCase();
};
diff --git a/client/src/app/[site]/components/SubHeader/ShareSite.tsx b/client/src/app/[site]/components/SubHeader/ShareSite.tsx
new file mode 100644
index 000000000..5b90c7eff
--- /dev/null
+++ b/client/src/app/[site]/components/SubHeader/ShareSite.tsx
@@ -0,0 +1,79 @@
+import { Copy, Share, Trash } from "lucide-react";
+import { Button } from "../../../../components/ui/button";
+import {
+ DropdownMenu,
+ DropdownMenuItem,
+ DropdownMenuContent,
+ DropdownMenuTrigger,
+} from "../../../../components/ui/dropdown-menu";
+import { Input } from "../../../../components/ui/input";
+import {
+ useGeneratePrivateLinkKey,
+ useGetPrivateLinkConfig,
+ useRevokePrivateLinkKey,
+} from "../../../../api/admin/privateLink";
+import { useParams } from "next/navigation";
+import { toast } from "sonner";
+
+export function ShareSite() {
+ const { site } = useParams();
+ const {
+ data: privateLink,
+ isLoading: isLoadingPrivateLink,
+ refetch: refetchPrivateLink,
+ } = useGetPrivateLinkConfig(Number(site));
+ const { mutate: generatePrivateLinkKey, isPending: isGeneratingPrivateLink } = useGeneratePrivateLinkKey();
+ const { mutate: revokePrivateLinkKey } = useRevokePrivateLinkKey();
+
+ return (
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <Button variant="secondary" size="icon" onClick={() => {}} className="h-8 w-8">
+ <Share />
+ </Button>
+ </DropdownMenuTrigger>
+ <DropdownMenuContent align="end" className="flex flex-col p-3 max-w-[400px]">
+ <span className="text-sm font-medium pb-2">Share this dashboard</span>
+ {!isLoadingPrivateLink && !privateLink?.privateLinkKey && (
+ <Button onClick={() => generatePrivateLinkKey(Number(site))} disabled={isGeneratingPrivateLink}>
+ {isGeneratingPrivateLink ? "Generating..." : "Generate Private Link"}
+ </Button>
+ )}
+ {privateLink?.privateLinkKey && (
+ <>
+ <div className="flex items-center">
+ <Input
+ value={`${globalThis.location.protocol}//${globalThis.location.host}/${site}/${privateLink?.privateLinkKey}`}
+ readOnly
+ className="rounded-r-none bg-neutral-900"
+ />
+ <Button
+ size="icon"
+ onClick={() => {
+ const fullUrl = `${globalThis.location.protocol}//${globalThis.location.host}/${site}/${privateLink?.privateLinkKey}`;
+ navigator.clipboard.writeText(fullUrl);
+ toast.success("Copied to clipboard");
+ }}
+ className="w-10 rounded-l-none"
+ >
+ <Copy />
+ </Button>
+ </div>
+ <div
+ className="text-xs text-neutral-500 mt-1 cursor-pointer hover:text-neutral-400"
+ onClick={() => {
+ revokePrivateLinkKey(Number(site));
+ toast.success("Private link revoked");
+ }}
+ >
+ Revoke this link
+ </div>
+ </>
+ )}
+ <span className="text-xs text-neutral-300 mt-2">
+ Generate a private link to share a read-only view of this dashboard with your team.
+ </span>
+ </DropdownMenuContent>
+ </DropdownMenu>
+ );
+}
diff --git a/client/src/app/[site]/components/SubHeader/SubHeader.tsx b/client/src/app/[site]/components/SubHeader/SubHeader.tsx
index 9b97fcb59..9bcc95ee8 100644
--- a/client/src/app/[site]/components/SubHeader/SubHeader.tsx
+++ b/client/src/app/[site]/components/SubHeader/SubHeader.tsx
@@ -2,7 +2,7 @@
import { Button } from "@/components/ui/button";
import { goBack, goForward, useStore } from "@/lib/store";
import { FilterParameter } from "@rybbit/shared";
-import { ChevronLeft, ChevronRight } from "lucide-react";
+import { ChevronLeft, ChevronRight, Share } from "lucide-react";
import { DateTime } from "luxon";
import { Filters } from "./Filters/Filters";
@@ -11,6 +11,7 @@ import { Time } from "../../../../components/DateSelector/types";
import { NewFilterButton } from "./Filters/NewFilterButton";
import { LiveUserCount } from "./LiveUserCount";
import { MobileSidebar } from "../Sidebar/MobileSidebar";
+import { ShareSite } from "./ShareSite";
const canGoForward = (time: Time) => {
const currentDay = DateTime.now().startOf("day");
@@ -51,6 +52,7 @@ export function SubHeader({ availableFilters }: { availableFilters?: FilterParam
</div>
<div className="flex items-center gap-2">
<LiveUserCount />
+ <ShareSite />
<DateSelector time={time} setTime={setTime} />
<div className="flex items-center">
<Button
diff --git a/client/src/app/[site]/layout.tsx b/client/src/app/[site]/layout.tsx
index 55d7115b3..f41f6946b 100644
--- a/client/src/app/[site]/layout.tsx
+++ b/client/src/app/[site]/layout.tsx
@@ -12,14 +12,28 @@ import { Sidebar } from "./components/Sidebar/Sidebar";
export default function SiteLayout({ children }: { children: React.ReactNode }) {
const pathname = usePathname();
- const { setSite, site } = useStore();
+ const { setSite, site, setPrivateKey } = useStore();
// Sync store state with URL parameters
useSyncStateWithUrl();
useEffect(() => {
- if (pathname.includes("/") && pathname.split("/")[1] !== site && !isNaN(Number(pathname.split("/")[1]))) {
- setSite(pathname.split("/")[1]);
+ const segments = pathname.split("/").filter(Boolean);
+
+ if (segments.length > 0) {
+ const siteId = segments[0];
+
+ // Update site if it's different and is a number
+ if (siteId !== site && !isNaN(Number(siteId))) {
+ setSite(siteId);
+ }
+
+ // Check if second segment is a private key (12 hex chars)
+ if (segments.length > 1 && /^[a-f0-9]{12}$/i.test(segments[1])) {
+ setPrivateKey(segments[1]);
+ } else {
+ setPrivateKey(null);
+ }
}
}, [pathname]);
diff --git a/client/src/components/AuthenticationGuard.tsx b/client/src/components/AuthenticationGuard.tsx
index 8615282ce..e38bc5ca8 100644
--- a/client/src/components/AuthenticationGuard.tsx
+++ b/client/src/components/AuthenticationGuard.tsx
@@ -15,6 +15,9 @@ export function AuthenticationGuard() {
const pathSegments = pathname.split("/").filter(Boolean);
const potentialSiteId = pathSegments.length > 0 && !isNaN(Number(pathSegments[0])) ? pathSegments[0] : undefined;
+ // Check if there's a private key in the URL (second segment is 12 hex chars)
+ const hasPrivateKey = pathSegments.length > 1 && /^[a-f0-9]{12}$/i.test(pathSegments[1]);
+
// Use Tanstack Query to check if site is public
const { data: isPublicSite, isLoading: isCheckingPublic } = useGetSiteIsPublic(potentialSiteId);
@@ -24,10 +27,11 @@ export function AuthenticationGuard() {
// 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) {
+ // 5. Not using a private link key
+ if (!isPending && !isCheckingPublic && !user && !publicRoutes.includes(pathname) && !isPublicSite && !hasPrivateKey) {
redirect("/login");
}
- }, [isPending, user, pathname, isCheckingPublic, isPublicSite]);
+ }, [isPending, user, pathname, isCheckingPublic, isPublicSite, hasPrivateKey]);
return null; // This component doesn't render anything
}
diff --git a/client/src/lib/store.ts b/client/src/lib/store.ts
index d9635ec5f..74e2f94fe 100644
--- a/client/src/lib/store.ts
+++ b/client/src/lib/store.ts
@@ -8,6 +8,8 @@ export type StatType = "pageviews" | "sessions" | "users" | "pages_per_session"
type Store = {
site: string;
setSite: (site: string) => void;
+ privateKey: string | null;
+ setPrivateKey: (privateKey: string | null) => void;
time: Time;
previousTime: Time;
setTime: (time: Time, changeBucket?: boolean) => void;
@@ -54,6 +56,8 @@ export const useStore = create<Store>(set => ({
selectedStat: hasStatInUrl ? state.selectedStat : "users",
}));
},
+ privateKey: null,
+ setPrivateKey: privateKey => set({ privateKey }),
time: {
mode: "day",
day: DateTime.now().toISODate(),
diff --git a/client/src/middleware.ts b/client/src/middleware.ts
index 700811dec..c1891abe6 100644
--- a/client/src/middleware.ts
+++ b/client/src/middleware.ts
@@ -52,6 +52,19 @@ export async function middleware(request: NextRequest) {
return response;
}
+ // Check if we're on a site route with a private key: /{siteId}/{privateKey}
+ const privateKeyRoutePattern = /^\/([^/]+\/[a-f0-9]{12})$/i;
+ const privateKeyMatch = path.match(privateKeyRoutePattern);
+
+ if (privateKeyMatch) {
+ const siteAndKey = privateKeyMatch[1]; // e.g., "123/abc123def456"
+
+ // Redirect to /main while preserving the private key in the path
+ const response = NextResponse.redirect(new URL(`/${siteAndKey}/main`, request.url));
+ response.headers.set("Cache-Control", "no-store, max-age=0");
+ return response;
+ }
+
return NextResponse.next();
}
diff --git a/server/src/api/analytics/events/getEventNames.ts b/server/src/api/analytics/events/getEventNames.ts
index d6b85b8c3..4e4028026 100644
--- a/server/src/api/analytics/events/getEventNames.ts
+++ b/server/src/api/analytics/events/getEventNames.ts
@@ -1,7 +1,6 @@
import { FastifyReply, FastifyRequest } from "fastify";
import { clickhouse } from "../../../db/clickhouse/clickhouse.js";
import { getTimeStatement, processResults, getFilterStatement } from "../utils.js";
-import { getUserHasAccessToSitePublic } from "../../../lib/auth-utils.js";
import { FilterParams } from "@rybbit/shared";
export type GetEventNamesResponse = {
@@ -21,10 +20,6 @@ export interface GetEventNamesRequest {
export async function getEventNames(req: FastifyRequest<GetEventNamesRequest>, res: FastifyReply) {
const { startDate, endDate, timeZone, filters, pastMinutesStart, pastMinutesEnd } = req.query;
const site = req.params.site;
- const userHasAccessToSite = await getUserHasAccessToSitePublic(req, site);
- if (!userHasAccessToSite) {
- return res.status(403).send({ error: "Forbidden" });
- }
const timeStatement = getTimeStatement(req.query);
diff --git a/server/src/api/analytics/events/getEventProperties.ts b/server/src/api/analytics/events/getEventProperties.ts
index 024dc0b4f..c953c3615 100644
--- a/server/src/api/analytics/events/getEventProperties.ts
+++ b/server/src/api/analytics/events/getEventProperties.ts
@@ -1,7 +1,6 @@
import { FastifyReply, FastifyRequest } from "fastify";
import { clickhouse } from "../../../db/clickhouse/clickhouse.js";
import { getTimeStatement, processResults, getFilterStatement } from "../utils.js";
-import { getUserHasAccessToSitePublic } from "../../../lib/auth-utils.js";
import { FilterParams } from "@rybbit/shared";
export type GetEventPropertiesResponse = {
@@ -22,10 +21,6 @@ export interface GetEventPropertiesRequest {
export async function getEventProperties(req: FastifyRequest<GetEventPropertiesRequest>, res: FastifyReply) {
const { startDate, endDate, timeZone, eventName, filters, pastMinutesStart, pastMinutesEnd } = req.query;
const site = req.params.site;
- const userHasAccessToSite = await getUserHasAccessToSitePublic(req, site);
- if (!userHasAccessToSite) {
- return res.status(403).send({ error: "Forbidden" });
- }
if (!eventName) {
return res.status(400).send({ error: "Event name is required" });
diff --git a/server/src/api/analytics/events/getEvents.ts b/server/src/api/analytics/events/getEvents.ts
index 4e3dd8e2b..e1f2c1c26 100644
--- a/server/src/api/analytics/events/getEvents.ts
+++ b/server/src/api/analytics/events/getEvents.ts
@@ -1,7 +1,6 @@
import { FastifyReply, FastifyRequest } from "fastify";
import { clickhouse } from "../../../db/clickhouse/clickhouse.js";
import { processResults, getTimeStatement, getFilterStatement } from "../utils.js";
-import { getUserHasAccessToSitePublic } from "../../../lib/auth-utils.js";
import { FilterParams } from "@rybbit/shared";
export type GetEventsResponse = {
@@ -36,11 +35,6 @@ export async function getEvents(req: FastifyRequest<GetEventsRequest>, res: Fast
const { site } = req.params;
const { startDate, endDate, timeZone, filters, page = "1", pageSize = "20", count } = req.query;
- const userHasAccessToSite = await getUserHasAccessToSitePublic(req, site);
- if (!userHasAccessToSite) {
- return res.status(403).send({ error: "Forbidden" });
- }
-
// Use count if provided (for backward compatibility), otherwise use pageSize
const limit = count ? parseInt(count, 10) : parseInt(pageSize, 10);
const offset = (parseInt(page, 10) - 1) * limit;
diff --git a/server/src/api/analytics/events/getOutboundLinks.ts b/server/src/api/analytics/events/getOutboundLinks.ts
index a51f9773f..4071e077f 100644
--- a/server/src/api/analytics/events/getOutboundLinks.ts
+++ b/server/src/api/analytics/events/getOutboundLinks.ts
@@ -1,7 +1,6 @@
import { FastifyReply, FastifyRequest } from "fastify";
import { clickhouse } from "../../../db/clickhouse/clickhouse.js";
import { getTimeStatement, processResults, getFilterStatement } from "../utils.js";
-import { getUserHasAccessToSitePublic } from "../../../lib/auth-utils.js";
import { FilterParams } from "@rybbit/shared";
export type GetOutboundLinksResponse = {
@@ -20,10 +19,6 @@ export interface GetOutboundLinksRequest {
export async function getOutboundLinks(req: FastifyRequest<GetOutboundLinksRequest>, res: FastifyReply) {
const { startDate, endDate, timeZone, filters, pastMinutesStart, pastMinutesEnd } = req.query;
const site = req.params.site;
- const userHasAccessToSite = await getUserHasAccessToSitePublic(req, site);
- if (!userHasAccessToSite) {
- return res.status(403).send({ error: "Forbidden" });
- }
const timeStatement = getTimeStatement(req.query);
const filterStatement = filters ? getFilterStatement(filters) : "";
diff --git a/server/src/api/analytics/funnels/getFunnel.ts b/server/src/api/analytics/funnels/getFunnel.ts
index 13d342744..7b82d2423 100644
--- a/server/src/api/analytics/funnels/getFunnel.ts
+++ b/server/src/api/analytics/funnels/getFunnel.ts
@@ -2,7 +2,6 @@ import { FilterParams } from "@rybbit/shared";
import { FastifyReply, FastifyRequest } from "fastify";
import SqlString from "sqlstring";
import { clickhouse } from "../../../db/clickhouse/clickhouse.js";
-import { getUserHasAccessToSitePublic } from "../../../lib/auth-utils.js";
import { getFilterStatement, getTimeStatement, patternToRegex, processResults } from "../utils.js";
type FunnelStep = {
@@ -44,11 +43,6 @@ export async function getFunnel(
return reply.status(400).send({ error: "At least 2 steps are required for a funnel" });
}
- const userHasAccessToSite = await getUserHasAccessToSitePublic(request, site);
- if (!userHasAccessToSite) {
- return reply.status(403).send({ error: "Forbidden" });
- }
-
try {
const filterStatement = getFilterStatement(request.query.filters);
diff --git a/server/src/api/analytics/funnels/getFunnels.ts b/server/src/api/analytics/funnels/getFunnels.ts
index 3237aefe8..766d6a5ba 100644
--- a/server/src/api/analytics/funnels/getFunnels.ts
+++ b/server/src/api/analytics/funnels/getFunnels.ts
@@ -2,7 +2,6 @@ import { eq } from "drizzle-orm";
import { FastifyReply, FastifyRequest } from "fastify";
import { db } from "../../../db/postgres/postgres.js";
import { funnels as funnelsTable } from "../../../db/postgres/schema.js";
-import { getUserHasAccessToSitePublic } from "../../../lib/auth-utils.js";
export async function getFunnels(
request: FastifyRequest<{
@@ -14,12 +13,6 @@ export async function getFunnels(
) {
const { site } = request.params;
- // Check user access to site
- const userHasAccessToSite = await getUserHasAccessToSitePublic(request, site);
- if (!userHasAccessToSite) {
- return reply.status(403).send({ error: "Forbidden" });
- }
-
try {
// Fetch all funnels for the site
const funnelRecords = await db
diff --git a/server/src/api/analytics/getErrorBucketed.ts b/server/src/api/analytics/getErrorBucketed.ts
index ebb1a7493..4903c5887 100644
--- a/server/src/api/analytics/getErrorBucketed.ts
+++ b/server/src/api/analytics/getErrorBucketed.ts
@@ -2,7 +2,6 @@ import { FilterParams } from "@rybbit/shared";
import { FastifyReply, FastifyRequest } from "fastify";
import SqlString from "sqlstring";
import { clickhouse } from "../../db/clickhouse/clickhouse.js";
-import { getUserHasAccessToSitePublic } from "../../lib/auth-utils.js";
import { validateTimeStatementFillParams } from "./query-validation.js";
import { getFilterStatement, getTimeStatement, TimeBucketToFn, bucketIntervalMap, processResults } from "./utils.js";
import { TimeBucket } from "./types.js";
@@ -57,12 +56,6 @@ export async function getErrorBucketed(req: FastifyRequest<GetErrorBucketedReque
}
const numericSiteId = Number(site);
- const hasAccess = await getUserHasAccessToSitePublic(req, numericSiteId);
-
- if (!hasAccess) {
- return res.status(403).send({ error: "Access denied" });
- }
-
const filterStatement = getFilterStatement(req.query.filters);
const timeStatement = getTimeStatement(req.query);
const timeStatementFill = getTimeStatementFill(req.query, bucket);
diff --git a/server/src/api/analytics/getErrorEvents.ts b/server/src/api/analytics/getErrorEvents.ts
index 6326fc062..dc7063918 100644
--- a/server/src/api/analytics/getErrorEvents.ts
+++ b/server/src/api/analytics/getErrorEvents.ts
@@ -1,6 +1,5 @@
import { FastifyReply, FastifyRequest } from "fastify";
import { clickhouse } from "../../db/clickhouse/clickhouse.js";
-import { getUserHasAccessToSitePublic } from "../../lib/auth-utils.js";
import { getFilterStatement, getTimeStatement, processResults } from "./utils.js";
import { FilterParams } from "@rybbit/shared";
@@ -140,11 +139,6 @@ export async function getErrorEvents(req: FastifyRequest<GetErrorEventsRequest>,
return res.status(400).send({ error: "errorMessage parameter is required" });
}
- const userHasAccessToSite = await getUserHasAccessToSitePublic(req, site);
- if (!userHasAccessToSite) {
- return res.status(403).send({ error: "Forbidden" });
- }
-
const isPaginatedRequest = page !== undefined;
const dataQuery = getErrorEventsQuery(req, false);
diff --git a/server/src/api/analytics/getErrorNames.ts b/server/src/api/analytics/getErrorNames.ts
index 8d7107684..ac30cc275 100644
--- a/server/src/api/analytics/getErrorNames.ts
+++ b/server/src/api/analytics/getErrorNames.ts
@@ -1,6 +1,5 @@
import { FastifyReply, FastifyRequest } from "fastify";
import { clickhouse } from "../../db/clickhouse/clickhouse.js";
-import { getUserHasAccessToSitePublic } from "../../lib/auth-utils.js";
import { getFilterStatement, getTimeStatement, processResults } from "./utils.js";
import { FilterParams } from "@rybbit/shared";
@@ -107,11 +106,6 @@ export async function getErrorNames(req: FastifyRequest<GetErrorNamesRequest>, r
const site = req.params.site;
const { page } = req.query;
- const userHasAccessToSite = await getUserHasAccessToSitePublic(req, site);
- if (!userHasAccessToSite) {
- return res.status(403).send({ error: "Forbidden" });
- }
-
const isPaginatedRequest = page !== undefined; // True if page is present
const dataQuery = getErrorNamesQuery(req, false);
diff --git a/server/src/api/analytics/getLiveUsercount.ts b/server/src/api/analytics/getLiveUsercount.ts
index 2d759cc7b..5384a9ca6 100644
--- a/server/src/api/analytics/getLiveUsercount.ts
+++ b/server/src/api/analytics/getLiveUsercount.ts
@@ -1,6 +1,5 @@
import { FastifyReply, FastifyRequest } from "fastify";
import { clickhouse } from "../../db/clickhouse/clickhouse.js";
-import { getUserHasAccessToSitePublic } from "../../lib/auth-utils.js";
import { processResults } from "./utils.js";
export const getLiveUsercount = async (
@@ -12,10 +11,6 @@ export const getLiveUsercount = async (
) => {
const { site } = req.params;
const { minutes } = req.query;
- const userHasAccessToSite = await getUserHasAccessToSitePublic(req, site);
- if (!userHasAccessToSite) {
- return res.status(403).send({ error: "Forbidden" });
- }
const query = await clickhouse.query({
query: `SELECT COUNT(DISTINCT(session_id)) AS count FROM events WHERE timestamp > now() - interval {minutes:Int32} minute AND site_id = {siteId:Int32}`,
diff --git a/server/src/api/analytics/getOverview.ts b/server/src/api/analytics/getOverview.ts
index a50a1daf7..c8c25d0c4 100644
--- a/server/src/api/analytics/getOverview.ts
+++ b/server/src/api/analytics/getOverview.ts
@@ -95,10 +95,6 @@ export interface OverviewRequest {
export async function getOverview(req: FastifyRequest<OverviewRequest>, res: FastifyReply) {
const { startDate, endDate, timeZone, filters, pastMinutesStart, pastMinutesEnd } = req.query;
const site = req.params.site;
- const userHasAccessToSite = await getUserHasAccessToSitePublic(req, site);
- if (!userHasAccessToSite) {
- return res.status(403).send({ error: "Forbidden" });
- }
const query = getQuery({
startDate,
diff --git a/server/src/api/analytics/getOverviewBucketed.ts b/server/src/api/analytics/getOverviewBucketed.ts
index f32a119cb..31c7e63c7 100644
--- a/server/src/api/analytics/getOverviewBucketed.ts
+++ b/server/src/api/analytics/getOverviewBucketed.ts
@@ -2,7 +2,6 @@ import { FilterParams } from "@rybbit/shared";
import { FastifyReply, FastifyRequest } from "fastify";
import SqlString from "sqlstring";
import { clickhouse } from "../../db/clickhouse/clickhouse.js";
-import { getUserHasAccessToSitePublic } from "../../lib/auth-utils.js";
import { validateTimeStatementFillParams } from "./query-validation.js";
import { getFilterStatement, getTimeStatement, processResults, TimeBucketToFn, bucketIntervalMap } from "./utils.js";
import { TimeBucket } from "./types.js";
@@ -167,11 +166,6 @@ export async function getOverviewBucketed(
const { startDate, endDate, timeZone, bucket, filters, pastMinutesStart, pastMinutesEnd } = req.query;
const site = req.params.site;
- const userHasAccessToSite = await getUserHasAccessToSitePublic(req, site);
- if (!userHasAccessToSite) {
- return res.status(403).send({ error: "Forbidden" });
- }
-
const query = getQuery({
startDate,
endDate,
diff --git a/server/src/api/analytics/getPageTitles.ts b/server/src/api/analytics/getPageTitles.ts
index 97234f755..fc22dc24f 100644
--- a/server/src/api/analytics/getPageTitles.ts
+++ b/server/src/api/analytics/getPageTitles.ts
@@ -1,6 +1,5 @@
import { FastifyReply, FastifyRequest } from "fastify";
import { clickhouse } from "../../db/clickhouse/clickhouse.js";
-import { getUserHasAccessToSitePublic } from "../../lib/auth-utils.js";
import { getFilterStatement, getTimeStatement, processResults } from "./utils.js";
import { FilterParams } from "@rybbit/shared";
@@ -125,11 +124,6 @@ export async function getPageTitles(req: FastifyRequest<GetPageTitlesRequest>, r
const site = req.params.site;
const { page } = req.query;
- const userHasAccessToSite = await getUserHasAccessToSitePublic(req, site);
- if (!userHasAccessToSite) {
- return res.status(403).send({ error: "Forbidden" });
- }
-
const isPaginatedRequest = page !== undefined; // True if page is present
const dataQuery = getPageTitlesQuery(req, false);
diff --git a/server/src/api/analytics/getRetention.ts b/server/src/api/analytics/getRetention.ts
index 8a079f1e5..e53210303 100644
--- a/server/src/api/analytics/getRetention.ts
+++ b/server/src/api/analytics/getRetention.ts
@@ -1,6 +1,5 @@
import { FastifyReply, FastifyRequest } from "fastify";
import { clickhouse } from "../../db/clickhouse/clickhouse.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,11 +35,6 @@ 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 getUserHasAccessToSitePublic(req, site);
- if (!userHasAccessToSite) {
- return res.status(403).send({ error: "Forbidden" });
- }
-
// Build the appropriate SQL based on the retention mode
const periodFunction = retentionMode === "day" ? "toDate" : "toStartOfWeek";
const periodDiffFunc = retentionMode === "day" ? "day" : "week";
diff --git a/server/src/api/analytics/getSession.ts b/server/src/api/analytics/getSession.ts
index 3b4d4a0ba..6d6197a0d 100644
--- a/server/src/api/analytics/getSession.ts
+++ b/server/src/api/analytics/getSession.ts
@@ -1,6 +1,5 @@
import { FastifyReply, FastifyRequest } from "fastify";
import { clickhouse } from "../../db/clickhouse/clickhouse.js";
-import { getUserHasAccessToSitePublic } from "../../lib/auth-utils.js";
import { processResults } from "./utils.js";
export interface SessionDetails {
@@ -70,11 +69,6 @@ export async function getSession(req: FastifyRequest<GetSessionRequest>, res: Fa
const offset = req.query.offset ? parseInt(req.query.offset) : 0;
const minutes = req.query.minutes ? parseInt(req.query.minutes) : undefined;
- const userHasAccessToSite = await getUserHasAccessToSitePublic(req, site);
- if (!userHasAccessToSite) {
- return res.status(403).send({ error: "Forbidden" });
- }
-
// Add time filter if minutes is provided
const timeFilter = minutes ? `timestamp > now() - interval ${minutes} minute` : "";
diff --git a/server/src/api/analytics/getSessions.ts b/server/src/api/analytics/getSessions.ts
index a4f1aee71..adaf0b844 100644
--- a/server/src/api/analytics/getSessions.ts
+++ b/server/src/api/analytics/getSessions.ts
@@ -1,7 +1,6 @@
import { FastifyReply, FastifyRequest } from "fastify";
import { clickhouse } from "../../db/clickhouse/clickhouse.js";
import { getFilterStatement, getTimeStatement, processResults } from "./utils.js";
-import { getUserHasAccessToSitePublic } from "../../lib/auth-utils.js";
import { FilterParams } from "@rybbit/shared";
export type GetSessionsResponse = {
@@ -56,21 +55,17 @@ export interface GetSessionsRequest {
export async function getSessions(req: FastifyRequest<GetSessionsRequest>, res: FastifyReply) {
const { filters, page, userId, limit } = req.query;
const site = req.params.site;
- const userHasAccessToSite = await getUserHasAccessToSitePublic(req, site);
- if (!userHasAccessToSite) {
- return res.status(403).send({ error: "Forbidden" });
- }
let filterStatement = getFilterStatement(filters);
// Transform filter statement to use extracted UTM columns instead of map access
// since the CTE already extracts utm_source, utm_medium, etc. as separate columns
filterStatement = filterStatement
- .replace(/url_parameters\['utm_source'\]/g, 'utm_source')
- .replace(/url_parameters\['utm_medium'\]/g, 'utm_medium')
- .replace(/url_parameters\['utm_campaign'\]/g, 'utm_campaign')
- .replace(/url_parameters\['utm_term'\]/g, 'utm_term')
- .replace(/url_parameters\['utm_content'\]/g, 'utm_content');
+ .replace(/url_parameters\['utm_source'\]/g, "utm_source")
+ .replace(/url_parameters\['utm_medium'\]/g, "utm_medium")
+ .replace(/url_parameters\['utm_campaign'\]/g, "utm_campaign")
+ .replace(/url_parameters\['utm_term'\]/g, "utm_term")
+ .replace(/url_parameters\['utm_content'\]/g, "utm_content");
const timeStatement = getTimeStatement(req.query);
diff --git a/server/src/api/analytics/getSingleCol.ts b/server/src/api/analytics/getSingleCol.ts
index b6b5b5211..bec0221e7 100644
--- a/server/src/api/analytics/getSingleCol.ts
+++ b/server/src/api/analytics/getSingleCol.ts
@@ -1,6 +1,5 @@
import { FastifyReply, FastifyRequest } from "fastify";
import { clickhouse } from "../../db/clickhouse/clickhouse.js";
-import { getUserHasAccessToSitePublic } from "../../lib/auth-utils.js";
import { FilterParameter } from "./types.js";
import { getFilterStatement, getSqlParam, getTimeStatement, processResults } from "./utils.js";
import { FilterParams } from "@rybbit/shared";
@@ -398,11 +397,6 @@ export async function getSingleCol(req: FastifyRequest<GetSingleColRequest>, res
const { parameter, page } = req.query;
const site = req.params.site;
- const userHasAccessToSite = await getUserHasAccessToSitePublic(req, site);
- if (!userHasAccessToSite) {
- return res.status(403).send({ error: "Forbidden" });
- }
-
const isPaginatedRequest = page !== undefined;
const dataQuery = getQuery(req, false);
diff --git a/server/src/api/analytics/getUserSessionCount.ts b/server/src/api/analytics/getUserSessionCount.ts
index 06170ee03..c11b16bdd 100644
--- a/server/src/api/analytics/getUserSessionCount.ts
+++ b/server/src/api/analytics/getUserSessionCount.ts
@@ -1,7 +1,6 @@
import { FastifyReply, FastifyRequest } from "fastify";
import { clickhouse } from "../../db/clickhouse/clickhouse.js";
import { processResults } from "./utils.js";
-import { getUserHasAccessToSitePublic } from "../../lib/auth-utils.js";
import SqlString from "sqlstring";
export interface GetUserSessionCountRequest {
@@ -23,11 +22,6 @@ export async function getUserSessionCount(req: FastifyRequest<GetUserSessionCoun
const { site } = req.params;
const { userId, timeZone = "UTC" } = req.query;
- const userHasAccessToSite = await getUserHasAccessToSitePublic(req, site);
- if (!userHasAccessToSite) {
- return res.status(403).send({ error: "Forbidden" });
- }
-
if (!userId) {
return res.status(400).send({ error: "userId is required" });
}
diff --git a/server/src/api/analytics/getUserSessions.ts b/server/src/api/analytics/getUserSessions.ts
index c35a4a2df..8bf27eeae 100644
--- a/server/src/api/analytics/getUserSessions.ts
+++ b/server/src/api/analytics/getUserSessions.ts
@@ -1,7 +1,6 @@
import { FastifyReply, FastifyRequest } from "fastify";
import { clickhouse } from "../../db/clickhouse/clickhouse.js";
import { getFilterStatement, getTimeStatement, processResults } from "./utils.js";
-import { getUserHasAccessToSitePublic } from "../../lib/auth-utils.js";
// Individual pageview type
type Pageview = {
@@ -53,11 +52,6 @@ export async function getUserSessions(req: FastifyRequest<GetUserSessionsRequest
const { startDate, endDate, timeZone, site, filters } = req.query;
const userId = req.params.userId;
- const userHasAccessToSite = await getUserHasAccessToSitePublic(req, site);
- if (!userHasAccessToSite) {
- return res.status(403).send({ error: "Forbidden" });
- }
-
const filterStatement = getFilterStatement(filters);
const timeStatement = getTimeStatement(req.query);
diff --git a/server/src/api/analytics/getUsers.ts b/server/src/api/analytics/getUsers.ts
index e86e837f2..605b09407 100644
--- a/server/src/api/analytics/getUsers.ts
+++ b/server/src/api/analytics/getUsers.ts
@@ -1,7 +1,6 @@
import { FastifyReply, FastifyRequest } from "fastify";
import { clickhouse } from "../../db/clickhouse/clickhouse.js";
import { getFilterStatement, getTimeStatement, processResults } from "./utils.js";
-import { getUserHasAccessToSitePublic } from "../../lib/auth-utils.js";
import { FilterParams } from "@rybbit/shared";
export type GetUsersResponse = {
@@ -48,11 +47,6 @@ export async function getUsers(req: FastifyRequest<GetUsersRequest>, res: Fastif
} = req.query;
const site = req.params.site;
- const userHasAccessToSite = await getUserHasAccessToSitePublic(req, site);
- if (!userHasAccessToSite) {
- return res.status(403).send({ error: "Forbidden" });
- }
-
const pageNum = parseInt(page, 10);
const pageSizeNum = parseInt(pageSize, 10);
const offset = (pageNum - 1) * pageSizeNum;
diff --git a/server/src/api/analytics/goals/getGoals.ts b/server/src/api/analytics/goals/getGoals.ts
index 3652763c5..3e83a7763 100644
--- a/server/src/api/analytics/goals/getGoals.ts
+++ b/server/src/api/analytics/goals/getGoals.ts
@@ -2,7 +2,6 @@ import { FastifyReply, FastifyRequest } from "fastify";
import { db } from "../../../db/postgres/postgres.js";
import { goals } from "../../../db/postgres/schema.js";
import { clickhouse } from "../../../db/clickhouse/clickhouse.js";
-import { getUserHasAccessToSitePublic } from "../../../lib/auth-utils.js";
import { eq, desc, asc, sql } from "drizzle-orm";
import { getFilterStatement, getTimeStatement, processResults, patternToRegex } from "../utils.js";
import SqlString from "sqlstring";
@@ -59,12 +58,6 @@ export async function getGoals(
return reply.status(400).send({ error: "Invalid page size, must be between 1 and 100" });
}
- // Check user access to site
- const userHasAccessToSite = await getUserHasAccessToSitePublic(request, site);
- if (!userHasAccessToSite) {
- return reply.status(403).send({ error: "Forbidden" });
- }
-
try {
// Count total goals for pagination metadata
const totalGoalsResult = await db
diff --git a/server/src/api/analytics/performance/getPerformanceByDimension.ts b/server/src/api/analytics/performance/getPerformanceByDimension.ts
index b73b30c1b..b8dd01d74 100644
--- a/server/src/api/analytics/performance/getPerformanceByDimension.ts
+++ b/server/src/api/analytics/performance/getPerformanceByDimension.ts
@@ -1,6 +1,5 @@
import { FastifyReply, FastifyRequest } from "fastify";
import { clickhouse } from "../../../db/clickhouse/clickhouse.js";
-import { getUserHasAccessToSitePublic } from "../../../lib/auth-utils.js";
import { getFilterStatement, getTimeStatement, processResults } from "../utils.js";
import { FilterParams } from "@rybbit/shared";
@@ -225,11 +224,6 @@ export async function getPerformanceByDimension(
const { page, dimension } = req.query;
const site = req.params.site;
- const userHasAccessToSite = await getUserHasAccessToSitePublic(req, site);
- if (!userHasAccessToSite) {
- return res.status(403).send({ error: "Forbidden" });
- }
-
const isPaginatedRequest = page !== undefined;
try {
diff --git a/server/src/api/analytics/performance/getPerformanceOverview.ts b/server/src/api/analytics/performance/getPerformanceOverview.ts
index 4a45ed36b..f1a41a316 100644
--- a/server/src/api/analytics/performance/getPerformanceOverview.ts
+++ b/server/src/api/analytics/performance/getPerformanceOverview.ts
@@ -1,7 +1,6 @@
import { FastifyReply, FastifyRequest } from "fastify";
import { clickhouse } from "../../../db/clickhouse/clickhouse.js";
import { getFilterStatement, getTimeStatement, processResults } from "../utils.js";
-import { getUserHasAccessToSitePublic } from "../../../lib/auth-utils.js";
import { PerformanceOverviewMetrics } from "../types.js";
import { FilterParams } from "@rybbit/shared";
@@ -47,10 +46,6 @@ export interface PerformanceOverviewRequest {
export async function getPerformanceOverview(req: FastifyRequest<PerformanceOverviewRequest>, res: FastifyReply) {
const site = req.params.site;
- const userHasAccessToSite = await getUserHasAccessToSitePublic(req, site);
- if (!userHasAccessToSite) {
- return res.status(403).send({ error: "Forbidden" });
- }
const query = getQuery(req.query);
diff --git a/server/src/api/analytics/performance/getPerformanceTimeSeries.ts b/server/src/api/analytics/performance/getPerformanceTimeSeries.ts
index 5cffef310..9204aee7f 100644
--- a/server/src/api/analytics/performance/getPerformanceTimeSeries.ts
+++ b/server/src/api/analytics/performance/getPerformanceTimeSeries.ts
@@ -2,7 +2,6 @@ import { FastifyReply, FastifyRequest } from "fastify";
import { clickhouse } from "../../../db/clickhouse/clickhouse.js";
import { getFilterStatement, getTimeStatement, processResults, TimeBucketToFn, bucketIntervalMap } from "../utils.js";
import SqlString from "sqlstring";
-import { getUserHasAccessToSitePublic } from "../../../lib/auth-utils.js";
import { validateTimeStatementFillParams } from "../query-validation.js";
import { TimeBucket, PerformanceTimeSeriesPoint } from "../types.js";
import { FilterParams } from "@rybbit/shared";
@@ -120,11 +119,6 @@ export async function getPerformanceTimeSeries(
) {
const site = req.params.site;
- const userHasAccessToSite = await getUserHasAccessToSitePublic(req, site);
- if (!userHasAccessToSite) {
- return res.status(403).send({ error: "Forbidden" });
- }
-
const query = getQuery(req.query);
try {
diff --git a/server/src/api/sites/getSite.ts b/server/src/api/sites/getSite.ts
index 932cfe698..a09aea31b 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, getUserHasAdminAccessToSite } from "../../lib/auth-utils.js";
+import { getUserHasAdminAccessToSite } from "../../lib/auth-utils.js";
interface GetSiteParams {
Params: {
@@ -23,15 +23,8 @@ export async function getSite(request: FastifyRequest<GetSiteParams>, reply: Fas
return reply.status(404).send({ error: "Site not found" });
}
- // Check user access to site and owner status in parallel
- const [userHasAccessToSite, isOwner] = await Promise.all([
- getUserHasAccessToSitePublic(request, site.siteId),
- getUserHasAdminAccessToSite(request, site.siteId),
- ]);
-
- if (!userHasAccessToSite) {
- return reply.status(403).send({ error: "Forbidden" });
- }
+ // Check if user has admin access
+ const isOwner = await getUserHasAdminAccessToSite(request, site.siteId);
return reply.status(200).send({
id: site.id,
diff --git a/server/src/api/sites/getSitePrivateLinkConfig.ts b/server/src/api/sites/getSitePrivateLinkConfig.ts
new file mode 100644
index 000000000..18cd4b3e0
--- /dev/null
+++ b/server/src/api/sites/getSitePrivateLinkConfig.ts
@@ -0,0 +1,54 @@
+import { FastifyRequest, FastifyReply } from "fastify";
+import { db } from "../../db/postgres/postgres.js";
+import { sites } from "../../db/postgres/schema.js";
+import { eq, and } from "drizzle-orm";
+import { getUserHasAdminAccessToSite } from "../../lib/auth-utils.js";
+
+export async function getSitePrivateLinkConfig(
+ request: FastifyRequest<{ Params: { siteId: string } }>,
+ reply: FastifyReply
+) {
+ try {
+ if (!request.user) {
+ return reply.status(401).send({ success: false, error: "Unauthorized" });
+ }
+
+ const { siteId } = request.params;
+ const parsedSiteId = parseInt(siteId, 10);
+
+ if (isNaN(parsedSiteId)) {
+ return reply.status(400).send({ success: false, error: "Invalid site ID" });
+ }
+
+ const userHasAdminAccessToSite = await getUserHasAdminAccessToSite(request, String(parsedSiteId));
+ if (!userHasAdminAccessToSite) {
+ return reply.status(403).send({ error: "Forbidden" });
+ }
+
+ // Get site data
+ const site = await db
+ .select({
+ privateLinkKey: sites.privateLinkKey,
+ })
+ .from(sites)
+ .where(eq(sites.siteId, parsedSiteId))
+ .limit(1);
+
+ if (site.length === 0) {
+ return reply.status(404).send({ success: false, error: "Site not found" });
+ }
+
+ return reply.send({
+ success: true,
+ data: {
+ privateLinkKey: site[0].privateLinkKey,
+ },
+ });
+ } catch (error) {
+ console.error("Error getting site private link configuration:", error);
+ return reply.status(500).send({
+ success: false,
+ error: "Failed to get site private link configuration",
+ });
+ }
+}
diff --git a/server/src/api/sites/updateSitePrivateLinkConfig.ts b/server/src/api/sites/updateSitePrivateLinkConfig.ts
new file mode 100644
index 000000000..67c268463
--- /dev/null
+++ b/server/src/api/sites/updateSitePrivateLinkConfig.ts
@@ -0,0 +1,73 @@
+import crypto from "crypto";
+import { FastifyReply, FastifyRequest } from "fastify";
+import { z } from "zod";
+import { getUserHasAdminAccessToSite } from "../../lib/auth-utils.js";
+import { siteConfig } from "../../lib/siteConfig.js";
+
+// Schema for updating API configuration
+const updatePrivateLinkConfigSchema = z.object({
+ action: z.enum(["generate_private_link_key", "revoke_private_link_key"]),
+});
+
+export async function updateSitePrivateLinkConfig(request: FastifyRequest, reply: FastifyReply) {
+ try {
+ if (!request.user) {
+ return reply.status(401).send({ success: false, error: "Unauthorized" });
+ }
+
+ const { siteId } = request.params as { siteId: string };
+ const parsedSiteId = parseInt(siteId, 10);
+
+ if (isNaN(parsedSiteId)) {
+ return reply.status(400).send({ success: false, error: "Invalid site ID" });
+ }
+
+ const userHasAdminAccessToSite = await getUserHasAdminAccessToSite(request, String(parsedSiteId));
+ if (!userHasAdminAccessToSite) {
+ return reply.status(403).send({ error: "Forbidden" });
+ }
+
+ // Validate request body
+ const validationResult = updatePrivateLinkConfigSchema.safeParse(request.body);
+ if (!validationResult.success) {
+ return reply.status(400).send({
+ success: false,
+ error: "Invalid request body",
+ details: validationResult.error.flatten(),
+ });
+ }
+
+ const { action } = validationResult.data;
+
+ let updateData: any = {};
+
+ switch (action) {
+ case "generate_private_link_key":
+ const privateLinkKey = `${crypto.randomBytes(6).toString("hex")}`;
+ updateData.privateLinkKey = privateLinkKey;
+ break;
+
+ case "revoke_private_link_key":
+ updateData.privateLinkKey = null;
+ break;
+ }
+
+ // Update the site config cache
+ if (action === "generate_private_link_key" || action === "revoke_private_link_key") {
+ siteConfig.updateConfig(parsedSiteId, { privateLinkKey: updateData.privateLinkKey });
+ }
+
+ return reply.send({
+ success: true,
+ data: {
+ privateLinkKey: updateData.privateLinkKey,
+ },
+ });
+ } catch (error) {
+ console.error("Error updating site dev config:", error);
+ return reply.status(500).send({
+ success: false,
+ error: "Failed to update site API configuration",
+ });
+ }
+}
diff --git a/server/src/db/postgres/schema.ts b/server/src/db/postgres/schema.ts
index 5e68c839c..3ff738497 100644
--- a/server/src/db/postgres/schema.ts
+++ b/server/src/db/postgres/schema.ts
@@ -80,6 +80,7 @@ export const sites = pgTable(
trackSpaNavigation: boolean().default(true),
trackIp: boolean().default(false),
apiKey: text("api_key"), // Format: rb_{32_hex_chars} = 35 chars total
+ privateLinkKey: text("private_link_key"),
},
table => [
foreignKey({
diff --git a/server/src/index.ts b/server/src/index.ts
index 73102741f..3ae8f9a78 100644
--- a/server/src/index.ts
+++ b/server/src/index.ts
@@ -67,7 +67,7 @@ import { listOrganizationMembers } from "./api/user/listOrganizationMembers.js";
import { updateAccountSettings } from "./api/user/updateAccountSettings.js";
import { initializeClickhouse } from "./db/clickhouse/clickhouse.js";
import { initPostgres } from "./db/postgres/initPostgres.js";
-import { getSessionFromReq, mapHeaders } from "./lib/auth-utils.js";
+import { getSessionFromReq, getUserHasAccessToSitePublic, mapHeaders } from "./lib/auth-utils.js";
import { auth } from "./lib/auth.js";
import { IS_CLOUD } from "./lib/const.js";
import { siteConfig } from "./lib/siteConfig.js";
@@ -77,6 +77,8 @@ import { telemetryService } from "./services/telemetryService.js";
import { weeklyReportService } from "./services/weekyReports/weeklyReportService.js";
import { extractSiteId } from "./utils.js";
import { getTrackingConfig } from "./api/sites/getTrackingConfig.js";
+import { updateSitePrivateLinkConfig } from "./api/sites/updateSitePrivateLinkConfig.js";
+import { getSitePrivateLinkConfig } from "./api/sites/getSitePrivateLinkConfig.js";
const __filename = fileURLToPath(import.meta.url);
const __dirname = dirname(__filename);
@@ -151,7 +153,7 @@ server.register(cors, {
callback(null, true);
},
methods: ["GET", "POST", "PUT", "DELETE", "OPTIONS", "PATCH"],
- allowedHeaders: ["Content-Type", "Authorization", "X-Requested-With", "x-captcha-response"],
+ allowedHeaders: ["Content-Type", "Authorization", "X-Requested-With", "x-captcha-response", "x-private-key"],
credentials: true,
});
@@ -258,9 +260,15 @@ server.addHook("onRequest", async (request, reply) => {
if (ANALYTICS_ROUTES.some(route => processedUrl.startsWith(route))) {
const siteId = extractSiteId(processedUrl);
- if (siteId && (await siteConfig.getConfig(siteId))?.public) {
- // Skip auth check for public sites
- return;
+ if (siteId) {
+ // Check all access methods: direct access, public site, or valid private key
+ const hasAccess = await getUserHasAccessToSitePublic(request, siteId);
+
+ if (hasAccess) {
+ // User has access via: direct access, public site, or valid private key
+ // Skip auth requirement and allow the request through
+ return;
+ }
}
}
@@ -339,6 +347,8 @@ server.get("/api/get-sites-from-org/:organizationId", getSitesFromOrg);
server.get("/api/get-site/:id", getSite);
server.get("/api/site/:siteId/api-config", getSiteApiConfig);
server.post("/api/site/:siteId/api-config", updateSiteApiConfig);
+server.get("/api/site/:siteId/private-link-config", getSitePrivateLinkConfig);
+server.post("/api/site/:siteId/private-link-config", updateSitePrivateLinkConfig);
server.get("/api/site/:siteId/tracking-config", getTrackingConfig);
server.get("/api/site/:siteId/excluded-ips", getSiteExcludedIPs);
server.get("/api/site/:siteId/excluded-countries", getSiteExcludedCountries);
diff --git a/server/src/lib/auth-utils.ts b/server/src/lib/auth-utils.ts
index c92cfb5a3..9e333904f 100644
--- a/server/src/lib/auth-utils.ts
+++ b/server/src/lib/auth-utils.ts
@@ -104,11 +104,29 @@ export async function getSitesUserHasAccessTo(req: FastifyRequest, adminOnly = f
// for routes that are potentially public
export async function getUserHasAccessToSitePublic(req: FastifyRequest, siteId: string | number) {
- const [sites, isPublic] = await Promise.all([
+ const [sites, config] = await Promise.all([
getSitesUserHasAccessTo(req),
- (await siteConfig.getConfig(siteId))?.public,
+ siteConfig.getConfig(siteId),
]);
- return sites.some(site => site.siteId === Number(siteId)) || isPublic;
+
+ // Check if user has direct access to the site
+ const hasDirectAccess = sites.some(site => site.siteId === Number(siteId));
+ if (hasDirectAccess) {
+ return true;
+ }
+
+ // Check if site is public
+ if (config?.public) {
+ return true;
+ }
+
+ // Check if a valid private key was provided in the header
+ const privateKey = req.headers["x-private-key"];
+ if (privateKey && typeof privateKey === "string" && config?.privateLinkKey === privateKey) {
+ return true;
+ }
+
+ return false;
}
export async function getUserHasAccessToSite(req: FastifyRequest, siteId: string | number) {
diff --git a/server/src/lib/siteConfig.ts b/server/src/lib/siteConfig.ts
index 2f0bb3955..ed9590fba 100644
--- a/server/src/lib/siteConfig.ts
+++ b/server/src/lib/siteConfig.ts
@@ -15,6 +15,7 @@ export interface SiteConfigData {
excludedIPs: string[];
excludedCountries: string[];
apiKey?: string | null;
+ privateLinkKey?: string | null;
sessionReplay: boolean;
webVitals: boolean;
trackErrors: boolean;
@@ -61,6 +62,7 @@ class SiteConfig {
excludedIPs: sites.excludedIPs,
excludedCountries: sites.excludedCountries,
apiKey: sites.apiKey,
+ privateLinkKey: sites.privateLinkKey,
sessionReplay: sites.sessionReplay,
webVitals: sites.webVitals,
trackErrors: sites.trackErrors,
@@ -88,6 +90,7 @@ class SiteConfig {
excludedIPs: Array.isArray(site.excludedIPs) ? site.excludedIPs : [],
excludedCountries: Array.isArray(site.excludedCountries) ? site.excludedCountries : [],
apiKey: site.apiKey,
+ privateLinkKey: site.privateLinkKey,
sessionReplay: site.sessionReplay || false,
webVitals: site.webVitals || false,
trackErrors: site.trackErrors || false,