Fix: Error message when logging in is shown properly (#1582)

SignalK · Jul 18, 2023 · df9ceb2 · df9ceb2
1 parent 0b690ca
commit df9ceb2
Showing 1 changed file with 22 additions and 26 deletions.
diff --git a/packages/server-admin-ui/src/actions.js b/packages/server-admin-ui/src/actions.js
@@ -38,44 +38,40 @@ export function logout() {
   }
 }
 
-export function login(dispatch, username, password, rememberMe, callback) {
-  var payload = {
+export async function login(
+  dispatch,
+  username,
+  password,
+  rememberMe,
+  callback
+) {
+  const payload = {
     username: username,
     password: password,
     rememberMe: rememberMe,
   }
-  authFetch('/signalk/v1/auth/login', {
+  const request = await authFetch('/signalk/v1/auth/login', {
     method: 'POST',
     headers: {
       'Content-Type': 'application/json',
     },
     body: JSON.stringify(payload),
   })
-    .then((response) => {
-      if (response.status != 200) {
-        response.text().then((text) => {
-          dispatch({
-            type: 'LOGIN_FAILURE',
-            data: text,
-          })
-          callback(text)
-        })
-      } else {
-        return response.json()
-      }
-    })
-    .then((response) => {
-      if (response) {
-        fetchAllData(dispatch)
-        dispatch({
-          type: 'LOGIN_SUCCESS',
-        })
-        callback(null)
-      }
+
+  const response = await request.json()
+  if (request.status !== 200) {
+    dispatch({
+      type: 'LOGIN_FAILURE',
+      data: response.message,
     })
-    .catch(function (error) {
-      console.log(error)
+    callback(response.message)
+  } else if (response) {
+    fetchAllData(dispatch)
+    dispatch({
+      type: 'LOGIN_SUCCESS',
     })
+    callback(null)
+  }
 }
 
 export function enableSecurity(dispatch, userId, password, callback) {