improve error messages

OlivierZal · Nov 13, 2023 · 4a36abc · 4a36abc
1 parent 8efb1b4
commit 4a36abc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/app.ts b/app.ts
@@ -1,6 +1,6 @@
 import { App } from 'homey' // eslint-disable-line import/no-extraneous-dependencies
 import axios from 'axios'
-import withAPI from './mixins/withAPI'
+import withAPI, { getErrorMessage } from './mixins/withAPI'
 import type {
   LoginCredentials,
   LoginData,
@@ -50,7 +50,13 @@ export = class AristonApp extends withAPI(App) {
       this.refreshLogin(loginCredentials)
       return true
     } catch (error: unknown) {
-      throw new Error(error instanceof Error ? error.message : String(error))
+      let errorMessage = String(error)
+      if (axios.isAxiosError(error)) {
+        errorMessage = getErrorMessage(error)
+      } else if (error instanceof Error) {
+        errorMessage = error.message
+      }
+      throw new Error(errorMessage)
     }
   }
 

diff --git a/mixins/withAPI.ts b/mixins/withAPI.ts
@@ -14,7 +14,7 @@ type APIClass = new (...args: any[]) => {
   api: AxiosInstance
 }
 
-function getErrorMessage(error: AxiosError): string {
+export function getErrorMessage(error: AxiosError): string {
   return error.message
 }