From ca69db2395928987a664bf28fc59422c337a58ba Mon Sep 17 00:00:00 2001 From: DanielS Date: Tue, 23 Jun 2026 02:37:48 +0200 Subject: [PATCH] fix: prioritize SUPABASE_URL and SUPABASE_ANON_KEY server-side environment variables --- shop/app/api/admin/send-test-email/route.ts | 2 +- shop/app/api/admin/smtp-settings/route.ts | 4 ++-- shop/lib/supabase/admin.ts | 2 +- shop/lib/supabase/client.ts | 4 ++-- shop/lib/supabase/proxy.ts | 4 ++-- shop/lib/supabase/server.ts | 4 ++-- shop/lib/utils.ts | 8 ++++---- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/shop/app/api/admin/send-test-email/route.ts b/shop/app/api/admin/send-test-email/route.ts index 5e19db1..96153d0 100644 --- a/shop/app/api/admin/send-test-email/route.ts +++ b/shop/app/api/admin/send-test-email/route.ts @@ -6,7 +6,7 @@ import { cookies } from 'next/headers'; export async function POST(request: Request) { const cookieStore = await cookies(); - const supabaseUrl = process.env.NEXT_PUBLIC_SUPABASE_URL || process.env.SUPABASE_URL || ''; + const supabaseUrl = process.env.SUPABASE_URL || process.env.NEXT_PUBLIC_SUPABASE_URL || ''; const supabase = createServerClient( supabaseUrl, process.env.SUPABASE_SERVICE_ROLE_KEY ?? '', diff --git a/shop/app/api/admin/smtp-settings/route.ts b/shop/app/api/admin/smtp-settings/route.ts index 6e331ad..55063cb 100644 --- a/shop/app/api/admin/smtp-settings/route.ts +++ b/shop/app/api/admin/smtp-settings/route.ts @@ -5,7 +5,7 @@ import { cookies } from 'next/headers'; export async function GET() { const cookieStore = await cookies(); - const supabaseUrl = process.env.NEXT_PUBLIC_SUPABASE_URL || process.env.SUPABASE_URL || ''; + const supabaseUrl = process.env.SUPABASE_URL || process.env.NEXT_PUBLIC_SUPABASE_URL || ''; const supabase = createServerClient( supabaseUrl, process.env.SUPABASE_SERVICE_ROLE_KEY ?? '', @@ -46,7 +46,7 @@ export async function GET() { export async function POST(request: Request) { const cookieStore = await cookies(); - const supabaseUrl = process.env.NEXT_PUBLIC_SUPABASE_URL || process.env.SUPABASE_URL || ''; + const supabaseUrl = process.env.SUPABASE_URL || process.env.NEXT_PUBLIC_SUPABASE_URL || ''; const supabase = createServerClient( supabaseUrl, process.env.SUPABASE_SERVICE_ROLE_KEY ?? '', diff --git a/shop/lib/supabase/admin.ts b/shop/lib/supabase/admin.ts index 0d212d9..b6915f2 100644 --- a/shop/lib/supabase/admin.ts +++ b/shop/lib/supabase/admin.ts @@ -2,7 +2,7 @@ import { createClient } from '@supabase/supabase-js' export function createAdminClient() { const serviceRoleKey = process.env.SUPABASE_SERVICE_ROLE_KEY || 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6InNlcnZpY2Vfcm9sZSIsImV4cCI6MTk4MzgxMjk5Nn0.EGIM96RAZx35lJzdJsyH-qQwv8Hdp7fsn3W0YpN81IU' - const supabaseUrl = process.env.NEXT_PUBLIC_SUPABASE_URL || process.env.SUPABASE_URL; + const supabaseUrl = process.env.SUPABASE_URL || process.env.NEXT_PUBLIC_SUPABASE_URL; return createClient( supabaseUrl!, diff --git a/shop/lib/supabase/client.ts b/shop/lib/supabase/client.ts index 112957f..845d293 100644 --- a/shop/lib/supabase/client.ts +++ b/shop/lib/supabase/client.ts @@ -1,8 +1,8 @@ import { createBrowserClient } from "@supabase/ssr"; export function createClient() { - const supabaseUrl = process.env.NEXT_PUBLIC_SUPABASE_URL || process.env.SUPABASE_URL; - const supabaseAnonKey = process.env.NEXT_PUBLIC_SUPABASE_PUBLISHABLE_KEY || process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY || process.env.SUPABASE_ANON_KEY; + const supabaseUrl = process.env.SUPABASE_URL || process.env.NEXT_PUBLIC_SUPABASE_URL; + const supabaseAnonKey = process.env.SUPABASE_ANON_KEY || process.env.NEXT_PUBLIC_SUPABASE_PUBLISHABLE_KEY || process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY; return createBrowserClient( supabaseUrl!, diff --git a/shop/lib/supabase/proxy.ts b/shop/lib/supabase/proxy.ts index 6d25130..d77e8a8 100644 --- a/shop/lib/supabase/proxy.ts +++ b/shop/lib/supabase/proxy.ts @@ -13,8 +13,8 @@ export async function updateSession(request: NextRequest) { return supabaseResponse; } - const supabaseUrl = process.env.NEXT_PUBLIC_SUPABASE_URL || process.env.SUPABASE_URL; - const supabaseAnonKey = process.env.NEXT_PUBLIC_SUPABASE_PUBLISHABLE_KEY || process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY || process.env.SUPABASE_ANON_KEY; + const supabaseUrl = process.env.SUPABASE_URL || process.env.NEXT_PUBLIC_SUPABASE_URL; + const supabaseAnonKey = process.env.SUPABASE_ANON_KEY || process.env.NEXT_PUBLIC_SUPABASE_PUBLISHABLE_KEY || process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY; const supabase = createServerClient( supabaseUrl!, diff --git a/shop/lib/supabase/server.ts b/shop/lib/supabase/server.ts index c5955f6..c6e9e4e 100644 --- a/shop/lib/supabase/server.ts +++ b/shop/lib/supabase/server.ts @@ -9,8 +9,8 @@ import { cookies } from "next/headers"; export async function createClient() { const cookieStore = await cookies(); - const supabaseUrl = process.env.NEXT_PUBLIC_SUPABASE_URL || process.env.SUPABASE_URL; - const supabaseAnonKey = process.env.NEXT_PUBLIC_SUPABASE_PUBLISHABLE_KEY || process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY || process.env.SUPABASE_ANON_KEY; + const supabaseUrl = process.env.SUPABASE_URL || process.env.NEXT_PUBLIC_SUPABASE_URL; + const supabaseAnonKey = process.env.SUPABASE_ANON_KEY || process.env.NEXT_PUBLIC_SUPABASE_PUBLISHABLE_KEY || process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY; return createServerClient( supabaseUrl!, diff --git a/shop/lib/utils.ts b/shop/lib/utils.ts index 63e3596..4fc207f 100644 --- a/shop/lib/utils.ts +++ b/shop/lib/utils.ts @@ -7,7 +7,7 @@ export function cn(...inputs: ClassValue[]) { // This check can be removed, it is just for tutorial purposes export const hasEnvVars = - (process.env.NEXT_PUBLIC_SUPABASE_URL || process.env.SUPABASE_URL) && - (process.env.NEXT_PUBLIC_SUPABASE_PUBLISHABLE_KEY || - process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY || - process.env.SUPABASE_ANON_KEY); + (process.env.SUPABASE_URL || process.env.NEXT_PUBLIC_SUPABASE_URL) && + (process.env.SUPABASE_ANON_KEY || + process.env.NEXT_PUBLIC_SUPABASE_PUBLISHABLE_KEY || + process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY);