From b4efbc0dd9083af8f0d14d84ce27140734e09fa2 Mon Sep 17 00:00:00 2001 From: Elio Bischof Date: Fri, 21 Feb 2025 10:57:48 +0100 Subject: [PATCH 1/5] order --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d6790adb60..a824e47571 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "scripts": { "generate": "turbo run generate", "build": "turbo run build", - "build:docker": "rm -rf ./out ./docker && mkdir -p ./docker && turbo run build --filter=./packages/zitadel-client && turbo prune @zitadel/login --docker && cd ./docker && cp -r ../out/json/* . && pnpm install --frozen-lockfile && cp -r ../out/full/* . && turbo run build:standalone && cd ..", + "build:docker": "rm -rf ./out ./docker && turbo run build --filter=./packages/zitadel-client && turbo prune @zitadel/login --docker && mkdir -p ./docker && cd ./docker && cp -r ../out/json/* . && pnpm install --frozen-lockfile && cp -r ../out/full/* . && turbo run build:standalone && cd ..", "build:packages": "turbo run build --filter=./packages/*", "build:apps": "turbo run build --filter=./apps/*", "test": "turbo run test", From fa7f98d1c9978015df67c8b8055ded1cbadc0cc7 Mon Sep 17 00:00:00 2001 From: Elio Bischof Date: Fri, 21 Feb 2025 11:10:35 +0100 Subject: [PATCH 2/5] chore: fix docker build --- .dockerignore | 2 +- turbo.json | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.dockerignore b/.dockerignore index f9db036d2b..1f61abb41a 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,2 +1,2 @@ * -!docker \ No newline at end of file +!/docker 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": { From 1b1ecca6b2f81fe057d81b0d775c4ff28f1e7265 Mon Sep 17 00:00:00 2001 From: Elio Bischof Date: Fri, 21 Feb 2025 11:11:48 +0100 Subject: [PATCH 3/5] turbo --- turbo.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/turbo.json b/turbo.json index 279e45867b..61316b800e 100644 --- a/turbo.json +++ b/turbo.json @@ -12,7 +12,8 @@ "ZITADEL_API_URL", "ZITADEL_SERVICE_USER_ID", "ZITADEL_SERVICE_USER_TOKEN", - "NEXT_PUBLIC_BASE_PATH" + "NEXT_PUBLIC_BASE_PATH", + "ZITADEL_INSTANCE_HOST_HEADER" ], "tasks": { "generate": { From 31d15abe299bc6318bb7d51998740031da56edd2 Mon Sep 17 00:00:00 2001 From: Elio Bischof Date: Fri, 21 Feb 2025 11:14:01 +0100 Subject: [PATCH 4/5] slash --- .dockerignore | 2 +- apps/login/next-env-vars.d.ts | 8 -------- apps/login/src/lib/service.ts | 20 +------------------- 3 files changed, 2 insertions(+), 28 deletions(-) diff --git a/.dockerignore b/.dockerignore index 1f61abb41a..b328b97284 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,2 +1,2 @@ -* +/* !/docker 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( 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(service)(transport); From c613f18741ee06edccdbabdc5ae61d104360f64d Mon Sep 17 00:00:00 2001 From: Elio Bischof Date: Fri, 21 Feb 2025 11:16:53 +0100 Subject: [PATCH 5/5] move changes to other pr --- apps/login/next-env-vars.d.ts | 8 ++++++++ apps/login/src/lib/service.ts | 20 +++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/apps/login/next-env-vars.d.ts b/apps/login/next-env-vars.d.ts index b575dc91f4..112eea393f 100644 --- a/apps/login/next-env-vars.d.ts +++ b/apps/login/next-env-vars.d.ts @@ -14,6 +14,14 @@ 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 5ea9eec882..48a31c1ac6 100644 --- a/apps/login/src/lib/service.ts +++ b/apps/login/src/lib/service.ts @@ -42,8 +42,26 @@ export async function createServiceForHost( throw new Error("No token found"); } + const instanceHost = new URL(serviceUrl).host; const transport = createServerTransport(token, { - baseUrl: serviceUrl, + 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, }); return createClientFor(service)(transport);