This commit is contained in:
Max Peintner
2025-03-04 08:37:55 +01:00
parent 6be63a1885
commit 530ab4405a

View File

@@ -111,14 +111,19 @@ export function getServiceUrlFromHeaders(headers: ReadonlyHeaders): {
} }
export function constructUrl(request: NextRequest, path: string) { export function constructUrl(request: NextRequest, path: string) {
const forwardedProto =
request.headers.get("x-forwarded-proto") ?? request.nextUrl.protocol;
const forwardedHost = const forwardedHost =
request.headers.get("x-zitadel-forward-host") ?? request.headers.get("x-zitadel-forward-host") ??
request.headers.get("host"); request.headers.get("host");
const basePath = process.env.NEXT_PUBLIC_BASE_PATH || ""; const basePath = process.env.NEXT_PUBLIC_BASE_PATH || "";
return new URL( return new URL(
`${basePath}${path}`, `${basePath}${path}`,
// keep this check to allow localhost for local development
forwardedHost?.startsWith("http") forwardedHost?.startsWith("http")
? forwardedHost ? forwardedHost
: `https://${forwardedHost}`, : `${forwardedProto}//${forwardedHost}`,
); );
} }