fix(error handling): replicate pre-5.0.0 error handling (#232)

Throw an Error if status code from HTTP is not 2XX.
godaddy · Mar 15, 2018 · b5eb7e0 · b5eb7e0
1 parent d66047e
commit b5eb7e0
Show file tree

Hide file tree

Showing 2 changed files with 69 additions and 0 deletions.
diff --git a/lib/swagger-client.js b/lib/swagger-client.js
@@ -260,6 +260,13 @@ class Component {
     return new Promise((resolve, reject) => {
       this.http.request(method, options, (err, res) => {
         if (err) return reject(err);
+        if (res.statusCode < 200 || res.statusCode > 299) {
+          const error = new Error(res.body.message || res.body);
+          // .code is backwards compatible with pre-5.0.0 code.
+          error.code = res.statusCode;
+          error.statusCode = res.statusCode;
+          return reject(error);
+        }
         resolve(res);
       });
     });

diff --git a/test/swagger-client.test.js b/test/swagger-client.test.js
@@ -39,6 +39,68 @@ describe('lib.swagger-client', () => {
       });
     });
 
+    describe('.get', () => {
+      it('returns the result for 2XX', done => {
+        nock(common.api.url)
+          .get('/magic')
+          .reply(200, {
+            message: 'ta dah'
+          });
+
+        const options = {
+          config: { url: common.api.url },
+          spec: {
+            paths: {
+              '/magic': {
+                get: {
+                  operationId: 'getMagic'
+                }
+              }
+            }
+          }
+        };
+        const client = new Client(options);
+        client.magic.get()
+          .then(res => {
+            assume(res.statusCode).is.equal(200);
+            assume(res.body.message).is.equal('ta dah');
+            done();
+          })
+          .catch(done);
+      });
+
+      it('throws an error on non-2XX', done => {
+        nock(common.api.url)
+          .get('/magic')
+          .reply(404, {
+            message: 'fail!'
+          });
+
+        const options = {
+          config: { url: common.api.url },
+          spec: {
+            paths: {
+              '/magic': {
+                get: {
+                  operationId: 'getMagic'
+                }
+              }
+            }
+          }
+        };
+        const client = new Client(options);
+        client.magic.get()
+          .then(() => {
+            assume('Should not reach').is.falsy();
+          })
+          .catch(err => {
+            assume(err.statusCode).is.equal(404);
+            assume(err.message).is.equal('fail!');
+            done();
+          });
+      });
+    });
+
     describe('.constructor', () => {
       it('creates a dynamically generated client synchronously based on version', () => {
         const options = { config: {}, version: '1.9' };