<testing> client cookie changes

diggerhq · Jul 19, 2024 · 8a94aeb · 8a94aeb
1 parent c3d294f
commit 8a94aeb
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 9 deletions.
diff --git a/src/supabase-clients/user/createSupabaseUserRouteHandlerClient.ts b/src/supabase-clients/user/createSupabaseUserRouteHandlerClient.ts
@@ -1,6 +1,23 @@
 import { Database } from '@/lib/database.types';
 import { createRouteHandlerClient } from '@supabase/auth-helpers-nextjs';
 import { cookies } from 'next/headers';
+
+type createRouteHandlerClientParams = NonNullable<
+  Parameters<typeof createRouteHandlerClient>[1]
+>;
+type CookieOptions = createRouteHandlerClientParams['cookieOptions'];
+
+const isDevelopment = process.env.NODE_ENV === 'development';
+
+const optionalCookieOptions: CookieOptions = isDevelopment
+  ? undefined
+  : {
+      domain: '.digger.dev',
+      secure: false,
+      path: '/',
+      sameSite: 'lax',
+    };
+
 // Outstanding bug
 //https://github.com/vercel/next.js/issues/45371
 export const createSupabaseUserRouteHandlerClient = () =>
@@ -9,10 +26,6 @@ export const createSupabaseUserRouteHandlerClient = () =>
       cookies,
     },
     {
-      options: {
-        global: {
-          fetch,
-        },
-      },
+      cookieOptions: optionalCookieOptions,
     },
   );
diff --git a/src/supabase-clients/user/createSupabaseUserServerActionClient.ts b/src/supabase-clients/user/createSupabaseUserServerActionClient.ts
@@ -2,7 +2,28 @@ import { Database } from '@/lib/database.types';
 import { createServerActionClient } from '@supabase/auth-helpers-nextjs';
 import { cookies } from 'next/headers';
 
+type createServerActionClientParams = NonNullable<
+  Parameters<typeof createServerActionClient>[1]
+>;
+type CookieOptions = createServerActionClientParams['cookieOptions'];
+
+const isDevelopment = process.env.NODE_ENV === 'development';
+
+const optionalCookieOptions: CookieOptions = isDevelopment
+  ? undefined
+  : {
+      domain: '.digger.dev',
+      secure: false,
+      path: '/',
+      sameSite: 'lax',
+    };
+
 export const createSupabaseUserServerActionClient = () =>
-  createServerActionClient<Database>({
-    cookies,
-  });
+  createServerActionClient<Database>(
+    {
+      cookies,
+    },
+    {
+      cookieOptions: optionalCookieOptions,
+    },
+  );
diff --git a/src/supabase-clients/user/createSupabaseUserServerComponentClient.ts b/src/supabase-clients/user/createSupabaseUserServerComponentClient.ts
@@ -2,6 +2,22 @@ import { Database } from '@/lib/database.types';
 import { createServerComponentClient } from '@supabase/auth-helpers-nextjs';
 import { cookies } from 'next/headers';
 
+const isDevelopment = process.env.NODE_ENV === 'development';
+
+type createServerComponentClientParams = NonNullable<
+  Parameters<typeof createServerComponentClient>[1]
+>;
+type CookieOptions = createServerComponentClientParams['cookieOptions'];
+
+const optionalCookieOptions: CookieOptions = isDevelopment
+  ? undefined
+  : {
+      domain: '.digger.dev',
+      secure: false,
+      path: '/',
+      sameSite: 'lax',
+    };
+
 export const createSupabaseUserServerComponentClient = () =>
   createServerComponentClient<Database>(
     {
@@ -13,5 +29,6 @@ export const createSupabaseUserServerComponentClient = () =>
           fetch,
         },
       },
+      cookieOptions: optionalCookieOptions,
     },
   );
diff --git a/src/supabase-clients/user/supabaseUserClientComponentClient.ts b/src/supabase-clients/user/supabaseUserClientComponentClient.ts
@@ -1,6 +1,22 @@
 // https://supabase.com/docs/guides/auth/auth-helpers/nextjs-server-components#creating-a-supabase-client
-import { createClientComponentClient } from '@supabase/auth-helpers-nextjs';
 import { Database } from '@/lib/database.types';
+import { createClientComponentClient } from '@supabase/auth-helpers-nextjs';
+
+const isDevelopment = process.env.NODE_ENV === 'development';
+
+type createClientComponentClientParams = NonNullable<
+  Parameters<typeof createClientComponentClient>[0]
+>;
+type CookieOptions = createClientComponentClientParams['cookieOptions'];
+
+const optionalCookieOptions: CookieOptions = isDevelopment
+  ? undefined
+  : {
+      domain: '.digger.dev',
+      secure: false,
+      path: '/',
+      sameSite: 'lax',
+    };
 
 // apologies for the name, but it's the best I could come up with as
 // the util exported from @supabase/auth-helpers-nextjs is called
@@ -12,4 +28,5 @@ export const supabaseUserClientComponentClient =
         fetch,
       },
     },
+    cookieOptions: optionalCookieOptions,
   });