From beffae47af0ae7add1cf570539be91618e096c3e Mon Sep 17 00:00:00 2001
From: Elio Bischof <elio@zitadel.com>
Date: Fri, 14 Feb 2025 07:25:40 +0100
Subject: [PATCH] Revert "enable static api url"

This reverts commit 20c170bbd5415a249b02e3ab2174be3203646407.
---
 apps/login/next-env-vars.d.ts | 10 +---------
 apps/login/src/lib/service.ts |  9 +--------
 turbo.json                    |  9 +++++++--
 3 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/apps/login/next-env-vars.d.ts b/apps/login/next-env-vars.d.ts
index 6ee63855bd..35fcb10919 100644
--- a/apps/login/next-env-vars.d.ts
+++ b/apps/login/next-env-vars.d.ts
@@ -10,18 +10,10 @@ declare namespace NodeJS {
     SYSTEM_USER_PRIVATE_KEY: string; // The fallback service user private key
 
     /**
-     * Self hosting: The Zitadel API url
+     * Self hosting: The instance url
      */
     ZITADEL_API_URL: string;
 
-    /**
-     * Takes effect only if ZITADEL_API_URL is not empty.
-     * This is only relevant if Zitadels runtime has the ZITADEL_INSTANCEHOSTHEADERS config changed.
-     * The default is x-zitadel-instance-host.
-     * Most users don't need to set this variable.
-     */
-    ZITADEL_INSTANCE_HOST_HEADER: string
-
     /**
      * Self hosting: The service user id
      */
diff --git a/apps/login/src/lib/service.ts b/apps/login/src/lib/service.ts
index 6e4fe24ae9..2df01e5829 100644
--- a/apps/login/src/lib/service.ts
+++ b/apps/login/src/lib/service.ts
@@ -49,15 +49,8 @@ export async function createServiceForHost<T extends ServiceClass>(
     throw new Error("No token found");
   }
 
-  const instanceHost = new URL(serviceUrl).host
   const transport = createServerTransport(token, {
-    baseUrl: process.env.ZITADEL_API_URL ?? serviceUrl,
-    interceptors: process.env.ZITADEL_API_URL && process.env.ZITADEL_API_URL != serviceUrl || process.env.ZITADEL_INSTANCE_HOST_HEADER ? [(next) => {
-      return (req) => {
-        req.header.set(process.env.ZITADEL_INSTANCE_HOST_HEADER ?? "x-zitadel-instance-host", instanceHost)
-        return next(req)
-      }
-    }] : undefined
+    baseUrl: serviceUrl,
   });
 
   return createClientFor<T>(service)(transport);
diff --git a/turbo.json b/turbo.json
index 61316b800e..c4664ae485 100644
--- a/turbo.json
+++ b/turbo.json
@@ -6,14 +6,19 @@
     "DEBUG",
     "VERCEL_URL",
     "EMAIL_VERIFICATION",
+    "EU1_AUDIENCE",
+    "EU1_SYSTEM_USER_ID",
+    "EU1_SYSTEM_USER_PRIVATE_KEY",
+    "US1_AUDIENCE",
+    "US1_SYSTEM_USER_ID",
+    "US1_SYSTEM_USER_PRIVATE_KEY",
     "AUDIENCE",
     "SYSTEM_USER_ID",
     "SYSTEM_USER_PRIVATE_KEY",
     "ZITADEL_API_URL",
     "ZITADEL_SERVICE_USER_ID",
     "ZITADEL_SERVICE_USER_TOKEN",
-    "NEXT_PUBLIC_BASE_PATH",
-    "ZITADEL_INSTANCE_HOST_HEADER"
+    "NEXT_PUBLIC_BASE_PATH"
   ],
   "tasks": {
     "generate": {