Merge pull request #263 from ibm-cloud-security/development

fix(package.json): bump GotJS from v9.6 to v11.8
ibm-cloud-security · Mar 7, 2022 · 18ea697 · 18ea697
2 parents 5746763 + e4ab9fe
commit 18ea697
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 9 deletions.
diff --git a/lib/strategies/webapp-strategy.js b/lib/strategies/webapp-strategy.js
@@ -202,6 +202,7 @@ function handleChangeDetails(req, options, strategy) {
 	var generateCodeUrl = strategy.serviceConfig.getOAuthServerUrl() + GENERATE_CODE_PATH;
 	request({
 		'url': generateCodeUrl,
+		responseType: 'text',
 		'auth': {
 			'bearer': appIdAuthContext.accessToken + ' ' + appIdAuthContext.identityToken
 		}

diff --git a/lib/utils/request-util.js b/lib/utils/request-util.js
@@ -41,6 +41,16 @@ module.exports = (function () {
 
                     options.headers = objectKeysToLowerCase(options.headers);
                     options.headers["content-type"] = options.headers["content-type"] || 'application/json';
+                } 
+
+                // GotJS doesn't allow Request Body with the GET OR DELETE Method by default.
+                if(options.method === 'GET' || 'DELETE') {
+                    if(options.body === null) {
+                        delete options.body;
+                    }
+                    else {
+                        options.allowGetBody = true;
+                    }
                 }
 
                 if (options.qs) {
@@ -85,7 +95,9 @@ module.exports = (function () {
 
                 // receive a JSON body 
                 // This is necessary for the ServerSDK only as we are expecting JSON response in all the calls 
-                options.responseType = 'json';
+                if (!options.responseType) {
+                    options.responseType = 'json';
+                }
 
                 if (options.json) {
                     // Handle json param same as Request library used to handle, so If json is true, then body must be a JSON-serializable object.
@@ -122,10 +134,17 @@ module.exports = (function () {
                 callback(error, response, body);
             } catch (err) {
                 error = err;
-                statusCode = err.statusCode;
-                response = {
-                    statusCode
-                };
+                if (err.response && err.response.statusCode) {
+                    statusCode = err.response.statusCode;
+                }
+
+                // If body is empty, then return the response details of the error object
+                if(!body && err.response) {
+                    response = err.response;
+                    body = err.response.body;
+                    response.statusCode = statusCode;
+                }
+
                 callback(error, response, body);
             }
         })();

diff --git a/package.json b/package.json
@@ -46,7 +46,7 @@
     "cookie-parser": "^1.4.5",
     "ejs": "^3.1.3",
     "form-data": "^2.3.3",
-    "got": "^9.6.0",
+    "got": "^11.8.3",
     "helmet": "^3.23.3",
     "jsonwebtoken": "^8.5.1",
     "log4js": "^6.4.1",
@@ -59,4 +59,4 @@
       "path": "./node_modules/cz-conventional-changelog"
     }
   }
-}
+}
diff --git a/test/request-util-test.js b/test/request-util-test.js
@@ -292,7 +292,8 @@ describe('/lib/utils/request-util', function (done) {
 
         it('should return an error if body was not sent back2', (done) => {
             let sampleError = new Error("Some Error");
-            sampleError.statusCode = 500;
+            sampleError.response = {};
+            sampleError.response.statusCode = 500;
             gotStub = sandbox.stub().rejects(sampleError);
             requestUtil = proxyquire("../lib/utils/request-util", {
                 got: gotStub,
@@ -302,7 +303,7 @@ describe('/lib/utils/request-util', function (done) {
                 expect(gotStub).to.have.been.calledOnce;
                 expect(error).to.equal(sampleError);
                 expect(response).to.deep.equal({
-                    statusCode: sampleError.statusCode
+                    statusCode: sampleError.response.statusCode
                 });
                 done();
             }