Revert cookie name to storage key change (#677)

supabase · Nov 4, 2023 · f7e5c2d · f7e5c2d
1 parent 7663860
commit f7e5c2d
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 41 deletions.
diff --git a/.changeset/breezy-lions-wink.md b/.changeset/breezy-lions-wink.md
@@ -0,0 +1,9 @@
+---
+'@supabase/auth-helpers-nextjs': patch
+'@supabase/auth-helpers-remix': patch
+'@supabase/auth-helpers-shared': patch
+'@supabase/ssr': patch
+'@supabase/auth-helpers-sveltekit': patch
+---
+
+Revert cookie name to storage key change
diff --git a/packages/nextjs/src/clientComponentClient.ts b/packages/nextjs/src/clientComponentClient.ts
@@ -38,9 +38,6 @@ export function createClientComponentClient<
 		);
 	}
 
-	const storageKey = cookieOptions?.name;
-	delete cookieOptions?.name;
-
 	const createNewClient = () =>
 		createSupabaseClient<Database, SchemaName, Schema>(supabaseUrl, supabaseKey, {
 			...options,
@@ -52,7 +49,6 @@ export function createClientComponentClient<
 				}
 			},
 			auth: {
-				storageKey,
 				storage: new BrowserCookieAuthStorageAdapter(cookieOptions)
 			}
 		});

diff --git a/packages/nextjs/src/middlewareClient.ts b/packages/nextjs/src/middlewareClient.ts
@@ -88,9 +88,6 @@ export function createMiddlewareClient<
 		);
 	}
 
-	const storageKey = cookieOptions?.name;
-	delete cookieOptions?.name;
-
 	return createSupabaseClient<Database, SchemaName, Schema>(supabaseUrl, supabaseKey, {
 		...options,
 		global: {
@@ -101,7 +98,6 @@ export function createMiddlewareClient<
 			}
 		},
 		auth: {
-			storageKey,
 			storage: new NextMiddlewareAuthStorageAdapter(context, cookieOptions)
 		}
 	});

diff --git a/packages/nextjs/src/pagesServerClient.ts b/packages/nextjs/src/pagesServerClient.ts
@@ -87,9 +87,6 @@ export function createPagesServerClient<
 		);
 	}
 
-	const storageKey = cookieOptions?.name;
-	delete cookieOptions?.name;
-
 	return createSupabaseClient<Database, SchemaName, Schema>(supabaseUrl, supabaseKey, {
 		...options,
 		global: {
@@ -100,7 +97,6 @@ export function createPagesServerClient<
 			}
 		},
 		auth: {
-			storageKey,
 			storage: new NextServerAuthStorageAdapter(context, cookieOptions)
 		}
 	});

diff --git a/packages/nextjs/src/routeHandlerClient.ts b/packages/nextjs/src/routeHandlerClient.ts
@@ -67,9 +67,6 @@ export function createRouteHandlerClient<
 		);
 	}
 
-	const storageKey = cookieOptions?.name;
-	delete cookieOptions?.name;
-
 	return createSupabaseClient<Database, SchemaName, Schema>(supabaseUrl, supabaseKey, {
 		...options,
 		global: {
@@ -80,7 +77,6 @@ export function createRouteHandlerClient<
 			}
 		},
 		auth: {
-			storageKey,
 			storage: new NextRouteHandlerAuthStorageAdapter(context, cookieOptions)
 		}
 	});

diff --git a/packages/nextjs/src/serverComponentClient.ts b/packages/nextjs/src/serverComponentClient.ts
@@ -64,9 +64,6 @@ export function createServerComponentClient<
 		);
 	}
 
-	const storageKey = cookieOptions?.name;
-	delete cookieOptions?.name;
-
 	return createSupabaseClient<Database, SchemaName, Schema>(supabaseUrl, supabaseKey, {
 		...options,
 		global: {
@@ -77,7 +74,6 @@ export function createServerComponentClient<
 			}
 		},
 		auth: {
-			storageKey,
 			storage: new NextServerComponentAuthStorageAdapter(context, cookieOptions)
 		}
 	});

