From 5af6c7954ef2a4297a56c8547c619a7de8737abe Mon Sep 17 00:00:00 2001
From: David Houweling <houweling@outlook.com>
Date: Fri, 12 Jun 2015 22:19:50 +0100
Subject: [PATCH] handle error 400 json responses and standard string responses

---
 libs/util/http.client.js            | 15 ++++-
 tests/unit/libs/util/http.client.js | 85 +++++++++++++++++++++++++++--
 2 files changed, 91 insertions(+), 9 deletions(-)

diff --git a/libs/util/http.client.js b/libs/util/http.client.js
index 1bf66ae1..88bb137c 100644
--- a/libs/util/http.client.js
+++ b/libs/util/http.client.js
@@ -168,18 +168,27 @@ function io(url, options) {
         useXDR: options.cors
     }, function (err, resp, body) {
         var status = resp.statusCode;
-        var errMessage;
+        var errMessage, errBody;
 
         if (!err && (status === 0 || (status >= 400 && status < 600))) {
             if (typeof body === 'string') {
-                errMessage = body;
+                try {
+                    errBody = JSON.parse(body);
+                    if (errBody.message) {
+                        errMessage = errBody.message;
+                    } else {
+                        errMessage = body;
+                    }
+                } catch(e) {
+                    errMessage = body;
+                }
             } else {
                 errMessage = status ? 'Error ' + status : 'Internal Fetchr XMLHttpRequest Error';
             }
 
             err = new Error(errMessage);
             err.statusCode = status;
-            err.body = body;
+            err.body = errBody || body;
             if (408 === status || 0 === status) {
                 err.timeout = options.timeout;
             }
diff --git a/tests/unit/libs/util/http.client.js b/tests/unit/libs/util/http.client.js
index ce9dcec0..9980a6ca 100644
--- a/tests/unit/libs/util/http.client.js
+++ b/tests/unit/libs/util/http.client.js
@@ -11,6 +11,7 @@ var mockery = require('mockery');
 var http;
 var xhrOptions;
 var mockResponse;
+var mockBody = '';
 
 describe('Client HTTP', function () {
 
@@ -19,15 +20,17 @@ describe('Client HTTP', function () {
             useCleanCache: true,
             warnOnUnregistered: false
         });
-            mockery.resetCache();
-            mockery.registerMock('xhr', function mockXhr(options, callback) {
-                xhrOptions.push(options);
-                callback(null, mockResponse, 'BODY');
-            });
-            http = require('../../../../libs/util/http.client.js');
+        mockery.resetCache();
+        mockBody = '';
+        mockery.registerMock('xhr', function mockXhr(options, callback) {
+            xhrOptions.push(options);
+            callback(null, mockResponse, mockBody);
+        });
+        http = require('../../../../libs/util/http.client.js');
     });
 
     after(function() {
+        mockBody = '';
         mockery.deregisterAll();
     });
 
@@ -36,6 +39,7 @@ describe('Client HTTP', function () {
             mockResponse = {
                 statusCode: 200
             };
+            mockBody = 'BODY';
             xhrOptions = [];
         });
 
@@ -97,9 +101,78 @@ describe('Client HTTP', function () {
         });
     });
 
+    describe('#400 requests', function () {
+        beforeEach(function () {
+            xhrOptions = [];
+            mockResponse = {
+                statusCode: 400
+            };
+        });
+
+        it('GET with no response', function (done) {
+            mockBody = undefined;
+            http.get('/url', {'X-Foo': 'foo'}, {}, function (err, response, body) {
+                expect(err.message).to.equal('Error 400');
+                expect(err.statusCode).to.equal(400);
+                expect(err.body).to.equal(undefined);
+                done();
+            });
+        });
+
+        it('GET with empty response', function (done) {
+            mockBody = '';
+            http.get('/url', {'X-Foo': 'foo'}, {}, function (err, response, body) {
+                expect(err.message).to.equal('');
+                expect(err.statusCode).to.equal(400);
+                expect(err.body).to.equal('');
+                done();
+            });
+        });
+
+        it('GET with JSON response containing message attribute', function (done) {
+            mockBody = '{"message":"some body content"}';
+            http.get('/url', {'X-Foo': 'foo'}, {}, function (err, response, body) {
+                expect(err.message).to.equal('some body content');
+                expect(err.statusCode).to.equal(400);
+                expect(err.body).to.deep.equal({
+                    message: 'some body content'
+                });
+                done();
+            });
+        });
+
+        it('GET with JSON response not containing message attribute', function (done) {
+            mockBody = '{"other":"some body content"}';
+            http.get('/url', {'X-Foo': 'foo'}, {}, function (err, response, body) {
+                expect(err.message).to.equal(mockBody);
+                expect(err.statusCode).to.equal(400);
+                expect(err.body).to.deep.equal({
+                    other: "some body content"
+                });
+                done();
+            });
+        });
+
+        // Need to test plain text response
+        // as some servers (e.g. node running in IIS) 
+        // may remove body content
+        // and replace it with 'Bad Request'
+        // if not configured to allow content throughput
+        it('GET with plain text', function (done) {
+            mockBody = 'Bad Request';
+            http.get('/url', {'X-Foo': 'foo'}, {}, function (err, response, body) {
+                expect(err.message).to.equal(mockBody);
+                expect(err.statusCode).to.equal(400);
+                expect(err.body).to.equal(mockBody);
+                done();
+            });
+        });
+    });
+
     describe('#408 requests', function () {
         beforeEach(function () {
             xhrOptions = [];
+            mockBody = 'BODY';
             mockResponse = {
                 statusCode: 408
             };