Correctly parse superagent errors

Author: dan-silver

lib/graph-js-sdk-web.js

@@ -323,7 +323,7 @@ class ResponseHandler {
     static ParseError(rawErr) {
         let errObj;
         if (!('rawResponse' in rawErr)) {
-            if (rawErr.response !== undefined && 'body' in rawErr.response && 'error' in rawErr.response.body) {
+            if (rawErr.response !== undefined && rawErr.response.body !== null && 'error' in rawErr.response.body) {
                 errObj = rawErr.response.body.error;
             }
         }
@@ -1935,7 +1935,7 @@ Emitter.prototype.hasListeners = function(event){
 },{}],11:[function(require,module,exports){
 module.exports={
   "name": "msgraph-sdk-javascript",
-  "version": "0.1.4",
+  "version": "0.2.0",
   "description": "Microsoft Graph JavaScript SDK",
   "main": "lib/src/index.js",
   "typings": "lib/src/index",

lib/src/ResponseHandler.js

@@ -31,7 +31,7 @@ export class ResponseHandler {
         let errObj; // path to object containing innerError (see above schema)
 
         if (!('rawResponse' in rawErr)) { // if superagent correctly parsed the JSON
-            if (rawErr.response !== undefined && 'body' in rawErr.response && 'error' in rawErr.response.body) { // some 404s don't return an error object
+            if (rawErr.response !== undefined && rawErr.response.body !== null && 'error' in rawErr.response.body) { // some 404s don't return an error object
                 errObj = rawErr.response.body.error;
             }
         } else {

lib/src/ResponseHandler.js.map

@@ -60,4 +60,14 @@ describe('#ParseError()', function() {
             assert.equal(err.requestId, _500_SUPERAGENT_RES.response.body.error.innerError["request-id"]);
         });
     });
+
+
+    it('parses a 404 superagent error', function() {
+        let rawErr = JSON.parse('{"original":null,"response":{"req":{"method":"GET","url":"https://graph.microsoft.com/v1.0/users/4470c514-8ac5-4f2d-8116-870d2c41bdf6/photo/$value","headers":{"authorization":"Bearer abc","cache-control":"no-cache","sdkversion":"graph-js-0.2.0"}},"xhr":{},"text":null,"statusText":"Not Found","statusCode":404,"status":404,"statusType":4,"info":false,"ok":false,"clientError":true,"serverError":false,"error":{"status":404,"method":"GET","url":"https://graph.microsoft.com/v1.0/users/4470c514-8ac5-4f2d-8116-870d2c41bdf6/photo/$value"},"accepted":false,"noContent":false,"badRequest":false,"unauthorized":false,"notAcceptable":false,"notFound":true,"forbidden":false,"headers":{"client-request-id":"3726fdf7-8ae6-47c0-9f6a-5847982738d2","content-type":"text/plain","cache-control":"private","request-id":"3726fdf7-8ae6-47c0-9f6a-5847982738d2"},"header":{"client-request-id":"3726fdf7-8ae6-47c0-9f6a-5847982738d2","content-type":"text/plain","cache-control":"private","request-id":"3726fdf7-8ae6-47c0-9f6a-5847982738d2"},"type":"text/plain","body":null},"status":404}');
+
+        let graphErr = ResponseHandler.ParseError(rawErr);
+
+        assert.equal(graphErr.statusCode, 404);
+        
+    })
 });