factorize error message

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

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/app.ts b/app.ts
@@ -65,7 +65,7 @@ export = class AristonApp extends withAPI(App) {
     try {
       await this.login(loginCredentials)
     } catch (error: unknown) {
-      this.error(error instanceof Error ? error.message : error)
+      // Logged by `withAPI`
     }
   }
 

diff --git a/mixins/withAPI.ts b/mixins/withAPI.ts
@@ -14,6 +14,10 @@ type APIClass = new (...args: any[]) => {
   api: AxiosInstance
 }
 
+function getErrorMessage(error: AxiosError): string {
+  return error.message
+}
+
 export default function withAPI<T extends HomeyClass>(base: T): APIClass & T {
   return class extends base {
     public api: AxiosInstance
@@ -62,12 +66,7 @@ export default function withAPI<T extends HomeyClass>(base: T): APIClass & T {
       type: 'request' | 'response',
       error: AxiosError,
     ): Promise<AxiosError> {
-      const { data } = error.response ?? {}
-      this.error(
-        `Error in ${type}:`,
-        error.config?.url,
-        data !== undefined && data !== '' ? data : error.message,
-      )
+      this.error(`Error in ${type}:`, error.config?.url, getErrorMessage(error))
       await this.setErrorWarning(error)
       return Promise.reject(error)
     }
@@ -76,7 +75,7 @@ export default function withAPI<T extends HomeyClass>(base: T): APIClass & T {
       if (!this.setWarning) {
         return
       }
-      await this.setWarning(error.message)
+      await this.setWarning(getErrorMessage(error))
     }
   }
 }