From 69d83818049d2c64817c40705919babeb8142ef4 Mon Sep 17 00:00:00 2001
From: Max Peintner <max@caos.ch>
Date: Tue, 3 Dec 2024 10:49:33 +0100
Subject: [PATCH] cleanup

---
 apps/login/src/app/(login)/idp/page.tsx        | 5 -----
 apps/login/src/components/sign-in-with-idp.tsx | 9 ++-------
 apps/login/src/lib/server/idp.ts               | 7 +++++--
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/apps/login/src/app/(login)/idp/page.tsx b/apps/login/src/app/(login)/idp/page.tsx
index d11bd8c20a0..30d1c9fab5f 100644
--- a/apps/login/src/app/(login)/idp/page.tsx
+++ b/apps/login/src/app/(login)/idp/page.tsx
@@ -24,10 +24,6 @@ export default async function Page(props: {
 
   const identityProviders = await getIdentityProviders(organization);
 
-  const host = process.env.VERCEL_URL
-    ? `https://${process.env.VERCEL_URL}`
-    : "http://localhost:3000";
-
   const branding = await getBrandingSettings(organization);
 
   return (
@@ -38,7 +34,6 @@ export default async function Page(props: {
 
         {identityProviders && (
           <SignInWithIdp
-            host={host}
             identityProviders={identityProviders}
             authRequestId={authRequestId}
             organization={organization}
diff --git a/apps/login/src/components/sign-in-with-idp.tsx b/apps/login/src/components/sign-in-with-idp.tsx
index ca5690a5367..555b90feee3 100644
--- a/apps/login/src/components/sign-in-with-idp.tsx
+++ b/apps/login/src/components/sign-in-with-idp.tsx
@@ -6,7 +6,6 @@ import {
   IdentityProvider,
   IdentityProviderType,
 } from "@zitadel/proto/zitadel/settings/v2/login_settings_pb";
-import { headers } from "next/headers";
 import { useRouter } from "next/navigation";
 import { ReactNode, useState } from "react";
 import { Alert } from "./alert";
@@ -52,14 +51,10 @@ export function SignInWithIdp({
       params.set("organization", organization);
     }
 
-    const host = (await headers()).get("host");
-
     const response = await startIDPFlow({
       idpId,
-      successUrl:
-        `${host}/idp/${provider}/success?` + new URLSearchParams(params),
-      failureUrl:
-        `${host}/idp/${provider}/failure?` + new URLSearchParams(params),
+      successUrl: `/idp/${provider}/success?` + new URLSearchParams(params),
+      failureUrl: `/idp/${provider}/failure?` + new URLSearchParams(params),
     })
       .catch(() => {
         setError("Could not start IDP flow");
diff --git a/apps/login/src/lib/server/idp.ts b/apps/login/src/lib/server/idp.ts
index 0c5d26d45c5..2077e1697ff 100644
--- a/apps/login/src/lib/server/idp.ts
+++ b/apps/login/src/lib/server/idp.ts
@@ -1,6 +1,7 @@
 "use server";
 
 import { startIdentityProviderFlow } from "@/lib/zitadel";
+import { headers } from "next/headers";
 
 export type StartIDPFlowCommand = {
   idpId: string;
@@ -9,11 +10,13 @@ export type StartIDPFlowCommand = {
 };
 
 export async function startIDPFlow(command: StartIDPFlowCommand) {
+  const host = (await headers()).get("host");
+
   return startIdentityProviderFlow({
     idpId: command.idpId,
     urls: {
-      successUrl: command.successUrl,
-      failureUrl: command.failureUrl,
+      successUrl: `${host}${command.successUrl}`,
+      failureUrl: `${host}${command.failureUrl}`,
     },
   }).then((response) => {
     if (