Merge origin/master

src/lib/supabase/middleware.ts

@@ -1,8 +1,19 @@
 import { createServerClient } from '@supabase/ssr';
 import { NextRequest, NextResponse } from 'next/server';
 
+<<<<<<< HEAD
 export function createClient(request: NextRequest, response: NextResponse) {
   return createServerClient(
+=======
+export async function createClient(request: NextRequest) {
+  let response = NextResponse.next({
+    request: {
+      headers: request.headers,
+    },
+  });
+
+  const supabase = createServerClient(
+>>>>>>> origin/master
     process.env.NEXT_PUBLIC_SUPABASE_URL!,
     process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY!,
     {
@@ -11,6 +22,7 @@ export function createClient(request: NextRequest, response: NextResponse) {
           return request.cookies.getAll();
         },
         setAll(cookiesToSet) {
+<<<<<<< HEAD
           try {
             cookiesToSet.forEach(({ name, value, options }) => {
               response.cookies.set(name, value, options);
@@ -18,8 +30,26 @@ export function createClient(request: NextRequest, response: NextResponse) {
           } catch {
             // Handle middleware context
           }
+=======
+          cookiesToSet.forEach(({ name, value, options }) =>
+            request.cookies.set(name, value)
+          );
+          response = NextResponse.next({
+            request: {
+              headers: request.headers,
+            },
+          });
+          cookiesToSet.forEach(({ name, value, options }) =>
+            response.cookies.set(name, value, options)
+          );
+>>>>>>> origin/master
         },
       },
     }
   );
+<<<<<<< HEAD
+=======
+
+  return { supabase, response };
+>>>>>>> origin/master
 }