From 9ddd7f1dc3914ad1f5ec073a7ccd0d38aa95c356 Mon Sep 17 00:00:00 2001
From: Elio Bischof <elio@zitadel.com>
Date: Fri, 21 Feb 2025 11:16:07 +0100
Subject: [PATCH] fix: remove interceptor

---
 apps/login/next-env-vars.d.ts |  8 --------
 apps/login/src/lib/service.ts | 20 +-------------------
 turbo.json                    |  3 +--
 3 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/apps/login/next-env-vars.d.ts b/apps/login/next-env-vars.d.ts
index 112eea393f..b575dc91f4 100644
--- a/apps/login/next-env-vars.d.ts
+++ b/apps/login/next-env-vars.d.ts
@@ -14,14 +14,6 @@ declare namespace NodeJS {
      */
     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 48a31c1ac6..5ea9eec882 100644
--- a/apps/login/src/lib/service.ts
+++ b/apps/login/src/lib/service.ts
@@ -42,26 +42,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..279e45867b 100644
--- a/turbo.json
+++ b/turbo.json
@@ -12,8 +12,7 @@
     "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": {