🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Fix API key length validation (accept rb_ + 64 hex / 67 chars) (#773)
Wojciech Kałużny1614811519a1
diff --git a/server/src/api/sessionReplay/recordSessionReplay.ts b/server/src/api/sessionReplay/recordSessionReplay.tsindex 05bbbdc8b..817b82cfd 100644--- a/server/src/api/sessionReplay/recordSessionReplay.ts+++ b/server/src/api/sessionReplay/recordSessionReplay.ts@@ -24,7 +24,7 @@ const recordSessionReplaySchema = z.object({language: z.string().optional(),}).optional(),- apiKey: z.string().max(35).optional(), // rb_ prefix + 32 hex chars+ apiKey: z.string().max(67).optional(), // rb_ prefix + 64 hex chars});export async function recordSessionReplay(diff --git a/server/src/db/postgres/schema.ts b/server/src/db/postgres/schema.tsindex 8bf7fde7c..7c9960767 100644--- a/server/src/db/postgres/schema.ts+++ b/server/src/db/postgres/schema.ts@@ -79,7 +79,7 @@ export const sites = pgTable("sites", {trackInitialPageView: boolean().default(true),trackSpaNavigation: boolean().default(true),trackIp: boolean().default(false),- apiKey: text("api_key"), // Format: rb_{32_hex_chars} = 35 chars total+ apiKey: text("api_key"), // Format: rb_{64_hex_chars} = 67 chars totalprivateLinkKey: text("private_link_key"),});diff --git a/server/src/services/tracker/trackEvent.ts b/server/src/services/tracker/trackEvent.tsindex b656c7b6f..d04730d1d 100644--- a/server/src/services/tracker/trackEvent.ts+++ b/server/src/services/tracker/trackEvent.ts@@ -25,7 +25,7 @@ export const trackingPayloadSchema = z.discriminatedUnion("type", [event_name: z.string().max(256).optional(),properties: z.string().max(2048).optional(),user_id: z.string().max(255).optional(),- api_key: z.string().max(35).optional(), // rb_ prefix + 32 hex chars+ api_key: z.string().max(67).optional(), // rb_ prefix + 64 hex charsip_address: z.string().ip().optional(), // Custom IP for geolocationuser_agent: z.string().max(512).optional(), // Custom user agent})@@ -59,7 +59,7 @@ export const trackingPayloadSchema = z.discriminatedUnion("type", [).optional(), // Optional but must be valid JSON if presentuser_id: z.string().max(255).optional(),- api_key: z.string().max(35).optional(), // rb_ prefix + 32 hex chars+ api_key: z.string().max(67).optional(), // rb_ prefix + 64 hex charsip_address: z.string().ip().optional(), // Custom IP for geolocationuser_agent: z.string().max(512).optional(), // Custom user agent})@@ -79,7 +79,7 @@ export const trackingPayloadSchema = z.discriminatedUnion("type", [event_name: z.string().max(256).optional(),properties: z.string().max(2048).optional(),user_id: z.string().max(255).optional(),- api_key: z.string().max(35).optional(), // rb_ prefix + 32 hex chars+ api_key: z.string().max(67).optional(), // rb_ prefix + 64 hex charsip_address: z.string().ip().optional(), // Custom IP for geolocationuser_agent: z.string().max(512).optional(), // Custom user agent// Performance metrics (can be null if not collected)@@ -132,7 +132,7 @@ export const trackingPayloadSchema = z.discriminatedUnion("type", [}),user_id: z.string().max(255).optional(),- api_key: z.string().max(35).optional(), // rb_ prefix + 32 hex chars+ api_key: z.string().max(67).optional(), // rb_ prefix + 64 hex charsip_address: z.string().ip().optional(), // Custom IP for geolocationuser_agent: z.string().max(512).optional(), // Custom user agent})@@ -187,7 +187,7 @@ export const trackingPayloadSchema = z.discriminatedUnion("type", [}),user_id: z.string().max(255).optional(),- api_key: z.string().max(35).optional(), // rb_ prefix + 32 hex chars+ api_key: z.string().max(67).optional(), // rb_ prefix + 64 hex charsip_address: z.string().ip().optional(), // Custom IP for geolocationuser_agent: z.string().max(512).optional(), // Custom user agent})