From 4844731ee0e8a5bf8f99be0a4f30c95ce32a02b8 Mon Sep 17 00:00:00 2001 From: Max Peintner Date: Tue, 24 Jun 2025 15:29:58 +0200 Subject: [PATCH 1/5] saml post --- apps/login/src/app/login/route.ts | 21 +++++++++++++++++---- apps/login/src/lib/zitadel.ts | 1 - 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/apps/login/src/app/login/route.ts b/apps/login/src/app/login/route.ts index 0e181b76f1..0cf7f44a9c 100644 --- a/apps/login/src/app/login/route.ts +++ b/apps/login/src/app/login/route.ts @@ -215,11 +215,24 @@ export async function GET(request: NextRequest) { new URLSearchParams(params), }, }).then((resp) => { - if ( - resp.nextStep.value && - typeof resp.nextStep.value === "string" - ) { + if (resp.nextStep.case === "authUrl" && resp.nextStep.value) { return NextResponse.redirect(resp.nextStep.value); + } else if ( + resp.nextStep.case === "postForm" && + resp.nextStep.value + ) { + const postCall = resp.nextStep.value; + + const redirectUrl = constructUrl(request, "/saml-post"); + + redirectUrl.searchParams.set("url", url); + redirectUrl.searchParams.set("RelayState", postCall.relayState); + redirectUrl.searchParams.set( + "SAMLResponse", + postCall.samlResponse, + ); + + return NextResponse.redirect(redirectUrl.toString()); } }); } diff --git a/apps/login/src/lib/zitadel.ts b/apps/login/src/lib/zitadel.ts index e148e7c0be..f23b7edecf 100644 --- a/apps/login/src/lib/zitadel.ts +++ b/apps/login/src/lib/zitadel.ts @@ -962,7 +962,6 @@ export async function startIdentityProviderFlow({ urls, }: { serviceUrl: string; - idpId: string; urls: RedirectURLsJson; }) { From f7e272ace2f2a68cdb0de967f994c147278ecfe3 Mon Sep 17 00:00:00 2001 From: Max Peintner Date: Tue, 1 Jul 2025 09:55:50 +0200 Subject: [PATCH 2/5] post form --- apps/login/src/app/login/route.ts | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/apps/login/src/app/login/route.ts b/apps/login/src/app/login/route.ts index 79258f1baa..baaf594e5d 100644 --- a/apps/login/src/app/login/route.ts +++ b/apps/login/src/app/login/route.ts @@ -25,6 +25,7 @@ import { import { CreateResponseRequestSchema } from "@zitadel/proto/zitadel/saml/v2/saml_service_pb"; import { Session } from "@zitadel/proto/zitadel/session/v2/session_pb"; import { IdentityProviderType } from "@zitadel/proto/zitadel/settings/v2/login_settings_pb"; +import { FormData } from "@zitadel/proto/zitadel/user/v2/idp_pb"; import { headers } from "next/headers"; import { NextRequest, NextResponse } from "next/server"; import { DEFAULT_CSP } from "../../../constants/csp"; @@ -232,19 +233,17 @@ export async function GET(request: NextRequest) { if (resp.nextStep.case === "authUrl" && resp.nextStep.value) { return NextResponse.redirect(resp.nextStep.value); } else if ( - resp.nextStep.case === "postForm" && + resp.nextStep.case === "formData" && resp.nextStep.value ) { - const postCall = resp.nextStep.value; + const formData: FormData = resp.nextStep.value; const redirectUrl = constructUrl(request, "/saml-post"); - redirectUrl.searchParams.set("url", url); - redirectUrl.searchParams.set("RelayState", postCall.relayState); - redirectUrl.searchParams.set( - "SAMLResponse", - postCall.samlResponse, - ); + redirectUrl.searchParams.set("url", formData.url); + Object.entries(formData.fields).forEach(([k, v]) => { + redirectUrl.searchParams.set(k, v); + }); return NextResponse.redirect(redirectUrl.toString()); } From 00e2bddc6008428635678e5ad5027b0922c002c8 Mon Sep 17 00:00:00 2001 From: Max Peintner Date: Tue, 1 Jul 2025 10:59:43 +0200 Subject: [PATCH 3/5] fix: cleanup start idp flow --- apps/login/src/app/login/route.ts | 32 ++++++++-------------- apps/login/src/lib/server/idp.ts | 16 +++++------ apps/login/src/lib/server/loginname.ts | 16 +++++++---- apps/login/src/lib/zitadel.ts | 38 ++++++++++++++++++++------ 4 files changed, 58 insertions(+), 44 deletions(-) diff --git a/apps/login/src/app/login/route.ts b/apps/login/src/app/login/route.ts index baaf594e5d..7a18c1fffa 100644 --- a/apps/login/src/app/login/route.ts +++ b/apps/login/src/app/login/route.ts @@ -25,7 +25,6 @@ import { import { CreateResponseRequestSchema } from "@zitadel/proto/zitadel/saml/v2/saml_service_pb"; import { Session } from "@zitadel/proto/zitadel/session/v2/session_pb"; import { IdentityProviderType } from "@zitadel/proto/zitadel/settings/v2/login_settings_pb"; -import { FormData } from "@zitadel/proto/zitadel/user/v2/idp_pb"; import { headers } from "next/headers"; import { NextRequest, NextResponse } from "next/server"; import { DEFAULT_CSP } from "../../../constants/csp"; @@ -218,7 +217,7 @@ export async function GET(request: NextRequest) { params.set("organization", organization); } - return startIdentityProviderFlow({ + const url = await startIdentityProviderFlow({ serviceUrl, idpId, urls: { @@ -229,25 +228,18 @@ export async function GET(request: NextRequest) { `${origin}/idp/${provider}/failure?` + new URLSearchParams(params), }, - }).then((resp) => { - if (resp.nextStep.case === "authUrl" && resp.nextStep.value) { - return NextResponse.redirect(resp.nextStep.value); - } else if ( - resp.nextStep.case === "formData" && - resp.nextStep.value - ) { - const formData: FormData = resp.nextStep.value; - - const redirectUrl = constructUrl(request, "/saml-post"); - - redirectUrl.searchParams.set("url", formData.url); - Object.entries(formData.fields).forEach(([k, v]) => { - redirectUrl.searchParams.set(k, v); - }); - - return NextResponse.redirect(redirectUrl.toString()); - } }); + + if (!url) { + return NextResponse.json( + { error: "Could not start IDP flow" }, + { status: 500 }, + ); + } + + const absoluteUrl = constructUrl(request, url); + + return NextResponse.redirect(absoluteUrl); } } } diff --git a/apps/login/src/lib/server/idp.ts b/apps/login/src/lib/server/idp.ts index 1925fe43d6..87f88a7c32 100644 --- a/apps/login/src/lib/server/idp.ts +++ b/apps/login/src/lib/server/idp.ts @@ -74,22 +74,20 @@ export type StartIDPFlowCommand = { async function startIDPFlow(command: StartIDPFlowCommand) { const basePath = process.env.NEXT_PUBLIC_BASE_PATH ?? ""; - return startIdentityProviderFlow({ + const url = await startIdentityProviderFlow({ serviceUrl: command.serviceUrl, idpId: command.idpId, urls: { successUrl: `${command.host.includes("localhost") ? "http://" : "https://"}${command.host}${basePath}${command.successUrl}`, failureUrl: `${command.host.includes("localhost") ? "http://" : "https://"}${command.host}${basePath}${command.failureUrl}`, }, - }).then((response) => { - if ( - response && - response.nextStep.case === "authUrl" && - response?.nextStep.value - ) { - return { redirect: response.nextStep.value }; - } }); + + if (!url) { + return { error: "Could not start IDP flow" }; + } + + return { redirect: url }; } type CreateNewSessionCommand = { diff --git a/apps/login/src/lib/server/loginname.ts b/apps/login/src/lib/server/loginname.ts index fa75929702..68cb345c06 100644 --- a/apps/login/src/lib/server/loginname.ts +++ b/apps/login/src/lib/server/loginname.ts @@ -102,7 +102,7 @@ export async function sendLoginname(command: SendLoginnameCommand) { const basePath = process.env.NEXT_PUBLIC_BASE_PATH ?? ""; - const resp = await startIdentityProviderFlow({ + const url = await startIdentityProviderFlow({ serviceUrl, idpId: identityProviders[0].id, urls: { @@ -115,9 +115,11 @@ export async function sendLoginname(command: SendLoginnameCommand) { }, }); - if (resp?.nextStep.case === "authUrl") { - return { redirect: resp.nextStep.value }; + if (!url) { + return { error: "Could not start IDP flow" }; } + + return { redirect: url }; } }; @@ -166,7 +168,7 @@ export async function sendLoginname(command: SendLoginnameCommand) { const basePath = process.env.NEXT_PUBLIC_BASE_PATH ?? ""; - const resp = await startIdentityProviderFlow({ + const url = await startIdentityProviderFlow({ serviceUrl, idpId: idp.id, urls: { @@ -179,9 +181,11 @@ export async function sendLoginname(command: SendLoginnameCommand) { }, }); - if (resp?.nextStep.case === "authUrl") { - return { redirect: resp.nextStep.value }; + if (!url) { + return { error: "Could not start IDP flow" }; } + + return { redirect: url }; } }; diff --git a/apps/login/src/lib/zitadel.ts b/apps/login/src/lib/zitadel.ts index c5f72266b9..d836b3aa01 100644 --- a/apps/login/src/lib/zitadel.ts +++ b/apps/login/src/lib/zitadel.ts @@ -23,7 +23,10 @@ import { import { LoginSettings } from "@zitadel/proto/zitadel/settings/v2/login_settings_pb"; import { SettingsService } from "@zitadel/proto/zitadel/settings/v2/settings_service_pb"; import { SendEmailVerificationCodeSchema } from "@zitadel/proto/zitadel/user/v2/email_pb"; -import type { RedirectURLsJson } from "@zitadel/proto/zitadel/user/v2/idp_pb"; +import type { + FormData, + RedirectURLsJson, +} from "@zitadel/proto/zitadel/user/v2/idp_pb"; import { NotificationType, SendPasswordResetLinkSchema, @@ -964,19 +967,36 @@ export async function startIdentityProviderFlow({ serviceUrl: string; idpId: string; urls: RedirectURLsJson; -}) { +}): Promise { const userService: Client = await createServiceForHost( UserService, serviceUrl, ); - return userService.startIdentityProviderIntent({ - idpId, - content: { - case: "urls", - value: urls, - }, - }); + return userService + .startIdentityProviderIntent({ + idpId, + content: { + case: "urls", + value: urls, + }, + }) + .then((resp) => { + if (resp.nextStep.case === "authUrl" && resp.nextStep.value) { + return resp.nextStep.value; + } else if (resp.nextStep.case === "formData" && resp.nextStep.value) { + const formData: FormData = resp.nextStep.value; + const redirectUrl = new URL("/saml-post"); + + redirectUrl.searchParams.set("url", formData.url); + Object.entries(formData.fields).forEach(([k, v]) => { + redirectUrl.searchParams.set(k, v); + }); + + return redirectUrl.toString(); + } + return null; + }); } export async function startLDAPIdentityProviderFlow({ From 8819be810b7e443c0406fc3e85389a9f51f88405 Mon Sep 17 00:00:00 2001 From: Max Peintner Date: Tue, 1 Jul 2025 11:01:06 +0200 Subject: [PATCH 4/5] cleanup --- apps/login/src/i18n/request.ts | 2 +- apps/login/src/lib/zitadel.ts | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/login/src/i18n/request.ts b/apps/login/src/i18n/request.ts index 271d370f7c..9e5e37e231 100644 --- a/apps/login/src/i18n/request.ts +++ b/apps/login/src/i18n/request.ts @@ -16,7 +16,7 @@ export default getRequestConfig(async () => { const { serviceUrl } = getServiceUrlFromHeaders(_headers); const i18nOrganization = _headers.get("x-zitadel-i18n-organization") || ""; // You may need to set this header in middleware - console.log("i18nOrganization:", i18nOrganization); + let translations: JsonObject | {} = {}; try { const i18nJSON = await getHostedLoginTranslation({ diff --git a/apps/login/src/lib/zitadel.ts b/apps/login/src/lib/zitadel.ts index d836b3aa01..c2ec8c0922 100644 --- a/apps/login/src/lib/zitadel.ts +++ b/apps/login/src/lib/zitadel.ts @@ -91,7 +91,6 @@ export async function getHostedLoginTranslation({ {}, ) .then((resp) => { - console.log(resp); return resp.translations ? resp.translations : undefined; }); From 71162c4a6b4c9642c5b1be1ed8b28334608c99cf Mon Sep 17 00:00:00 2001 From: Max Peintner Date: Tue, 1 Jul 2025 11:08:02 +0200 Subject: [PATCH 5/5] override relative url --- apps/login/src/app/login/route.ts | 9 ++++++--- apps/login/src/lib/zitadel.ts | 12 +++++++----- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/apps/login/src/app/login/route.ts b/apps/login/src/app/login/route.ts index 7a18c1fffa..db67efa229 100644 --- a/apps/login/src/app/login/route.ts +++ b/apps/login/src/app/login/route.ts @@ -217,7 +217,7 @@ export async function GET(request: NextRequest) { params.set("organization", organization); } - const url = await startIdentityProviderFlow({ + let url: string | null = await startIdentityProviderFlow({ serviceUrl, idpId, urls: { @@ -237,9 +237,12 @@ export async function GET(request: NextRequest) { ); } - const absoluteUrl = constructUrl(request, url); + if (url.startsWith("/")) { + // if the url is a relative path, construct the absolute url + url = constructUrl(request, url).toString(); + } - return NextResponse.redirect(absoluteUrl); + return NextResponse.redirect(url); } } } diff --git a/apps/login/src/lib/zitadel.ts b/apps/login/src/lib/zitadel.ts index c2ec8c0922..8a05701e97 100644 --- a/apps/login/src/lib/zitadel.ts +++ b/apps/login/src/lib/zitadel.ts @@ -985,16 +985,18 @@ export async function startIdentityProviderFlow({ return resp.nextStep.value; } else if (resp.nextStep.case === "formData" && resp.nextStep.value) { const formData: FormData = resp.nextStep.value; - const redirectUrl = new URL("/saml-post"); + const redirectUrl = "/saml-post"; + + const params = new URLSearchParams({ url: formData.url }); - redirectUrl.searchParams.set("url", formData.url); Object.entries(formData.fields).forEach(([k, v]) => { - redirectUrl.searchParams.set(k, v); + params.append(k, v); }); - return redirectUrl.toString(); + return `${redirectUrl}?${params.toString()}`; + } else { + return null; } - return null; }); }