Skip to content

The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.

fix(common): resolve double-encoding in first-referrer cookie serialization (#43617)

Sean Oliver075c2f4528ca
diff --git a/packages/common/first-referrer-cookie.test.ts b/packages/common/first-referrer-cookie.test.ts
index 4fa97a92751..3b83b6ca4df 100644
--- a/packages/common/first-referrer-cookie.test.ts
+++ b/packages/common/first-referrer-cookie.test.ts
@@ -111,6 +111,20 @@ describe('first-referrer-cookie', () => {
expect(parseFirstReferrerCookie(`${FIRST_REFERRER_COOKIE_NAME}=${encoded}`)).toBeNull()
})
+ it('parses double-encoded cookies (legacy format before serializer fix)', () => {
+ const input = buildFirstReferrerData({
+ referrer: 'https://www.google.com/',
+ landingUrl: 'https://supabase.com/pricing?utm_source=google',
+ })
+
+ // Simulate the old double-encoding: encodeURIComponent(JSON.stringify(data))
+ // followed by Next.js cookies.set() encoding it again.
+ const doubleEncoded = encodeURIComponent(encodeURIComponent(JSON.stringify(input)))
+ const parsed = parseFirstReferrerCookie(`${FIRST_REFERRER_COOKIE_NAME}=${doubleEncoded}`)
+
+ expect(parsed).toEqual(input)
+ })
+
it('drops non-string values in utms/click_ids', () => {
const encoded = encodeURIComponent(
JSON.stringify({
diff --git a/packages/common/first-referrer-cookie.ts b/packages/common/first-referrer-cookie.ts
index 2fef56d656b..5617d764e5f 100644
--- a/packages/common/first-referrer-cookie.ts
+++ b/packages/common/first-referrer-cookie.ts
@@ -174,7 +174,7 @@ export function buildFirstReferrerData({
// ---------------------------------------------------------------------------
export function serializeFirstReferrerCookie(data: FirstReferrerData): string {
- return encodeURIComponent(JSON.stringify(data))
+ return JSON.stringify(data)
}
// ---------------------------------------------------------------------------
@@ -319,7 +319,18 @@ export function parseFirstReferrerCookie(cookieHeader: string): FirstReferrerDat
if (!match) return null
const value = match.slice(`${FIRST_REFERRER_COOKIE_NAME}=`.length)
- const parsed = JSON.parse(decodeURIComponent(value)) as unknown
+ const decoded = decodeURIComponent(value)
+ // Handle double-encoded cookies from before the serializer fix.
+ // Next.js cookies.set() encodes automatically, but serializeFirstReferrerCookie
+ // previously called encodeURIComponent too, producing double-encoded values.
+ let jsonString: string
+ try {
+ JSON.parse(decoded)
+ jsonString = decoded
+ } catch {
+ jsonString = decodeURIComponent(decoded)
+ }
+ const parsed = JSON.parse(jsonString) as unknown
if (!parsed || typeof parsed !== 'object') return null