feat: show better error messages

betagouv · May 23, 2024 · 250ac7c · 250ac7c
1 parent 8470ca6
commit 250ac7c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/packages/backend/src/services/userService.ts b/packages/backend/src/services/userService.ts
@@ -198,7 +198,7 @@ const assertEmailDoesNotAlreadyExist = async (email: string) => {
 };
 
 const assertEmailInWhitelist = async (email: string) => {
-  if (isDev) return;
+  // if (isDev) return;
   const whitelist = await db.whitelist.findFirst({ where: { email } });
 
   if (!whitelist) {

diff --git a/packages/frontend/src/api.ts b/packages/frontend/src/api.ts
@@ -25,3 +25,7 @@ export type RouterInputs<T extends keyof AllEndpoints> = AllEndpoints[T]["parame
 export type RouterOutputs<T extends keyof AllEndpoints> = AllEndpoints[T]["response"];
 
 type AllEndpoints = GetEndpoints & PostEndpoints;
+
+export const getErrorMessage = (error: any) => {
+  return error?.data?.error ?? "Une erreur est survenue, veuillez réessayer plus tard";
+};
diff --git a/packages/frontend/src/components/LoginForm.tsx b/packages/frontend/src/components/LoginForm.tsx
@@ -9,7 +9,7 @@ import { FullWidthButton } from "./FullWidthButton";
 import { InputGroup } from "./InputGroup";
 import { PasswordInput } from "./PasswordInput";
 import { useMutation } from "@tanstack/react-query";
-import { type RouterInputs, api } from "../api";
+import { type RouterInputs, api, getErrorMessage } from "../api";
 
 export const LoginForm = () => {
   const [authData, setAuthData] = useAuthContext();
@@ -32,7 +32,7 @@ export const LoginForm = () => {
           <Alert
             className={css({ mb: "1.5rem" })}
             severity="error"
-            title={<styled.span fontWeight="regular">{(mutationError as any).message}</styled.span>}
+            title={<styled.span fontWeight="regular">{getErrorMessage(mutationError)}</styled.span>}
           />
         ) : null}
         <InputGroup state={mutationError ? "error" : undefined}>

diff --git a/packages/frontend/src/components/SignupForm.tsx b/packages/frontend/src/components/SignupForm.tsx
@@ -8,7 +8,7 @@ import { InputGroup } from "./InputGroup";
 import Alert from "@codegouvfr/react-dsfr/Alert";
 import { useAuthContext } from "../contexts/AuthContext";
 import { useMutation, useQuery } from "@tanstack/react-query";
-import { type RouterInputs, api } from "../api";
+import { type RouterInputs, api, getErrorMessage } from "../api";
 import Select from "@codegouvfr/react-dsfr/Select";
 
 export const SignupForm = () => {
@@ -49,7 +49,7 @@ export const SignupForm = () => {
           <Alert
             className={css({ mb: "1.5rem" })}
             severity="error"
-            title={<styled.span fontWeight="regular">{(mutationError as any).message}</styled.span>}
+            title={<styled.span fontWeight="regular">{getErrorMessage(mutationError)}</styled.span>}
           />
         ) : null}
         <InputGroup state={mutationError ? "error" : undefined}>