From 028daff0648d7758984b04960f24e8bf20002ea4 Mon Sep 17 00:00:00 2001
From: linus345 <46067241+linus345@users.noreply.github.com>
Date: Wed, 8 Jul 2020 04:03:35 +0200
Subject: [PATCH] fix(login): improved login validation

Co-authored-by: Jack Meyer <jackcmeyer@gmail.com>
---
 src/__tests__/user/user-slice.test.ts         |  4 +--
 src/login/Login.tsx                           | 12 ++++++++-
 src/shared/locales/enUs/translations/index.ts |  2 ++
 .../locales/enUs/translations/user/index.ts   | 18 +++++++++++++
 src/user/user-slice.ts                        | 26 ++++++++++++++++---
 5 files changed, 55 insertions(+), 7 deletions(-)
 create mode 100644 src/shared/locales/enUs/translations/user/index.ts

diff --git a/src/__tests__/user/user-slice.test.ts b/src/__tests__/user/user-slice.test.ts
index 4c388ef92d..8515690f82 100644
--- a/src/__tests__/user/user-slice.test.ts
+++ b/src/__tests__/user/user-slice.test.ts
@@ -98,7 +98,7 @@ describe('user slice', () => {
     })
 
     it('should dispatch login error if login was not successful', async () => {
-      jest.spyOn(remoteDb, 'logIn').mockRejectedValue({ status: '401' })
+      jest.spyOn(remoteDb, 'logIn').mockRejectedValue({ status: 401 })
       jest.spyOn(remoteDb, 'getUser').mockResolvedValue({
         _id: 'userId',
         metadata: {
@@ -113,7 +113,7 @@ describe('user slice', () => {
       expect(remoteDb.getUser).not.toHaveBeenCalled()
       expect(store.getActions()[0]).toEqual({
         type: loginError.type,
-        payload: 'user.login.error',
+        payload: { message: 'user.login.error.message.incorrect' },
       })
     })
   })
diff --git a/src/login/Login.tsx b/src/login/Login.tsx
index a7cf37aacc..a6125f0548 100644
--- a/src/login/Login.tsx
+++ b/src/login/Login.tsx
@@ -6,12 +6,14 @@ import { Redirect } from 'react-router-dom'
 
 import TextInputWithLabelFormGroup from '../shared/components/input/TextInputWithLabelFormGroup'
 import { remoteDb } from '../shared/config/pouchdb'
+import useTranslator from '../shared/hooks/useTranslator'
 import logo from '../shared/static/images/logo-on-transparent.png'
 import { RootState } from '../shared/store'
 import { getCurrentSession, login } from '../user/user-slice'
 
 const Login = () => {
   const dispatch = useDispatch()
+  const { t } = useTranslator()
   const [username, setUsername] = useState('')
   const [password, setPassword] = useState('')
   const { loginError, user } = useSelector((root: RootState) => root.user)
@@ -61,13 +63,18 @@ const Login = () => {
         <img src={logo} alt="HospitalRun" style={{ width: '100%', textAlign: 'center' }} />
         <form>
           <Panel title="Please Sign In" color="primary">
-            {loginError && <Alert color="danger" message={loginError} title="Unable to login" />}
+            {loginError?.message && (
+              <Alert color="danger" message={t(loginError?.message)} title="Unable to login" />
+            )}
             <TextInputWithLabelFormGroup
               isEditable
               label="username"
               name="username"
               value={username}
               onChange={onUsernameChange}
+              isRequired
+              isInvalid={!!loginError?.username && !username}
+              feedback={t(loginError?.username)}
             />
             <TextInputWithLabelFormGroup
               isEditable
@@ -76,6 +83,9 @@ const Login = () => {
               name="password"
               value={password}
               onChange={onPasswordChange}
+              isRequired
+              isInvalid={!!loginError?.password && !password}
+              feedback={t(loginError?.password)}
             />
             <Button block onClick={onSignInClick}>
               Sign In
diff --git a/src/shared/locales/enUs/translations/index.ts b/src/shared/locales/enUs/translations/index.ts
index 14672d5643..ec5eee0dd3 100644
--- a/src/shared/locales/enUs/translations/index.ts
+++ b/src/shared/locales/enUs/translations/index.ts
@@ -10,6 +10,7 @@ import scheduling from './scheduling'
 import settings from './settings'
 import sex from './sex'
 import states from './states'
+import user from './user'
 
 export default {
   ...actions,
@@ -23,5 +24,6 @@ export default {
   ...labs,
   ...incidents,
   ...settings,
+  ...user,
   ...bloodType,
 }
diff --git a/src/shared/locales/enUs/translations/user/index.ts b/src/shared/locales/enUs/translations/user/index.ts
new file mode 100644
index 0000000000..0d3ea73660
--- /dev/null
+++ b/src/shared/locales/enUs/translations/user/index.ts
@@ -0,0 +1,18 @@
+export default {
+  user: {
+    login: {
+      error: {
+        message: {
+          required: 'Missing required fields.',
+          incorrect: 'Incorrect username or password.',
+        },
+        username: {
+          required: 'Username is required.',
+        },
+        password: {
+          required: 'Password is required.',
+        },
+      },
+    },
+  },
+}
diff --git a/src/user/user-slice.ts b/src/user/user-slice.ts
index ab924be092..c18fff557c 100644
--- a/src/user/user-slice.ts
+++ b/src/user/user-slice.ts
@@ -6,10 +6,16 @@ import Permissions from '../shared/model/Permissions'
 import User from '../shared/model/User'
 import { AppThunk } from '../shared/store'
 
+interface LoginError {
+  message?: string
+  username?: string
+  password?: string
+}
+
 interface UserState {
   permissions: (Permissions | null)[]
   user?: User
-  loginError?: string
+  loginError?: LoginError
 }
 
 const initialState: UserState = {
@@ -48,7 +54,7 @@ const userSlice = createSlice({
       state.user = payload.user
       state.permissions = initialState.permissions
     },
-    loginError(state, { payload }: PayloadAction<string>) {
+    loginError(state, { payload }: PayloadAction<LoginError>) {
       state.loginError = payload
     },
     logoutSuccess(state) {
@@ -89,8 +95,20 @@ export const login = (username: string, password: string): AppThunk => async (di
       }),
     )
   } catch (error) {
-    if (error.status === '401') {
-      dispatch(loginError('user.login.error'))
+    if (!username || !password) {
+      dispatch(
+        loginError({
+          message: 'user.login.error.message.required',
+          username: 'user.login.error.username.required',
+          password: 'user.login.error.password.required',
+        }),
+      )
+    } else if (error.status === 401) {
+      dispatch(
+        loginError({
+          message: 'user.login.error.message.incorrect',
+        }),
+      )
     }
   }
 }