simplifying defaults for storage adapter (#510)

supabase · Apr 13, 2023 · 66b13b9 · 66b13b9
1 parent d156863
commit 66b13b9
Show file tree

Hide file tree

Showing 15 changed files with 176 additions and 202 deletions.
diff --git a/.changeset/silly-beds-watch.md b/.changeset/silly-beds-watch.md
@@ -0,0 +1,8 @@
+---
+'@supabase/auth-helpers-nextjs': patch
+'@supabase/auth-helpers-remix': patch
+'@supabase/auth-helpers-shared': patch
+'@supabase/auth-helpers-sveltekit': patch
+---
+
+simplifying defaults for storage adapter
diff --git a/packages/nextjs/src/browserClient.ts b/packages/nextjs/src/browserClient.ts
@@ -1,10 +1,9 @@
 import {
   BrowserCookieAuthStorageAdapter,
-  CookieOptions,
-  DEFAULT_COOKIE_OPTIONS,
-  SupabaseClientOptionsWithoutAuth
+  CookieOptionsWithName,
+  SupabaseClientOptionsWithoutAuth,
+  createSupabaseClient
 } from '@supabase/auth-helpers-shared';
-import { createClient } from '@supabase/supabase-js';
 
 export function createBrowserSupabaseClient<
   Database = any,
@@ -20,15 +19,15 @@ export function createBrowserSupabaseClient<
   supabaseUrl?: string;
   supabaseKey?: string;
   options?: SupabaseClientOptionsWithoutAuth<SchemaName>;
-  cookieOptions?: CookieOptions;
+  cookieOptions?: CookieOptionsWithName;
 } = {}) {
   if (!supabaseUrl || !supabaseKey) {
     throw new Error(
       'either NEXT_PUBLIC_SUPABASE_URL and NEXT_PUBLIC_SUPABASE_ANON_KEY env variables or supabaseUrl and supabaseKey are required!'
     );
   }
 
-  return createClient<Database, SchemaName>(supabaseUrl, supabaseKey, {
+  return createSupabaseClient<Database, SchemaName>(supabaseUrl, supabaseKey, {
     ...options,
     global: {
       ...options?.global,
@@ -38,19 +37,8 @@ export function createBrowserSupabaseClient<
       }
     },
     auth: {
-      flowType: 'pkce',
-
-      // fix this in supabase-js
-      ...(cookieOptions?.name
-        ? {
-            storageKey: cookieOptions.name
-          }
-        : {}),
-
-      storage: new BrowserCookieAuthStorageAdapter({
-        ...DEFAULT_COOKIE_OPTIONS,
-        ...cookieOptions
-      })
+      storageKey: cookieOptions?.name,
+      storage: new BrowserCookieAuthStorageAdapter(cookieOptions)
     }
   });
 }
diff --git a/packages/nextjs/src/middlewareClient.ts b/packages/nextjs/src/middlewareClient.ts
@@ -1,20 +1,20 @@
 import {
   CookieAuthStorageAdapter,
   CookieOptions,
-  DEFAULT_COOKIE_OPTIONS,
+  CookieOptionsWithName,
+  createSupabaseClient,
   parseCookies,
   serializeCookie,
   SupabaseClientOptionsWithoutAuth
 } from '@supabase/auth-helpers-shared';
-import { createClient, SupabaseClientOptions } from '@supabase/supabase-js';
 import { NextRequest, NextResponse } from 'next/server';
 
 class NextMiddlewareAuthStorageAdapter extends CookieAuthStorageAdapter {
   constructor(
     private readonly context: { req: NextRequest; res: NextResponse },
-    private readonly cookieOptions?: CookieOptions
+    cookieOptions?: CookieOptions
   ) {
-    super();
+    super(cookieOptions);
   }
 
   protected getCookie(name: string): string | null | undefined {
@@ -59,7 +59,7 @@ export function createMiddlewareSupabaseClient<
     supabaseUrl?: string;
     supabaseKey?: string;
     options?: SupabaseClientOptionsWithoutAuth<SchemaName>;
-    cookieOptions?: CookieOptions;
+    cookieOptions?: CookieOptionsWithName;
   } = {}
 ) {
   if (!supabaseUrl || !supabaseKey) {
@@ -68,7 +68,7 @@ export function createMiddlewareSupabaseClient<
     );
   }
 
-  return createClient<Database, SchemaName>(supabaseUrl, supabaseKey, {
+  return createSupabaseClient<Database, SchemaName>(supabaseUrl, supabaseKey, {
     ...options,
     global: {
       ...options?.global,
@@ -78,21 +78,8 @@ export function createMiddlewareSupabaseClient<
       }
     },
     auth: {
-      flowType: 'pkce',
-      autoRefreshToken: false,
-      detectSessionInUrl: false,
-
-      // fix this in supabase-js
-      ...(cookieOptions?.name
-        ? {
-            storageKey: cookieOptions.name
-          }
-        : {}),
-
-      storage: new NextMiddlewareAuthStorageAdapter(context, {
-        ...DEFAULT_COOKIE_OPTIONS,
-        ...cookieOptions
-      })
+      storageKey: cookieOptions?.name,
+      storage: new NextMiddlewareAuthStorageAdapter(context, cookieOptions)
     }
   });
 }
diff --git a/packages/nextjs/src/serverClient.ts b/packages/nextjs/src/serverClient.ts
@@ -1,12 +1,12 @@
 import {
   CookieAuthStorageAdapter,
   CookieOptions,
-  DEFAULT_COOKIE_OPTIONS,
+  CookieOptionsWithName,
+  createSupabaseClient,
   parseCookies,
   serializeCookie,
   SupabaseClientOptionsWithoutAuth
 } from '@supabase/auth-helpers-shared';
-import { createClient } from '@supabase/supabase-js';
 import {
   GetServerSidePropsContext,
   NextApiRequest,
@@ -19,9 +19,9 @@ class NextServerAuthStorageAdapter extends CookieAuthStorageAdapter {
     private readonly context:
       | GetServerSidePropsContext
       | { req: NextApiRequest; res: NextApiResponse },
-    private readonly cookieOptions?: CookieOptions
+    cookieOptions?: CookieOptions
   ) {
-    super();
+    super(cookieOptions);
   }
 
   protected getCookie(name: string): string | null | undefined {
@@ -79,7 +79,7 @@ export function createServerSupabaseClient<
     supabaseUrl?: string;
     supabaseKey?: string;
     options?: SupabaseClientOptionsWithoutAuth<SchemaName>;
-    cookieOptions?: CookieOptions;
+    cookieOptions?: CookieOptionsWithName;
   } = {}
 ) {
   if (!supabaseUrl || !supabaseKey) {
@@ -88,7 +88,7 @@ export function createServerSupabaseClient<
     );
   }
 
-  return createClient<Database, SchemaName>(supabaseUrl, supabaseKey, {
+  return createSupabaseClient<Database, SchemaName>(supabaseUrl, supabaseKey, {
     ...options,
     global: {
       ...options?.global,
@@ -98,21 +98,8 @@ export function createServerSupabaseClient<
       }
     },
     auth: {
-      flowType: 'pkce',
-      autoRefreshToken: false,
-      detectSessionInUrl: false,
-
-      // fix this in supabase-js
-      ...(cookieOptions?.name
-        ? {
-            storageKey: cookieOptions.name
-          }
-        : {}),
-
-      storage: new NextServerAuthStorageAdapter(context, {
-        ...DEFAULT_COOKIE_OPTIONS,
-        ...cookieOptions
-      })
+      storageKey: cookieOptions?.name,
+      storage: new NextServerAuthStorageAdapter(context, cookieOptions)
     }
   });
 }
diff --git a/packages/nextjs/src/serverComponentClient.ts b/packages/nextjs/src/serverComponentClient.ts
@@ -1,19 +1,19 @@
 import {
   CookieAuthStorageAdapter,
   CookieOptions,
-  DEFAULT_COOKIE_OPTIONS,
-  SupabaseClientOptionsWithoutAuth
+  CookieOptionsWithName,
+  SupabaseClientOptionsWithoutAuth,
+  createSupabaseClient
 } from '@supabase/auth-helpers-shared';
-import { createClient } from '@supabase/supabase-js';
 
 class NextServerComponentAuthStorageAdapter extends CookieAuthStorageAdapter {
   constructor(
     private readonly context: {
       cookies: () => any; // TODO update this to be ReadonlyHeaders when we upgrade to Next.js 13
     },
-    private readonly cookieOptions?: CookieOptions
+    cookieOptions?: CookieOptions
   ) {
-    super();
+    super(cookieOptions);
   }
 
   protected getCookie(name: string): string | null | undefined {
@@ -53,7 +53,7 @@ export function createServerComponentSupabaseClient<
     supabaseUrl?: string;
     supabaseKey?: string;
     options?: SupabaseClientOptionsWithoutAuth<SchemaName>;
-    cookieOptions?: CookieOptions;
+    cookieOptions?: CookieOptionsWithName;
   } = {}
 ) {
   if (!supabaseUrl || !supabaseKey) {
@@ -62,7 +62,7 @@ export function createServerComponentSupabaseClient<
     );
   }
 
-  return createClient<Database, SchemaName>(supabaseUrl, supabaseKey, {
+  return createSupabaseClient<Database, SchemaName>(supabaseUrl, supabaseKey, {
     ...options,
     global: {
       ...options?.global,
@@ -72,21 +72,8 @@ export function createServerComponentSupabaseClient<
       }
     },
     auth: {
-      flowType: 'pkce',
-      autoRefreshToken: false,
-      detectSessionInUrl: false,
-
-      // fix this in supabase-js
-      ...(cookieOptions?.name
-        ? {
-            storageKey: cookieOptions.name
-          }
-        : {}),
-
-      storage: new NextServerComponentAuthStorageAdapter(context, {
-        ...DEFAULT_COOKIE_OPTIONS,
-        ...cookieOptions
-      })
+      storageKey: cookieOptions?.name,
+      storage: new NextServerComponentAuthStorageAdapter(context, cookieOptions)
     }
   });
 }
diff --git a/packages/nextjs/src/types.ts b/packages/nextjs/src/types.ts