[WIP] edit error handling for object with status and response

lib/api-client.js

@@ -6,22 +6,21 @@ var apiClient = new JSONAPIClient(config.host + '/api', {
   'Accept': 'application/vnd.api+json; version=1',
 }, {
   beforeEveryRequest: function() {
+    console.log('using local panoptes-client');
     var auth = require('./auth');
     return auth.checkBearerToken();
   },
 
-  handleError: function(response) {
+  handleError: function(error) {
     var errorMessage;
-    if (response instanceof Error) {
-      throw response;
-    } else if (typeof response.body === 'object') {
-      if (response.body.error) {
-        errorMessage = response.body.error;
-        if (response.body.error_description) {
-          errorMessage += ' ' + response.error_description;
+    if (typeof error.response.body === 'object') {
+      if (error.response.body.error) {
+        errorMessage = error.response.body.error;
+        if (error.response.body.error_description) {
+          errorMessage += ' ' + error.response.error_description;
         }
-      } else if (Array.isArray(response.body.errors)) {
-        errorMessage = response.body.errors.map(function(error) {
+      } else if (Array.isArray(error.response.body.errors)) {
+        errorMessage = error.response.body.errors.map(function(error) {
           if (typeof error.message === 'string') {
             return error.message;
           } else if (typeof error.message === 'object') {
@@ -33,19 +32,25 @@ var apiClient = new JSONAPIClient(config.host + '/api', {
       } else {
         errorMessage = 'Unknown error (bad response body)';
       }
-    } else if (response.text.indexOf('<!DOCTYPE') !== -1) {
+    } else if (error.response.text.indexOf('<!DOCTYPE') !== -1) {
       // Manually set a reasonable error when we get HTML back (currently 500s will do this).
       errorMessage = [
         'There was a problem on the server.',
-        response.req.url,
-        response.status,
-        response.statusText,
+        error.response.req.url,
+        error.response.status,
+        error.response.statusText,
       ].join(' ');
     } else {
       errorMessage = 'Unknown error (bad response)';
     }
 
-    throw new Error(errorMessage);
+    if (typeof error === 'undefined') {
+      error = new Error(errorMessage);
+    } else if (typeof error === 'object') {
+      error.message = errorMessage;
+    }
+
+    throw error;
   }
 });