fix: undo recent tests

Author: Torwent

src/hooks.server.ts

@@ -1,7 +1,7 @@
 import { type Handle, redirect } from "@sveltejs/kit"
 import { createServerClient } from "@supabase/ssr"
 import { sequence } from "@sveltejs/kit/hooks"
-import { PUBLIC_SUPABASE_ANON_KEY, PUBLIC_LOCAL_SUPABASE_URL } from "$env/static/public"
+import { PUBLIC_SUPABASE_URL, PUBLIC_SUPABASE_ANON_KEY } from "$env/static/public"
 import type { Database } from "$lib/types/supabase"
 
 const redirects: Handle = async ({ event, resolve }) => {
@@ -21,27 +21,16 @@ const redirects: Handle = async ({ event, resolve }) => {
 }
 
 const supabase: Handle = async ({ event, resolve }) => {
-	event.locals.supabaseServer = createServerClient<Database>(
-		PUBLIC_LOCAL_SUPABASE_URL,
-		PUBLIC_SUPABASE_ANON_KEY,
-		{
-			cookies: {
-				getAll: () => event.cookies.getAll(),
-				setAll: (cookiesToSet) => {
-					cookiesToSet.forEach(({ name, value, options }) => {
-						event.cookies.set(name, value, { ...options, path: "/" })
-					})
-				}
-			},
-			global: {
-				fetch: (input: string | URL | Request, init?: RequestInit) => {
-					console.log("Server hook: ", input)
-
-					return event.fetch(input, init)
-				}
+	event.locals.supabaseServer = createServerClient<Database>(PUBLIC_SUPABASE_URL, PUBLIC_SUPABASE_ANON_KEY, {
+		cookies: {
+			getAll: () => event.cookies.getAll(),
+			setAll: (cookiesToSet) => {
+				cookiesToSet.forEach(({ name, value, options }) => {
+					event.cookies.set(name, value, { ...options, path: "/" })
+				})
 			}
 		}
-	)
+	})
 
 	event.locals.safeGetSession = async () => {
 		const start = performance.now()

src/lib/server/supabase.server.ts

@@ -1,11 +1,11 @@
 import { SUPABASE_SERVICE_KEY } from "$env/static/private"
-import { PUBLIC_LOCAL_SUPABASE_URL } from "$env/static/public"
+import { PUBLIC_SUPABASE_URL } from "$env/static/public"
 import type { Database } from "$lib/types/supabase"
 import { formatError } from "$lib/utils"
 import { type SupabaseClient, createClient, type Provider } from "@supabase/supabase-js"
 import { error, redirect } from "@sveltejs/kit"
 
-export const supabaseAdmin = createClient<Database>(PUBLIC_LOCAL_SUPABASE_URL, SUPABASE_SERVICE_KEY, {
+export const supabaseAdmin = createClient<Database>(PUBLIC_SUPABASE_URL, SUPABASE_SERVICE_KEY, {
 	auth: { autoRefreshToken: true, persistSession: false }
 })
 

src/routes/+layout.ts

@@ -1,5 +1,5 @@
 import { createBrowserClient, createServerClient, isBrowser } from "@supabase/ssr"
-import { PUBLIC_SUPABASE_URL, PUBLIC_SUPABASE_ANON_KEY, PUBLIC_LOCAL_SUPABASE_URL } from "$env/static/public"
+import { PUBLIC_SUPABASE_URL, PUBLIC_SUPABASE_ANON_KEY } from "$env/static/public"
 import type { Session, User } from "@supabase/supabase-js"
 
 export const load = async ({ data, depends, fetch }) => {
@@ -8,20 +8,10 @@ export const load = async ({ data, depends, fetch }) => {
 
 	const supabaseClient = isbrowser
 		? createBrowserClient(PUBLIC_SUPABASE_URL, PUBLIC_SUPABASE_ANON_KEY, {
-				global: {
-					fetch: (input: string | URL | Request, init?: RequestInit) => {
-						console.log("Layout Client: ", input)
-						return fetch(input, init)
-					}
-				}
+				global: { fetch }
 			})
-		: createServerClient(PUBLIC_LOCAL_SUPABASE_URL, PUBLIC_SUPABASE_ANON_KEY, {
-				global: {
-					fetch: (input: string | URL | Request, init?: RequestInit) => {
-						console.log("Layout Server: ", input)
-						return fetch(input, init)
-					}
-				},
+		: createServerClient(PUBLIC_SUPABASE_URL, PUBLIC_SUPABASE_ANON_KEY, {
+				global: { fetch },
 				cookies: {
 					getAll() {
 						return data.cookies