feat: UI Shows suspended error logging into suspended account

coder · Emyrk · May 31, 2022 · May 27, 2022 · May 27, 2022 · May 27, 2022
commit d2bc5b82ea79baa0967c3c55c9e3b367c4019e62
diff --git a/coderd/users.go b/coderd/users.go
@@ -632,15 +632,16 @@ func (api *API) postLogin(rw http.ResponseWriter, r *http.Request) {
 		// This message is the same as above to remove ease in detecting whether
 		// users are registered or not. Attackers still could with a timing attack.
 		httpapi.Write(rw, http.StatusUnauthorized, httpapi.Response{
-			Message: "invalid email or password",
+			Message: "Incorrect email or password",
 		})
 		return
 	}
 
 	// If the user logged into a suspended account, reject the login request.
 	if user.Status != database.UserStatusActive {
+
 		httpapi.Write(rw, http.StatusUnauthorized, httpapi.Response{
-			Message: fmt.Sprintf("user is not active (status = %q), contact an admin to reactivate your account", user.Status),
+			Message: "You are suspended, contact an admin to reactivate your account",
 		})
 		return
 	}

diff --git a/site/src/components/SignInForm/SignInForm.tsx b/site/src/components/SignInForm/SignInForm.tsx
@@ -110,7 +110,7 @@ export const SignInForm: React.FC<SignInFormProps> = ({
           type="password"
           variant="outlined"
         />
-        {authErrorMessage && <FormHelperText error>{Language.authErrorMessage}</FormHelperText>}
+        {authErrorMessage && <FormHelperText error>{authErrorMessage}</FormHelperText>}
         {methodsErrorMessage && <FormHelperText error>{Language.methodsErrorMessage}</FormHelperText>}
         <div className={styles.submitBtn}>
           <LoadingButton loading={isLoading} fullWidth type="submit" variant="contained">

diff --git a/site/src/pages/LoginPage/LoginPage.tsx b/site/src/pages/LoginPage/LoginPage.tsx
@@ -6,6 +6,8 @@ import { Footer } from "../../components/Footer/Footer"
 import { SignInForm } from "../../components/SignInForm/SignInForm"
 import { retrieveRedirect } from "../../util/redirect"
 import { XServiceContext } from "../../xServices/StateContext"
+import { AxiosError } from "axios"
+import {isApiError} from "../../api/errors";
 
 export const useStyles = makeStyles((theme) => ({
   root: {
@@ -33,7 +35,11 @@ export const LoginPage: React.FC = () => {
   const [authState, authSend] = useActor(xServices.authXService)
   const isLoading = authState.hasTag("loading")
   const redirectTo = retrieveRedirect(location.search)
-  const authErrorMessage = authState.context.authError ? (authState.context.authError as Error).message : undefined
+  //{
+  //     "message": "user is not active (status = \"suspended\"), contact an admin to reactivate your account"
+  // }
+
+  const authErrorMessage = isApiError(authState.context.authError) ? authState.context.authError.response.data.message : undefined
   const getMethodsError = authState.context.getMethodsError
     ? (authState.context.getMethodsError as Error).message
     : undefined

diff --git a/site/src/xServices/auth/authXService.ts b/site/src/xServices/auth/authXService.ts
@@ -2,6 +2,7 @@ import { assign, createMachine } from "xstate"
 import * as API from "../../api/api"
 import * as TypesGen from "../../api/typesGenerated"
 import { displayError, displaySuccess } from "../../components/GlobalSnackbar/utils"
+import { AxiosError } from "axios"
 
 export const Language = {
   successProfileUpdate: "Updated settings.",
@@ -48,7 +49,7 @@ type Permissions = Record<keyof typeof permissionsToCheck, boolean>
 export interface AuthContext {
   getUserError?: Error | unknown
   getMethodsError?: Error | unknown
-  authError?: Error | unknown
+  authError?: Error | AxiosError | unknown
   updateProfileError?: Error | unknown
   me?: TypesGen.User
   methods?: TypesGen.AuthMethods