From 59745afa007a267c21e3a5cfd44ff0325a771708 Mon Sep 17 00:00:00 2001 From: BrunoQuaresma Date: Mon, 18 Sep 2023 16:33:17 +0000 Subject: [PATCH 1/2] refactor(site): do not display error details as message --- site/src/api/errors.ts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/site/src/api/errors.ts b/site/src/api/errors.ts index f8d9421631ca1..ea8b1d0c4ccbc 100644 --- a/site/src/api/errors.ts +++ b/site/src/api/errors.ts @@ -61,12 +61,7 @@ export const mapApiErrorToFieldErrors = ( export const getErrorMessage = ( error: unknown, defaultMessage: string, -): string => - isApiError(error) - ? error.response.data.message - : error instanceof Error - ? error.message - : defaultMessage; +): string => (isApiError(error) ? error.response.data.message : defaultMessage); /** * From 45273dd3fa5fe4acf5627d9648e3a3db3468108b Mon Sep 17 00:00:00 2001 From: BrunoQuaresma Date: Tue, 19 Sep 2023 12:36:44 +0000 Subject: [PATCH 2/2] Improve login auth error --- site/src/pages/LoginPage/LoginPageView.stories.tsx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/site/src/pages/LoginPage/LoginPageView.stories.tsx b/site/src/pages/LoginPage/LoginPageView.stories.tsx index a28baadd9507a..a4420489c585f 100644 --- a/site/src/pages/LoginPage/LoginPageView.stories.tsx +++ b/site/src/pages/LoginPage/LoginPageView.stories.tsx @@ -1,5 +1,5 @@ import { action } from "@storybook/addon-actions"; -import { MockAuthMethods } from "testHelpers/entities"; +import { MockAuthMethods, mockApiError } from "testHelpers/entities"; import { LoginPageView } from "./LoginPageView"; import type { Meta, StoryObj } from "@storybook/react"; @@ -24,14 +24,15 @@ export const Example: Story = { }, }; -const err = new Error("Username or email are wrong."); - export const AuthError: Story = { args: { isLoading: false, onSignIn: action("onSignIn"), context: { - error: err, + error: mockApiError({ + message: "User or password is incorrect", + detail: "Please, try again", + }), data: { authMethods: MockAuthMethods, hasFirstUser: false,