diff --git a/apps/login/src/ui/ChangePasswordForm.tsx b/apps/login/src/ui/ChangePasswordForm.tsx index 72d8929894d..56bb123ecfb 100644 --- a/apps/login/src/ui/ChangePasswordForm.tsx +++ b/apps/login/src/ui/ChangePasswordForm.tsx @@ -55,8 +55,8 @@ export default function ChangePasswordForm({ sessionId: sessionId, userId: userId, password: values.password, - }).catch((error: Error) => { - setError(error.message ?? "Could not change password"); + }).catch(() => { + setError("Could not change password"); }); setLoading(false); diff --git a/apps/login/src/ui/LoginPasskey.tsx b/apps/login/src/ui/LoginPasskey.tsx index 00dc283ae43..06d422fb469 100644 --- a/apps/login/src/ui/LoginPasskey.tsx +++ b/apps/login/src/ui/LoginPasskey.tsx @@ -90,8 +90,8 @@ export default function LoginPasskey({ }, }), authRequestId, - }).catch((error: Error) => { - setError(error.message); + }).catch(() => { + setError("Could not request passkey challenge"); }); setLoading(false); @@ -108,8 +108,8 @@ export default function LoginPasskey({ webAuthN: { credentialAssertionData: data }, } as Checks, authRequestId, - }).catch((error: Error) => { - setError(error.message); + }).catch(() => { + setError("Could not verify passkey"); }); setLoading(false); diff --git a/apps/login/src/ui/PasswordForm.tsx b/apps/login/src/ui/PasswordForm.tsx index 083fcc66fe4..9c76561f25b 100644 --- a/apps/login/src/ui/PasswordForm.tsx +++ b/apps/login/src/ui/PasswordForm.tsx @@ -57,9 +57,8 @@ export default function PasswordForm({ password: { password: values.password }, }), authRequestId, - }).catch((error: Error) => { - setError(error.message ?? "Could not verify password"); - setLoading(false); + }).catch(() => { + setError("Could not verify password"); }); if (response && "error" in response && response.error) { @@ -79,9 +78,7 @@ export default function PasswordForm({ const response = await resetPassword({ loginName, organization, - }).catch((error: Error) => { - console.error(error); - setLoading(false); + }).catch(() => { setError("Could not reset password"); }); diff --git a/apps/login/src/ui/RegisterPasskey.tsx b/apps/login/src/ui/RegisterPasskey.tsx index db96474c010..afa6c3651b4 100644 --- a/apps/login/src/ui/RegisterPasskey.tsx +++ b/apps/login/src/ui/RegisterPasskey.tsx @@ -47,9 +47,8 @@ export default function RegisterPasskey({ passkeyName, publicKeyCredential, sessionId, - }).catch((error: Error) => { - setError(error.message); - setLoading(false); + }).catch(() => { + setError("Could not verify Passkey"); }); setLoading(false); @@ -60,9 +59,8 @@ export default function RegisterPasskey({ setLoading(true); const resp = await registerPasskeyLink({ sessionId, - }).catch((error: Error) => { - setError(error.message ?? "Could not register passkey"); - setLoading(false); + }).catch(() => { + setError("Could not register passkey"); }); setLoading(false); diff --git a/apps/login/src/ui/RegisterU2F.tsx b/apps/login/src/ui/RegisterU2F.tsx index 2e7f295a080..1eaa314dfaa 100644 --- a/apps/login/src/ui/RegisterU2F.tsx +++ b/apps/login/src/ui/RegisterU2F.tsx @@ -44,9 +44,7 @@ export default function RegisterU2F({ passkeyName, publicKeyCredential, sessionId, - }).catch((error: Error) => { - console.error(error); - setLoading(false); + }).catch(() => { setError("An error on verifying passkey occurred"); }); @@ -64,18 +62,17 @@ export default function RegisterU2F({ setLoading(true); const response = await addU2F({ sessionId, - }).catch((error: Error) => { - console.error(error); - setLoading(false); + }).catch(() => { setError("An error on registering passkey"); }); + setLoading(false); + if (response && "error" in response && response?.error) { setError(response?.error); } if (!response || !("u2fId" in response)) { - setLoading(false); setError("An error on registering passkey"); return; } diff --git a/apps/login/src/ui/SetPasswordForm.tsx b/apps/login/src/ui/SetPasswordForm.tsx index 3091340ab3f..84dce18a312 100644 --- a/apps/login/src/ui/SetPasswordForm.tsx +++ b/apps/login/src/ui/SetPasswordForm.tsx @@ -65,8 +65,7 @@ export default function SetPasswordForm({ organization: organization, authRequestId: authRequestId, password: values.password, - }).catch((error: Error) => { - console.error(error); + }).catch(() => { setError("Could not register user"); }); diff --git a/apps/login/src/ui/SignInWithIDP.tsx b/apps/login/src/ui/SignInWithIDP.tsx index f324147a40a..c279ee36046 100644 --- a/apps/login/src/ui/SignInWithIDP.tsx +++ b/apps/login/src/ui/SignInWithIDP.tsx @@ -53,8 +53,8 @@ export function SignInWithIDP({ `${host}/idp/${provider}/success?` + new URLSearchParams(params), failureUrl: `${host}/idp/${provider}/failure?` + new URLSearchParams(params), - }).catch((error: Error) => { - setError(error.message ?? "Could not start IDP flow"); + }).catch(() => { + setError("Could not start IDP flow"); }); setLoading(false); diff --git a/apps/login/src/ui/UsernameForm.tsx b/apps/login/src/ui/UsernameForm.tsx index e08744acab2..852d05f06b1 100644 --- a/apps/login/src/ui/UsernameForm.tsx +++ b/apps/login/src/ui/UsernameForm.tsx @@ -50,17 +50,16 @@ export default function UsernameForm({ loginName: values.loginName, organization, authRequestId, - }).catch((error: Error) => { - console.error(error); + }).catch(() => { setError("An internal error occurred"); }); + setLoading(false); + if (res?.error) { setError(res.error); } - setLoading(false); - return res; } diff --git a/apps/login/src/ui/VerifyEmailForm.tsx b/apps/login/src/ui/VerifyEmailForm.tsx index ce2589661d9..7a55989e836 100644 --- a/apps/login/src/ui/VerifyEmailForm.tsx +++ b/apps/login/src/ui/VerifyEmailForm.tsx @@ -60,9 +60,8 @@ export default function VerifyEmailForm({ setLoading(true); const response = await resendVerifyEmail({ userId, - }).catch((error: Error) => { - setLoading(false); - setError(error.message); + }).catch(() => { + setError("Could not resend email"); }); setLoading(false); @@ -74,9 +73,8 @@ export default function VerifyEmailForm({ const verifyResponse = await verifyUserByEmail({ code: value.code, userId, - }).catch((error: Error) => { - setLoading(false); - setError(error.message ?? "Could not verify email"); + }).catch(() => { + setError("Could not verify email"); }); setLoading(false);