Reject promises with request-promise StatusCodeError (#2)

Author: rlewan

index.js

@@ -13,6 +13,7 @@ var request = require('request');
 var RetryStrategies = require('./strategies');
 var isErrorResponse = require('./helpers/isErrorResponse')
 var _ = require('lodash');
+var { StatusCodeError } = require('request-promise-core/errors');
 
 var DEFAULTS = {
   maxAttempts: 5, // try 5 times
@@ -111,7 +112,7 @@ function Request(url, options, f, retryConfig) {
     }
 
     if (isErrorResponse(response)) {
-      return this._reject(this.fullResponse ? response : body);
+      return this._reject(new StatusCodeError(response.statusCode, body, this.options, response));
     }
 
     // resolve with the full response or just the body

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "@hmcts/requestretry",
   "description": "request-retry wrap nodejs request to retry http(s) requests in case of error",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "author": {
     "name": "Francois-Guillaume Ribreau",
     "email": "npm@fgribreau.com",
@@ -46,6 +46,7 @@
     "extend": "^3.0.0",
     "lodash": "^4.15.0",
     "request": "^2.74.0",
+    "request-promise-core": "^1.1.1",
     "when": "^3.7.7"
   },
   "devDependencies": {

package.json

@@ -96,7 +96,8 @@ describe('Promises support', function () {
       retryStrategy: request.RetryStrategies.HTTPOrNetworkError
     })
       .catch(function (err) {
-        t.strictEqual(err.body, 'Client Error');
+        t.strictEqual(err.statusCode, 400);
+        t.strictEqual(err.error, 'Client Error');
         done();
       });
   });
@@ -112,7 +113,8 @@ describe('Promises support', function () {
       retryStrategy: request.RetryStrategies.HTTPOrNetworkError
     })
       .catch(function (err) {
-        t.strictEqual(err.body, 'Server Error');
+        t.strictEqual(err.statusCode, 500);
+        t.strictEqual(err.error, 'Server Error');
         done();
       });
   });
@@ -162,7 +164,8 @@ describe('Promises support', function () {
       it('should work on request fail', function (done) {
         makeRequest(customPromiseFactory, done, true)
           .catch(function (err) {
-            t.strictEqual(err, 'Internal Server Error');
+            t.strictEqual(err.statusCode, 500);
+            t.strictEqual(err.error, 'Internal Server Error');
             done();
           });
       });
@@ -180,7 +183,8 @@ describe('Promises support', function () {
       it('should work on request fail', function (done) {
         makeRequest(customPromiseFactory, done, true)
           .catch(function (err) {
-            t.strictEqual(err, 'Internal Server Error');
+            t.strictEqual(err.statusCode, 500);
+            t.strictEqual(err.error, 'Internal Server Error');
             done();
           });
       });
@@ -203,7 +207,8 @@ describe('Promises support', function () {
       it('should work on request fail', function (done) {
         makeRequest(customPromiseFactory, done, true)
           .fail(function (err) {
-            t.strictEqual(err, 'Internal Server Error');
+            t.strictEqual(err.statusCode, 500);
+            t.strictEqual(err.error, 'Internal Server Error');
             done();
           });
       });
@@ -223,7 +228,8 @@ describe('Promises support', function () {
       it('should work on request fail', function (done) {
         makeRequest(customPromiseFactory, done, true)
           .catch(function (err) {
-            t.strictEqual(err, 'Internal Server Error');
+            t.strictEqual(err.statusCode, 500);
+            t.strictEqual(err.error, 'Internal Server Error');
             done();
           });
       });