From dcd73742f772b9f68f5ed13665f8fc89525adaf3 Mon Sep 17 00:00:00 2001
From: Max Peintner <peintnerm@gmail.com>
Date: Mon, 10 Feb 2025 17:34:16 +0100
Subject: [PATCH] api to 8080 of localhost

---
 apps/login/src/app/login/route.ts | 6 ++++--
 apps/login/src/lib/service.ts     | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/apps/login/src/app/login/route.ts b/apps/login/src/app/login/route.ts
index 57ea66cbf7..fb1486efb2 100644
--- a/apps/login/src/app/login/route.ts
+++ b/apps/login/src/app/login/route.ts
@@ -201,11 +201,13 @@ async function findValidSession(
 }
 
 function constructUrl(request: NextRequest, path: string) {
-  const forwardedHost = request.headers.get("host");
+  // TODO: remove localhost
+  const forwardedHost =
+    request.headers.get("x-zitadel-forward-host") ?? "http://localhost:8080";
   const basePath = process.env.NEXT_PUBLIC_BASE_PATH || "";
   return new URL(
     `${basePath}${path}`,
-    forwardedHost?.startsWith("https://")
+    forwardedHost?.startsWith("http")
       ? forwardedHost
       : `https://${forwardedHost}`,
   );
diff --git a/apps/login/src/lib/service.ts b/apps/login/src/lib/service.ts
index c834e01cb1..398d657409 100644
--- a/apps/login/src/lib/service.ts
+++ b/apps/login/src/lib/service.ts
@@ -81,12 +81,14 @@ export function getServiceUrlFromHeaders(headers: ReadonlyHeaders): {
   } else if (process.env.ZITADEL_API_URL) {
     instanceUrl = process.env.ZITADEL_API_URL;
   } else {
-    const host = headers.get("host");
+    // TODO: remove this fallback once the host header is always set
+    const host =
+      headers.get("x-zitadel-forward-host") ?? "http://localhost:8080";
 
     if (host) {
       const [hostname, port] = host.split(":");
       if (hostname !== "localhost") {
-        instanceUrl = host.startsWith("https://") ? host : `https://${host}`;
+        instanceUrl = host.startsWith("http") ? host : `https://${host}`;
       }
     }
   }