🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
fix inconsistencies (#753)
Bill Yang3bdeaeb526b2
diff --git a/client/src/api/admin/auth.ts b/client/src/api/admin/auth.tsindex 58e323823..cb8c6aa81 100644--- a/client/src/api/admin/auth.ts+++ b/client/src/api/admin/auth.ts@@ -19,7 +19,7 @@ type GetOrganizationMembersResponse = {export const useOrganizationMembers = (organizationId: string) => {return useQuery<GetOrganizationMembersResponse>({queryKey: ["organization-members", organizationId],- queryFn: () => authedFetch(`/list-organization-members/${organizationId}`),+ queryFn: () => authedFetch(`/organizations/${organizationId}/members`),staleTime: Infinity,});};diff --git a/client/src/api/admin/excludedCountries.ts b/client/src/api/admin/excludedCountries.tsindex 5644b24fe..f094624dc 100644--- a/client/src/api/admin/excludedCountries.ts+++ b/client/src/api/admin/excludedCountries.ts@@ -23,7 +23,7 @@ export interface UpdateExcludedCountriesResponse {}export const fetchExcludedCountries = async (siteId: string): Promise<ExcludedCountriesResponse> => {- return await authedFetch<ExcludedCountriesResponse>(`/site/${siteId}/excluded-countries`);+ return await authedFetch<ExcludedCountriesResponse>(`/sites/${siteId}/excluded-countries`);};export const updateExcludedCountries = async (diff --git a/client/src/api/admin/excludedIPs.ts b/client/src/api/admin/excludedIPs.tsindex 8375fcf82..bf23dcd6c 100644--- a/client/src/api/admin/excludedIPs.ts+++ b/client/src/api/admin/excludedIPs.ts@@ -24,7 +24,7 @@ export interface UpdateExcludedIPsResponse {// Fetch excluded IPs for a siteexport const fetchExcludedIPs = async (siteId: string): Promise<ExcludedIPsResponse> => {- return await authedFetch<ExcludedIPsResponse>(`/site/${siteId}/excluded-ips`);+ return await authedFetch<ExcludedIPsResponse>(`/sites/${siteId}/excluded-ips`);};// Update excluded IPs for a site using the consolidated endpointdiff --git a/client/src/api/admin/import.ts b/client/src/api/admin/import.tsindex 1d4585b50..a269ae9b4 100644--- a/client/src/api/admin/import.ts+++ b/client/src/api/admin/import.ts@@ -24,7 +24,7 @@ interface CreateSiteImportResponse {export function useGetSiteImports(site: number) {return useQuery({queryKey: ["get-site-imports", site],- queryFn: async () => await authedFetch<APIResponse<GetSiteImportsResponse[]>>(`/get-site-imports/${site}`),+ queryFn: async () => await authedFetch<APIResponse<GetSiteImportsResponse[]>>(`/sites/${site}/imports`),refetchInterval: data => {const hasActiveImports = data.state.data?.data.some(imp => imp.completedAt === null);return hasActiveImports ? 5000 : false;@@ -39,7 +39,7 @@ export function useCreateSiteImport(site: number) {return useMutation({mutationFn: async (data: { platform: ImportPlatform }) => {- return await authedFetch<APIResponse<CreateSiteImportResponse>>(`/create-site-import/${site}`, undefined, {+ return await authedFetch<APIResponse<CreateSiteImportResponse>>(`/sites/${site}/imports`, undefined, {method: "POST",data,});@@ -58,7 +58,7 @@ export function useDeleteSiteImport(site: number) {return useMutation({mutationFn: async (importId: string) => {- return await authedFetch(`/delete-site-import/${site}/${importId}`, undefined, {+ return await authedFetch(`/sites/${site}/imports/${importId}`, undefined, {method: "DELETE",});},diff --git a/client/src/api/admin/organizations.ts b/client/src/api/admin/organizations.tsindex 1b93bd893..98d5e7155 100644--- a/client/src/api/admin/organizations.ts+++ b/client/src/api/admin/organizations.ts@@ -56,12 +56,11 @@ export function useAddUserToOrganization() {return useMutation<{ message: string }, Error, AddUserToOrganizationInput>({mutationFn: async ({ email, role, organizationId }: AddUserToOrganizationInput) => {try {- return await authedFetch<{ message: string }>("/add-user-to-organization", undefined, {+ return await authedFetch<{ message: string }>(`/organizations/${organizationId}/members`, undefined, {method: "POST",data: {email,role,- organizationId,},});} catch (error) {diff --git a/client/src/api/admin/privateLink.ts b/client/src/api/admin/privateLink.tsindex 16c85b2cd..906363514 100644--- a/client/src/api/admin/privateLink.ts+++ b/client/src/api/admin/privateLink.ts@@ -17,7 +17,7 @@ export const useGetPrivateLinkConfig = (siteId: number) => {const response = await authedFetch<{success: boolean;data: PrivateLinkConfigResponse;- }>(`/site/${siteId}/private-link-config`);+ }>(`/sites/${siteId}/private-link-config`);return response.data;},enabled: !!siteId,@@ -34,7 +34,7 @@ export const useGeneratePrivateLinkKey = () => {success: boolean;data: UpdatePrivateLinkConfigResponse;}>(- `/site/${siteId}/private-link-config`,+ `/sites/${siteId}/private-link-config`,{},{method: "POST",@@ -59,7 +59,7 @@ export const useRevokePrivateLinkKey = () => {success: boolean;data: UpdatePrivateLinkConfigResponse;}>(- `/site/${siteId}/private-link-config`,+ `/sites/${siteId}/private-link-config`,{},{method: "POST",diff --git a/client/src/api/admin/sites.ts b/client/src/api/admin/sites.tsindex e3b2e4652..47ed30a70 100644--- a/client/src/api/admin/sites.ts+++ b/client/src/api/admin/sites.ts@@ -69,7 +69,7 @@ export function useGetSitesFromOrg(organizationId?: string) {return useQuery<GetSitesFromOrgResponse>({queryKey: ["get-sites-from-org", organizationId],queryFn: () => {- return authedFetch(`/get-sites-from-org/${organizationId}`);+ return authedFetch(`/organizations/${organizationId}/sites`);},staleTime: 60000, // 1 minuteenabled: !!organizationId,@@ -86,7 +86,7 @@ export function addSite(blockBots?: boolean;}) {- return authedFetch<{ siteId: number }>("/add-site", undefined, {+ return authedFetch<{ siteId: number }>("/sites", undefined, {method: "POST",data: {domain,@@ -103,8 +103,8 @@ export function addSite(}export function deleteSite(siteId: number) {- return authedFetch(`/delete-site/${siteId}`, undefined, {- method: "POST",+ return authedFetch(`/sites/${siteId}`, undefined, {+ method: "DELETE",});}@@ -127,12 +127,9 @@ export function updateSiteConfig(trackSpaNavigation?: boolean;}) {- return authedFetch("/update-site-config", undefined, {- method: "POST",- data: {- siteId,- ...config,- },+ return authedFetch(`/sites/${siteId}/config`, undefined, {+ method: "PUT",+ data: config,headers: {"Content-Type": "application/json",},@@ -166,7 +163,7 @@ export function useGetSite(siteId?: string | number) {}// Use regular fetch instead of authedFetch to support public sites- const data = await authedFetch<SiteResponse>(`/get-site/${siteIdToUse}`);+ const data = await authedFetch<SiteResponse>(`/sites/${siteIdToUse}`);return data;},staleTime: 60000, // 1 minutediff --git a/client/src/lib/import/csvParser.ts b/client/src/lib/import/csvParser.tsindex 839de4190..b8570121f 100644--- a/client/src/lib/import/csvParser.ts+++ b/client/src/lib/import/csvParser.ts@@ -216,7 +216,7 @@ export class CsvParser {return;}- await authedFetch(`/batch-import-events/${this.siteId}/${this.importId}`, undefined, {+ await authedFetch(`/sites/${this.siteId}/imports/${this.importId}/events`, undefined, {method: "POST",data: {events,diff --git a/server/src/api/sites/updateSiteConfig.ts b/server/src/api/sites/updateSiteConfig.tsindex 5a4a1a24b..1cc393e94 100644--- a/server/src/api/sites/updateSiteConfig.ts+++ b/server/src/api/sites/updateSiteConfig.ts@@ -9,19 +9,6 @@ import { validateIPPattern } from "../../lib/ipUtils.js";// Schema for the update request - all fields are optional but validated when presentconst updateSiteConfigSchema = z.object({- siteId: z.union([z.string(), z.number()]).transform(val => {- const num = typeof val === "number" ? val : parseInt(val as string, 10);- if (isNaN(num) || num <= 0) {- throw new z.ZodError([- {- code: z.ZodIssueCode.custom,- message: "Invalid site ID: must be a positive integer",- path: ["siteId"],- },- ]);- }- return num;- }),// Site settingspublic: z.boolean().optional(),saltUserIds: z.boolean().optional(),@@ -59,10 +46,19 @@ const updateSiteConfigSchema = z.object({type UpdateSiteConfigRequest = z.infer<typeof updateSiteConfigSchema>;export async function updateSiteConfig(- request: FastifyRequest<{ Body: UpdateSiteConfigRequest }>,+ request: FastifyRequest<{ Params: { id: string }; Body: UpdateSiteConfigRequest }>,reply: FastifyReply) {try {+ // Get siteId from path params+ const siteId = parseInt(request.params.id, 10);+ if (isNaN(siteId) || siteId <= 0) {+ return reply.status(400).send({+ success: false,+ error: "Invalid site ID: must be a positive integer",+ });+ }+// Validate request bodyconst validationResult = updateSiteConfigSchema.safeParse(request.body);if (!validationResult.success) {@@ -73,7 +69,7 @@ export async function updateSiteConfig(});}- const { siteId, ...updateData } = validationResult.data;+ const updateData = validationResult.data;// Check user permissionsconst userHasAdminAccessToSite = await getUserHasAdminAccessToSite(request, String(siteId));diff --git a/server/src/api/user/addUserToOrganization.ts b/server/src/api/user/addUserToOrganization.tsindex 9dcc0748f..14fd2776d 100644--- a/server/src/api/user/addUserToOrganization.ts+++ b/server/src/api/user/addUserToOrganization.ts@@ -17,16 +17,19 @@ function generateId(len = 32) {}interface AddUserToOrganization {+ Params: {+ organizationId: string;+ };Body: {email: string;role: string;- organizationId: string;};}export async function addUserToOrganization(request: FastifyRequest<AddUserToOrganization>, reply: FastifyReply) {try {- const { email, role, organizationId } = request.body;+ const { organizationId } = request.params;+ const { email, role } = request.body;const [userIsInOrg, isAdmin] = await Promise.all([getUserIsInOrg(request, organizationId),@@ -38,9 +41,9 @@ export async function addUserToOrganization(request: FastifyRequest<AddUserToOrg}// Validate input- if (!email || !role || !organizationId) {+ if (!email || !role) {return reply.status(400).send({- error: "Missing required fields: email, role, and organizationId",+ error: "Missing required fields: email and role",});}diff --git a/server/src/index.ts b/server/src/index.tsindex ef5c155a8..8de09b64f 100644--- a/server/src/index.ts+++ b/server/src/index.ts@@ -366,27 +366,31 @@ server.get("/api/session-replay/list/:site", getSessionReplays);server.get("/api/session-replay/:sessionId/:site", getSessionReplayEvents);server.delete("/api/session-replay/:sessionId/:site", deleteSessionReplay);-// Imports-server.get("/api/get-site-imports/:site", getSiteImports);-server.post("/api/create-site-import/:site", createSiteImport);-server.post("/api/batch-import-events/:site/:importId", batchImportEvents);-server.delete("/api/delete-site-import/:site/:importId", deleteSiteImport);+// Sites+server.get("/api/sites/:id", getSite);+server.post("/api/sites", addSite);+server.put("/api/sites/:id/config", updateSiteConfig);+server.delete("/api/sites/:id", deleteSite);+server.get("/api/sites/:siteId/private-link-config", getSitePrivateLinkConfig);+server.post("/api/sites/:siteId/private-link-config", updateSitePrivateLinkConfig);+server.get("/api/site/tracking-config/:siteId", getTrackingConfig);+server.get("/api/sites/:siteId/excluded-ips", getSiteExcludedIPs);+server.get("/api/sites/:siteId/excluded-countries", getSiteExcludedCountries);++// Site Imports+server.get("/api/sites/:site/imports", getSiteImports);+server.post("/api/sites/:site/imports", createSiteImport);+server.post("/api/sites/:site/imports/:importId/events", batchImportEvents);+server.delete("/api/sites/:site/imports/:importId", deleteSiteImport);-// Administrative+// Organizations+server.get("/api/organizations/:organizationId/sites", getSitesFromOrg);+server.get("/api/organizations/:organizationId/members", listOrganizationMembers);+server.post("/api/organizations/:organizationId/members", addUserToOrganization);++// Userserver.get("/api/config", getConfig);-server.post("/api/add-site", addSite);-server.post("/api/update-site-config", updateSiteConfig);-server.post("/api/delete-site/:id", deleteSite);-server.get("/api/get-sites-from-org/:organizationId", getSitesFromOrg);-server.get("/api/get-site/:id", getSite);-server.get("/api/site/:siteId/private-link-config", getSitePrivateLinkConfig);-server.post("/api/site/:siteId/private-link-config", updateSitePrivateLinkConfig);-server.get("/api/site/tracking-config/:siteId", getTrackingConfig);-server.get("/api/site/:siteId/excluded-ips", getSiteExcludedIPs);-server.get("/api/site/:siteId/excluded-countries", getSiteExcludedCountries);-server.get("/api/list-organization-members/:organizationId", listOrganizationMembers);server.get("/api/user/organizations", getUserOrganizations);-server.post("/api/add-user-to-organization", addUserToOrganization);server.post("/api/user/account-settings", updateAccountSettings);server.get("/api/user/api-keys", listApiKeys);server.post("/api/user/api-keys", createApiKey);