From 530ab4405aa05ac3f80e087f5149a77174274b45 Mon Sep 17 00:00:00 2001
From: Max Peintner <peintnerm@gmail.com>
Date: Tue, 4 Mar 2025 08:37:55 +0100
Subject: [PATCH] proto

---
 apps/login/src/lib/service.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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