diff --git a/packages/remix/src/createSupabaseClient.ts b/packages/remix/src/createSupabaseClient.ts
@@ -197,9 +197,6 @@ export function createServerClient<
 		);
 	}
 
-	const storageKey = cookieOptions?.name;
-	delete cookieOptions?.name;
-
 	return createSupabaseClient<Database, SchemaName, Schema>(supabaseUrl, supabaseKey, {
 		...options,
 		global: {
@@ -210,7 +207,6 @@ export function createServerClient<
 			}
 		},
 		auth: {
-			storageKey,
 			storage: new RemixServerAuthStorageAdapter(request, response, cookieOptions)
 		}
 	});

diff --git a/packages/ssr/src/createBrowserClient.ts b/packages/ssr/src/createBrowserClient.ts
@@ -44,13 +44,10 @@ export function createBrowserClient<
 	let cookies: CookieMethods = {};
 	let isSingleton = true;
 	let cookieOptions: CookieOptionsWithName | undefined;
-	let storageKey: string | undefined = undefined;
 	let userDefinedClientOptions;
 
 	if (options) {
 		({ cookies, isSingleton = true, cookieOptions, ...userDefinedClientOptions } = options);
-		storageKey = cookieOptions?.name;
-		delete cookieOptions?.name;
 	}
 
 	const cookieClientOptions = {
@@ -64,7 +61,6 @@ export function createBrowserClient<
 			autoRefreshToken: isBrowser(),
 			detectSessionInUrl: isBrowser(),
 			persistSession: true,
-			storageKey,
 			storage: {
 				getItem: async (key: string) => {
 					const chunkedCookie = await combineChunks(key, async (chunkName) => {

diff --git a/packages/ssr/src/createServerClient.ts b/packages/ssr/src/createServerClient.ts
@@ -38,9 +38,6 @@ export function createServerClient<
 
 	const { cookies, cookieOptions, ...userDefinedClientOptions } = options;
 
-	const storageKey = cookieOptions?.name;
-	delete cookieOptions?.name;
-
 	const cookieClientOptions = {
 		global: {
 			headers: {
@@ -52,7 +49,6 @@ export function createServerClient<
 			autoRefreshToken: isBrowser(),
 			detectSessionInUrl: isBrowser(),
 			persistSession: true,
-			storageKey,
 			storage: {
 				getItem: async (key: string) => {
 					const chunkedCookie = await combineChunks(key, async (chunkName: string) => {

diff --git a/packages/sveltekit/src/supabaseLoadClient.ts b/packages/sveltekit/src/supabaseLoadClient.ts
@@ -82,10 +82,6 @@ export function createSupabaseLoadClient<
 	if (browser && cachedBrowserClient) {
 		return cachedBrowserClient as SupabaseClient<Database, SchemaName, Schema>;
 	}
-
-	const storageKey = cookieOptions?.name;
-	delete cookieOptions?.name;
-
 	const client = createSupabaseClient<Database, SchemaName, Schema>(supabaseUrl, supabaseKey, {
 		...options,
 		global: {
@@ -97,7 +93,6 @@ export function createSupabaseLoadClient<
 			}
 		},
 		auth: {
-			storageKey,
 			storage: new SvelteKitLoadAuthStorageAdapter(serverSession, cookieOptions)
 		}
 	});

diff --git a/packages/sveltekit/src/supabaseServerClient.ts b/packages/sveltekit/src/supabaseServerClient.ts
@@ -82,9 +82,6 @@ export function createSupabaseServerClient<
 	cookieOptions?: CookieOptionsWithName;
 	expiryMargin?: number;
 }): SupabaseClient<Database, SchemaName, Schema> {
-	const storageKey = cookieOptions?.name;
-	delete cookieOptions?.name;
-
 	const client = createSupabaseClient<Database, SchemaName, Schema>(supabaseUrl, supabaseKey, {
 		...options,
 		global: {
@@ -95,7 +92,6 @@ export function createSupabaseServerClient<
 			}
 		},
 		auth: {
-			storageKey,
 			storage: new SvelteKitServerAuthStorageAdapter(event, cookieOptions, expiryMargin)
 		}
 	});