From 41d8ab9bd9a14dfc86f517d3e2a30be066b0637e Mon Sep 17 00:00:00 2001
From: Max Peintner <peintnerm@gmail.com>
Date: Fri, 3 Jan 2025 11:33:14 +0100
Subject: [PATCH] change error messages

---
 acceptance/tests/loginname-screen.ts       | 2 +-
 apps/login/src/app/(login)/verify/page.tsx | 4 ++--
 apps/login/src/lib/server/idp.ts           | 2 +-
 apps/login/src/lib/server/loginname.ts     | 4 ++--
 apps/login/src/lib/server/passkeys.ts      | 2 +-
 apps/login/src/lib/server/password.ts      | 2 +-
 apps/login/src/lib/server/register.ts      | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/acceptance/tests/loginname-screen.ts b/acceptance/tests/loginname-screen.ts
index 0a7e247f9f..be41a28eda 100644
--- a/acceptance/tests/loginname-screen.ts
+++ b/acceptance/tests/loginname-screen.ts
@@ -8,5 +8,5 @@ export async function loginnameScreen(page: Page, username: string) {
 
 export async function loginnameScreenExpect(page: Page, username: string) {
   await expect(page.getByTestId(usernameTextInput)).toHaveValue(username);
-  await expect(page.getByTestId("error").locator("div")).toContainText("Could not find user");
+  await expect(page.getByTestId("error").locator("div")).toContainText("User not found in the system");
 }
diff --git a/apps/login/src/app/(login)/verify/page.tsx b/apps/login/src/app/(login)/verify/page.tsx
index b47d9eed50..128623963b 100644
--- a/apps/login/src/app/(login)/verify/page.tsx
+++ b/apps/login/src/app/(login)/verify/page.tsx
@@ -44,7 +44,7 @@ export default async function Page(props: { searchParams: Promise<any> }) {
         authRequestId,
       }).catch((error) => {
         console.error("Could not resend verification email", error);
-        throw Error("Could not request email");
+        throw Error("Failed to send verification email");
       });
     }
   } else if ("userId" in searchParams && userId) {
@@ -54,7 +54,7 @@ export default async function Page(props: { searchParams: Promise<any> }) {
         authRequestId,
       }).catch((error) => {
         console.error("Could not resend verification email", error);
-        throw Error("Could not request email");
+        throw Error("Failed to send verification email");
       });
     }
 
diff --git a/apps/login/src/lib/server/idp.ts b/apps/login/src/lib/server/idp.ts
index fb9cf66a4f..b48f796160 100644
--- a/apps/login/src/lib/server/idp.ts
+++ b/apps/login/src/lib/server/idp.ts
@@ -62,7 +62,7 @@ export async function createNewSessionFromIdpIntent(
   const userResponse = await getUserByID(command.userId);
 
   if (!userResponse || !userResponse.user) {
-    return { error: "Could not find user" };
+    return { error: "User not found in the system" };
   }
 
   const loginSettings = await getLoginSettings(
diff --git a/apps/login/src/lib/server/loginname.ts b/apps/login/src/lib/server/loginname.ts
index b380a10a0d..f33e3577d0 100644
--- a/apps/login/src/lib/server/loginname.ts
+++ b/apps/login/src/lib/server/loginname.ts
@@ -310,7 +310,7 @@ export async function sendLoginname(command: SendLoginnameCommand) {
     if (resp) {
       return resp;
     }
-    return { error: "Could not find user" };
+    return { error: "User not found in the system" };
   } else if (
     loginSettings?.allowRegister &&
     loginSettings?.allowUsernamePassword
@@ -371,5 +371,5 @@ export async function sendLoginname(command: SendLoginnameCommand) {
 
   // fallbackToPassword
 
-  return { error: "Could not find user" };
+  return { error: "User not found in the system" };
 }
diff --git a/apps/login/src/lib/server/passkeys.ts b/apps/login/src/lib/server/passkeys.ts
index ca27d310f3..c21076265c 100644
--- a/apps/login/src/lib/server/passkeys.ts
+++ b/apps/login/src/lib/server/passkeys.ts
@@ -167,7 +167,7 @@ export async function sendPasskey(command: SendPasskeyCommand) {
   const userResponse = await getUserByID(session?.factors?.user?.id);
 
   if (!userResponse.user) {
-    return { error: "Could not find user" };
+    return { error: "User not found in the system" };
   }
 
   const humanUser =
diff --git a/apps/login/src/lib/server/password.ts b/apps/login/src/lib/server/password.ts
index 463db18e2a..3b7a24a718 100644
--- a/apps/login/src/lib/server/password.ts
+++ b/apps/login/src/lib/server/password.ts
@@ -123,7 +123,7 @@ export async function sendPassword(command: UpdateSessionCommand) {
     const userResponse = await getUserByID(session?.factors?.user?.id);
 
     if (!userResponse.user) {
-      return { error: "Could not find user" };
+      return { error: "User not found in the system" };
     }
 
     user = userResponse.user;
diff --git a/apps/login/src/lib/server/register.ts b/apps/login/src/lib/server/register.ts
index 2902d9ac60..284689523a 100644
--- a/apps/login/src/lib/server/register.ts
+++ b/apps/login/src/lib/server/register.ts
@@ -79,7 +79,7 @@ export async function registerUser(command: RegisterUserCommand) {
     const userResponse = await getUserByID(session?.factors?.user?.id);
 
     if (!userResponse.user) {
-      return { error: "Could not find user" };
+      return { error: "User not found in the system" };
     }
 
     const humanUser =