Merge pull request #69 from pixelhandler/add-code-to-custom-errors

pixelhandler · pixelhandler · commit d4235f7834fc · 2016-01-18T15:50:22.000-08:00
Add code property to custom errors
diff --git a/addon/mixins/fetch.js b/addon/mixins/fetch.js
@@ -70,8 +70,11 @@ export default Ember.Mixin.create({
     @param {Function} reject - Promise reject handler
   */
   fetchServerErrorHandler(response, reject) {
-    let msg = 'The Service responded with a '+ response.status +' error.';
-    reject(new ServerError(msg, response));
+    response.text().then(function(respText) {
+      let msg = parseFetchErrorMessage(response);
+      let json = parseFetchErrorText(respText, response);
+      reject(new ServerError(msg, json));
+    });
   },
 
   /**
@@ -82,14 +85,9 @@ export default Ember.Mixin.create({
     @param {Function} reject - Promise reject handler
   */
   fetchClientErrorHandler(response, reject) {
-    response.text().then(function(resp) {
-      let json, msg = 'The API responded with a '+ response.status +' error.';
-      try {
-        json = JSON.parse(resp);
-      } catch (e) {
-        Ember.Logger.error(e);
-        json = { "errors": [ { "status": response.status } ] };
-      }
+    response.text().then(function(respText) {
+      let msg = parseFetchErrorMessage(response);
+      let json = parseFetchErrorText(respText, response);
       reject(new ClientError(msg, json));
     });
   },
@@ -98,12 +96,22 @@ export default Ember.Mixin.create({
     Fetch generic error handler
 
     @method fetchErrorHandler
-    @param {Response} response - Fetch response
+    @param {Error|Response} error - Fetch error or response object
     @param {Function} reject - Promise reject handler
   */
   fetchErrorHandler(error, reject) {
-    let msg = (error && error.message) ? error.message : 'Unable to Fetch resource(s)';
-    reject(new FetchError(msg, error));
+    let msg = 'Unable to Fetch resource(s)';
+    if (error instanceof Error) {
+      msg = (error && error.message) ? error.message : msg;
+      reject(new FetchError(msg, error));
+    } else if (typeof error.text === 'function') {
+      error.text().then(function(respText) {
+        msg = parseFetchErrorMessage(error);
+        reject(new FetchError(msg, parseFetchErrorText(respText, error)));
+      });
+    } else {
+      reject(new FetchError(msg, error));
+    }
   },
 
   /**
@@ -219,7 +227,8 @@ export default Ember.Mixin.create({
   */
   ajaxServerErrorHandler(jqXHR, textStatus, errorThrown, reject) {
     let msg = 'The Service responded with ' + textStatus + ' ' + jqXHR.status;
-    reject(new ServerError(msg, jqXHR.responseJSON || jqXHR.responseText || errorThrown));
+    let json = parseXhrErrorResponse(jqXHR, errorThrown);
+    reject(new ServerError(msg, json));
   },
 
   /**
@@ -233,18 +242,7 @@ export default Ember.Mixin.create({
   */
   ajaxClientErrorHandler(jqXHR, textStatus, errorThrown, reject) {
     let msg = 'The API responded with a '+ jqXHR.status +' error.';
-    let json = jqXHR.responseJSON;
-    if (!json) {
-      json = {
-        "errors": [
-          {
-            "status": jqXHR.status,
-            "detail": jqXHR.responseText,
-            "message": errorThrown
-          }
-        ]
-      };
-    }
+    let json = parseXhrErrorResponse(jqXHR, errorThrown);
     reject(new ClientError(msg, json));
   },
 
@@ -259,12 +257,8 @@ export default Ember.Mixin.create({
   */
   ajaxErrorHandler(jqXHR, textStatus, errorThrown, reject) {
     let msg = (errorThrown) ? errorThrown : 'Unable to Fetch resource(s)';
-    reject(new FetchError(msg, {
-      code: jqXHR.status,
-      message: errorThrown,
-      'status': textStatus,
-      response: jqXHR.responseText
-    }));
+    let json = parseXhrErrorResponse(jqXHR, errorThrown);
+    reject(new FetchError(msg, json));
   },
 
   /**
@@ -326,3 +320,51 @@ export default Ember.Mixin.create({
   }
 
 });
+
+function parseFetchErrorMessage(response) {
+  return [
+    'The API responded with a ',
+    response.status,
+    (response.statusText) ? ' (' + response.statusText + ') ' : '',
+    ' error.'
+  ].join('');
+}
+
+function parseFetchErrorText(text, response) {
+  let json;
+  try {
+    json = JSON.parse(text);
+  } catch (err) {
+    Ember.Logger.warn(err);
+    json = {
+      "errors": [{
+        "status": response.status,
+        "detail": text
+      }]
+    };
+  }
+  json = json || {};
+  json.status = response.status;
+  return json;
+}
+
+function parseXhrErrorResponse(jqXHR, errorThrown) {
+  let json = jqXHR.responseJSON;
+  if (!json) {
+    try {
+      if (jqXHR.responseText) {
+        json = JSON.parse(jqXHR.responseText);
+      }
+    } catch(err) {
+      Ember.Logger.warn(err);
+    }
+  }
+  json = json || {};
+  json.status = jqXHR.status;
+  json.errors = json.errors || [{
+    status: jqXHR.status,
+    detail: jqXHR.responseText,
+    message: errorThrown
+  }];
+  return json;
+}
diff --git a/addon/utils/errors.js b/addon/utils/errors.js
@@ -18,6 +18,7 @@ export function ServerError(message = 'Server Error', response = null) {
   this.name = 'ServerError';
   this.response = response;
   this.errors = (response) ? response.errors || null : null;
+  this.code = (response) ? response.status || null : null;
 }
 ServerError.prototype = errorProtoFactory(ServerError);
 
@@ -36,25 +37,27 @@ export function ClientError(message = 'Client Error', response = null) {
   this.name = 'ClientError';
   this.response = response;
   this.errors = (response) ? response.errors || null : null;
+  this.code = (response) ? response.status || null : null;
 }
 ClientError.prototype = errorProtoFactory(ClientError);
 
 /**
   @class FetchError
   @constructor
   @param {String} message
-  @param {Error} error
-  @param {Object} response
+  @param {Error|Object} error or response object
   @return {Error}
 */
-export function FetchError(message = 'Fetch Error', error = null, response = null) {
+export function FetchError(message = 'Fetch Error', response = null) {
   let _error = Error.prototype.constructor.call(this, message);
   _error.name = this.name = 'FetchError';
-  this.stack = (error && error.stack) ? error.stack : _error.stack;
-  this.message = (error && error.message) ? error.message : _error.message;
+  this.stack = (response && response.stack) ? response.stack : _error.stack;
+  this.message = (response && response.message) ? response.message : _error.message;
   this.name = 'FetchError';
-  this.response = response;
-  this.error = error || _error;
+  this.error = (response instanceof Error) ? response : _error;
+  this.response = (response instanceof Error) ? null : response;
+  this.errors = (this.response) ? response.errors : null;
+  this.code = (response) ? response.status || null : null;
 }
 FetchError.prototype = errorProtoFactory(FetchError);
 
diff --git a/tests/unit/adapters/application-test.js b/tests/unit/adapters/application-test.js
@@ -395,22 +395,28 @@ test('serializer#deserializeIncluded called after successful fetch', function(as
 
 
 test('#fetch handles 5xx (ServerError) response status', function(assert) {
-  assert.expect(2);
+  assert.expect(3);
   const done = assert.async();
   const adapter = this.subject({type: 'posts', url: '/posts'});
   sandbox.stub(window, 'fetch', function () {
-    return Ember.RSVP.Promise.resolve({ "status": 500 });
+    return Ember.RSVP.Promise.resolve({
+      "status": 500,
+      "text": function() {
+        return Ember.RSVP.Promise.resolve('');
+      }
+    });
   });
   let promise = adapter.fetch('/posts', { method: 'POST', body: 'json string here' });
   assert.ok(typeof promise.then === 'function', 'returns a thenable');
   promise.catch(function(error) {
     assert.equal(error.name, 'ServerError', '5xx response throws a custom error');
+    assert.equal(error.code, 500, 'error code 500');
     done();
   });
 });
 
 test('#fetch handles 4xx (Client Error) response status', function(assert) {
-  assert.expect(4);
+  assert.expect(5);
   const done = assert.async();
   const adapter = this.subject({type: 'posts', url: '/posts'});
   sandbox.stub(adapter, 'fetchUrl', function () {});
@@ -428,6 +434,7 @@ test('#fetch handles 4xx (Client Error) response status', function(assert) {
     assert.ok(error.name, 'Client Error', '4xx response throws a custom error');
     assert.ok(Array.isArray(error.errors), '4xx error includes errors');
     assert.equal(error.errors[0].status, 404, '404 error status is in errors list');
+    assert.equal(error.code, 404, 'error code 404');
     done();
   });
 });
diff --git a/tests/unit/mixins/fetch-test.js b/tests/unit/mixins/fetch-test.js
@@ -41,19 +41,20 @@ test('#useFetch default value is true', function(assert) {
 });
 
 test('#_ajax handles 5xx (Server Error)', function(assert) {
-  assert.expect(2);
+  assert.expect(3);
   const done = assert.async();
   this.server.respondWith('GET', '/posts', [500, {}, ""]);
   let promise = this.subject._ajax('/posts', { method: 'GET' }, false);
   assert.ok(typeof promise.then === 'function', 'returns a thenable');
   promise.catch(function(error) {
     assert.equal(error.name, 'ServerError', '5xx response throws a custom error');
+    assert.equal(error.code, 500, 'error code 500');
     done();
   });
 });
 
 test('#_ajax handles 4xx (Client Error)', function(assert) {
-  assert.expect(4);
+  assert.expect(5);
   const done = assert.async();
   this.server.respondWith('GET', '/posts/101', [
     404,
@@ -73,6 +74,7 @@ test('#_ajax handles 4xx (Client Error)', function(assert) {
     assert.ok(error.name, 'Client Error', '4xx response throws a custom error');
     assert.ok(Array.isArray(error.errors), '4xx error includes errors');
     assert.equal(error.errors[0].code, 404, '404 error code is in errors list');
+    assert.equal(error.code, 404, 'error code 404');
     done();
   });
 });
@@ -85,7 +87,7 @@ test('#_ajax handles 3xx error', function(assert) {
   assert.ok(typeof promise.then === 'function', 'returns a thenable');
   promise.catch(function(error) {
     assert.equal(error.name, 'FetchError', 'unknown error response throws a custom error');
-    assert.equal(error.error.code, 302, '302 error code');
+    assert.equal(error.code, 302, '302 error code');
     done();
   });
 });
