Daniel/webshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: resolve internal docker hostnames to client window location hostname in browser context
All checks were successful
Staging Build / build (push) Successful in 1m49s
Details

Browse Source
This commit is contained in:
DanielS
2026-06-23 02:42:50 +02:00
parent ca69db2395
commit c0c5240f8d
4 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
shop/lib/supabase/client.ts
View File

@@ -1,11 +1,12 @@
import { createBrowserClient } from "@supabase/ssr"; import { createBrowserClient } from "@supabase/ssr";
import { resolveSupabaseUrl } from "../utils";
export function createClient() { export function createClient() {
const supabaseUrl = process.env.SUPABASE_URL || process.env.NEXT_PUBLIC_SUPABASE_URL; 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 supabaseAnonKey = process.env.SUPABASE_ANON_KEY || process.env.NEXT_PUBLIC_SUPABASE_PUBLISHABLE_KEY || process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY;
return createBrowserClient( return createBrowserClient(
supabaseUrl!, resolveSupabaseUrl(supabaseUrl)!,
supabaseAnonKey!, supabaseAnonKey!,
); );
} }

4
shop/lib/supabase/proxy.ts
View File

@@ -1,6 +1,6 @@
import { createServerClient } from "@supabase/ssr"; import { createServerClient } from "@supabase/ssr";
import { NextResponse, type NextRequest } from "next/server"; import { NextResponse, type NextRequest } from "next/server";
import { hasEnvVars } from "../utils"; import { hasEnvVars, resolveSupabaseUrl } from "../utils";
export async function updateSession(request: NextRequest) { export async function updateSession(request: NextRequest) {
let supabaseResponse = NextResponse.next({ let supabaseResponse = NextResponse.next({
@@ -17,7 +17,7 @@ export async function updateSession(request: NextRequest) {
const supabaseAnonKey = process.env.SUPABASE_ANON_KEY || process.env.NEXT_PUBLIC_SUPABASE_PUBLISHABLE_KEY || process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY; const supabaseAnonKey = process.env.SUPABASE_ANON_KEY || process.env.NEXT_PUBLIC_SUPABASE_PUBLISHABLE_KEY || process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY;
const supabase = createServerClient( const supabase = createServerClient(
supabaseUrl!, resolveSupabaseUrl(supabaseUrl)!,
supabaseAnonKey!, supabaseAnonKey!,
{ {
cookies: { cookies: {

3
shop/lib/supabase/server.ts
View File

@@ -1,5 +1,6 @@
import { createServerClient } from "@supabase/ssr"; import { createServerClient } from "@supabase/ssr";
import { cookies } from "next/headers"; import { cookies } from "next/headers";
import { resolveSupabaseUrl } from "../utils";
/** /**
* Especially important if using Fluid compute: Don't put this client in a * Especially important if using Fluid compute: Don't put this client in a
@@ -13,7 +14,7 @@ export async function createClient() {
const supabaseAnonKey = process.env.SUPABASE_ANON_KEY || process.env.NEXT_PUBLIC_SUPABASE_PUBLISHABLE_KEY || process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY; const supabaseAnonKey = process.env.SUPABASE_ANON_KEY || process.env.NEXT_PUBLIC_SUPABASE_PUBLISHABLE_KEY || process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY;
return createServerClient( return createServerClient(
supabaseUrl!, resolveSupabaseUrl(supabaseUrl)!,
supabaseAnonKey!, supabaseAnonKey!,
{ {
cookies: { cookies: {

18
shop/lib/utils.ts
View File

@@ -11,3 +11,21 @@ export const hasEnvVars =
(process.env.SUPABASE_ANON_KEY || (process.env.SUPABASE_ANON_KEY ||
process.env.NEXT_PUBLIC_SUPABASE_PUBLISHABLE_KEY || process.env.NEXT_PUBLIC_SUPABASE_PUBLISHABLE_KEY ||
process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY); process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY);
export function resolveSupabaseUrl(url: string | undefined): string | undefined {
if (!url) return url;
if (typeof window !== 'undefined') {
try {
const parsed = new URL(url);
if (parsed.hostname === 'supabase-kong' || parsed.hostname === 'kong') {
parsed.hostname = window.location.hostname;
return parsed.toString().replace(/\/$/, '');
}
} catch {
return url
.replace('//supabase-kong', `//${window.location.hostname}`)
.replace('//kong', `//${window.location.hostname}`);
}
}
return url;
}