From 9cba5755c3309ee7896cf3fae33829c5dca52b15 Mon Sep 17 00:00:00 2001
From: peintnermax <max@caos.ch>
Date: Tue, 10 Sep 2024 15:16:27 +0200
Subject: [PATCH] fix redirect from loginname

---
 apps/login/config.ts                   | 2 +-
 apps/login/src/lib/server/loginname.ts | 5 ++---
 apps/login/src/ui/UsernameForm.tsx     | 6 ++++++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/apps/login/config.ts b/apps/login/config.ts
index b5f8500f5b7..e8359f48046 100644
--- a/apps/login/config.ts
+++ b/apps/login/config.ts
@@ -12,7 +12,7 @@ if (fs.existsSync(customConfigPath)) {
       customConfig = module.default;
     })
     .catch((error) => {
-      console.warn("Error loading custom configuration:", error);
+      console.warn("Could not find custom configuration:", error);
     });
 } else {
   console.info("No custom configuration file found!");
diff --git a/apps/login/src/lib/server/loginname.ts b/apps/login/src/lib/server/loginname.ts
index 2ce4b64219d..cb478afcdea 100644
--- a/apps/login/src/lib/server/loginname.ts
+++ b/apps/login/src/lib/server/loginname.ts
@@ -62,7 +62,6 @@ export async function sendLoginname(command: SendLoginnameCommand) {
 
     if (identityProviders.length === 1) {
       const host = headers().get("host");
-      console.log("host", host);
       const identityProviderType = identityProviders[0].type;
 
       const provider = idpTypeToSlug(identityProviderType);
@@ -109,9 +108,9 @@ export async function sendLoginname(command: SendLoginnameCommand) {
       params.set("loginName", command.loginName);
     }
 
-    const registerUrl = new URL("/register?" + params);
+    const registerUrl = "/register?" + params;
 
-    return redirect(registerUrl.toString());
+    return redirect(registerUrl);
   }
 
   throw Error("Could not find user");
diff --git a/apps/login/src/ui/UsernameForm.tsx b/apps/login/src/ui/UsernameForm.tsx
index 7d95226d139..0f24fccf7cc 100644
--- a/apps/login/src/ui/UsernameForm.tsx
+++ b/apps/login/src/ui/UsernameForm.tsx
@@ -73,10 +73,16 @@ export default function UsernameForm({
   ) {
     const response = await submitLoginName(values, organization);
 
+    if (!response) {
+      setError("An internal error occurred");
+      return;
+    }
+
     if (response?.authMethodTypes && response.authMethodTypes.length === 0) {
       setError(
         "User has no available authentication methods. Contact your administrator to setup authentication for the requested user.",
       );
+      return;
     }
 
     if (response?.authMethodTypes.length == 1) {