Merge pull request #32 from myDevicesIoT/fix/forward-error-message

Eric PTAK · web-flow · commit 240a8669ac42 · 2021-03-18T19:25:53.000+01:00
fix: forward service error message
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -4,6 +4,8 @@
     "prettier"
   ],
 
+  "parser": "babel-eslint",
+
   "parserOptions": {
     "ecmaVersion": 2018,
     "sourceType": "module"
diff --git a/lib/Request.js b/lib/Request.js
@@ -233,8 +233,9 @@ class Request {
     if (error instanceof CoreError) {
       return error;
     }
+    const message = error.response?.body?.message || error.message || error;
 
-    error = new CoreError(error, { statusCode: error.status });
+    error = new CoreError(message, { statusCode: error.status });
     return error;
   }
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -19,13 +19,14 @@
     "superagent": "^4.1.0"
   },
   "devDependencies": {
+    "babel-eslint": "^10.1.0",
     "code": "^5.2.4",
     "dotenv": "^6.2.0",
     "eslint": "^6.8.0",
     "eslint-config-prettier": "^6.10.1",
-    "eslint-plugin-prettier": "^3.1.2",
     "eslint-plugin-import": "^2.16.0",
     "eslint-plugin-mocha": "^5.2.1",
+    "eslint-plugin-prettier": "^3.1.2",
     "mocha": "^7.1.1",
     "nock": "^12.0.2",
     "prettier": "^1.16.4",

Original file line number	Diff line number	Diff line change
`@@ -233,8 +233,9 @@ class Request {`
`233`	`233`	`if (error instanceof CoreError) {`
`234`	`234`	`return error;`
`235`	`235`	`}`
	`236`	`+ const message = error.response?.body?.message \|\| error.message \|\| error;`
`236`	`237`
`237`		`- error = new CoreError(error, { statusCode: error.status });`
	`238`	`+ error = new CoreError(message, { statusCode: error.status });`
`238`	`239`	`return error;`
`239`	`240`	`}`
`240`	`241`