Fixes #169 - corrected error handling

Author: rhodgkins

lib/client.js

@@ -60,17 +60,17 @@ export default class Client {
       return new Bluebird((resolve, reject) => {
         const resolver = (err, data) => {
           if (err) {
-            reject(new Error(JSON.stringify(err)));
+            reject(err);
           } else {
             resolve(data);
           }
         };
-        this.request(args, (_, r) => {
-          callbackHandler(resolver, r);
+        this.request(args, (err, r) => {
+          callbackHandler(resolver, err, r);
         });
       });
     } else {
-      this.request(args, (_, r) => this.callback(f, r));
+      this.request(args, (err, r) => this.callback(f, err, r));
     }
   }
   ping(f) {
@@ -138,19 +138,29 @@ export default class Client {
       callback
     ).auth(this.usernamePart, this.passwordPart);
   }
-  callback(f, data) {
+  callback(f, err, res) {
     if (!f) {
       return;
     }
     if (f.length >= 2) {
-      const hasErrors = data.error || (data.body && data.body.type === 'error.list');
-      if (hasErrors) {
-        f(data, null);
+      if (res && res.body && res.body.type === 'error.list') {
+        let message = null;
+        if (Array.isArray(res.body.errors) && res.body.errors[0] && 'message' in res.body.errors) {
+          // Try to use the first errors message
+          message = res.body.errors[0].message;
+        }
+        err = new Error(message || 'Response error');
+        err.statusCode = res.statusCode;
+        err.body = res.body;
+        err.headers = res.headers;
+      }
+      if (err) {
+        f(err, null);
       } else {
-        f(null, data);
+        f(null, res);
       }
     } else {
-      f(data);
+      f(res || null);
     }
   }
 }