Properly handle empty responses

Obtain the HTTP status code from the response object rather than the response body. FABN-1187 #done Change-Id: I430fa2947671a9e3d8cf4f137b2f6afd013e1e3a Signed-off-by: Gari Singh <[email protected]>
hyperledger · Mar 26, 2019 · 1a7a53f · 1a7a53f
1 parent f476894
commit 1a7a53f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/fabric-ca-client/lib/FabricCAClient.js b/fabric-ca-client/lib/FabricCAClient.js
@@ -317,7 +317,7 @@ const FabricCAClient = class {
 
 					if (!payload) {
 						return reject(new Error(
-							util.format('fabric-ca request %s failed with HTTP status code %s', api_method, JSON.parse(data).statusCode)));
+							util.format('fabric-ca request %s failed with HTTP status code %s', api_method, response.statusCode)));
 					}
 					// response should be JSON
 					let responseObj;
@@ -461,7 +461,7 @@ const FabricCAClient = class {
 
 					if (!payload) {
 						return reject(new Error(
-							util.format('Enrollment failed with HTTP status code', JSON.parse(data).statusCode)));
+							util.format('Enrollment failed with HTTP status code', response.statusCode)));
 					}
 					// response should be JSON
 					try {

diff --git a/fabric-ca-client/test/FabricCAClient.js b/fabric-ca-client/test/FabricCAClient.js
@@ -905,10 +905,11 @@ describe('FabricCAClient', () => {
 				// Create a mock response object...
 				const res = new events.EventEmitter();
 				res.setEncoding = function () { };
+				res.statusCode = 500;
 				callback(res);
 
 				// ...end with only status code being sent.
-				res.emit('end', '{"statusCode":500}');
+				res.emit('end');
 				return new events.EventEmitter();
 			});
 
@@ -1145,11 +1146,12 @@ describe('FabricCAClient', () => {
 				// Create a mock response object...
 				const res = new events.EventEmitter();
 				res.setEncoding = function () { };
+				res.statusCode = 500;
 				callback(res);
 
 				// ...end with only status code being sent.
 				res.emit('data');
-				res.emit('end', '{"statusCode":500}');
+				res.emit('end');
 				return new events.EventEmitter();
 			});
 

diff --git a/test/scenario/chaincode/fabcar/node/package.json b/test/scenario/chaincode/fabcar/node/package.json
@@ -17,8 +17,8 @@
     "author": "Hyperledger",
     "license": "Apache-2.0",
     "dependencies": {
-        "fabric-contract-api": "~1.4.0",
-        "fabric-shim": "~1.4.0"
+        "fabric-contract-api": "unstable",
+        "fabric-shim": "unstable"
     },
     "devDependencies": {
         "chai": "^4.1.2",