Merge pull request #4 from amarzavery/fixStringBody

string body needs to be handled differently.

.npmignore

@@ -5,3 +5,4 @@ test/
 .travis.yml
 .gitignore
 gulpfile.js
+.git

Changelog.md

@@ -1,3 +1,6 @@
+### 0.1.1 - 2017-10-10
+- Reverting the change made in #2.
+
 ### 0.1.0 - 2017-09-16
 - Initial version of ms-rest-js
   - Provides support for basic credentials

dist/lib/util/utils.js

@@ -316,24 +316,10 @@ function dispatchRequest(options) {
                 }
             }
             catch (err) {
-                const textResponse = operationResponse.bodyAsText;
+                const msg = `Error "${err}" occured while executing JSON.parse on the response body - ${operationResponse.bodyAsText}.`;
-                // As per, http://json-schema.org/latest/json-schema-validation.html#rfc.section.6.25 and
+                const errCode = err.code || "JSON_PARSE_ERROR";
-                // https://spacetelescope.github.io/understanding-json-schema/reference/type.html JSON has
+                const e = new restError_1.RestError(msg, errCode, res.status, options, res, operationResponse.bodyAsText);
-                //  ("null", "boolean", "object", "array", "number", or "string"), or "integer" as basic types.
+                return Promise.reject(e);
-                // For JSON.parse() to a parse a string, the input should have double quotes in it like "\"Some Text\"".
-                // Since this is not the case, we want to make sure that the response body was actually a string
-                // and not a malformed JSON object or JSON array. If the response body was null like "null" or
-                // a number like "10" or a boolean like "true" or "false", then JSON.parse() handles those
-                // scenarios correctly. If the input does not start with "{" or "[" then it is most probably a string.
-                if (!(textResponse.startsWith("{") || textResponse.startsWith("["))) {
-                    operationResponse.bodyAsJson = textResponse;
-                }
-                else {
-                    const msg = `Error "${err}" occured while executing JSON.parse on the response body - ${textResponse}.`;
-                    const errCode = err.code || "JSON_PARSE_ERROR";
-                    const e = new restError_1.RestError(msg, errCode, res.status, options, res, textResponse);
-                    return Promise.reject(e);
-                }
             }
         }
         return Promise.resolve(operationResponse);

dist/test/serializationTests.js

@@ -196,7 +196,9 @@ describe("msrest", function () {
             let mapper = { type: { name: "TimeSpan" }, required: false, serializedName: "TimeSpan" };
             let duration = moment.duration({ days: 123, hours: 22, minutes: 14, seconds: 12, milliseconds: 11 });
             let serializedDateString = Serializer.serialize(mapper, duration, "dateTimeObj");
-            serializedDateString.should.equal("P123DT22H14M12.010999999998603S");
+            if (serializedDateString !== "P123DT22H14M12.011S" && serializedDateString !== "P123DT22H14M12.010999999998603S") {
+                done(new Error(`serializedDateString: ${serializedDateString} from moment is invalid.`));
+            }
             done();
         });
         it("should correctly serialize an array of primitives", function (done) {

lib/util/utils.ts

@@ -313,23 +313,10 @@ export async function dispatchRequest(options: WebResource): Promise<HttpOperati
         operationResponse.bodyAsJson = JSON.parse(operationResponse.bodyAsText);
       }
     } catch (err) {
-      const textResponse = operationResponse.bodyAsText;
+      const msg = `Error "${err}" occured while executing JSON.parse on the response body - ${operationResponse.bodyAsText}.`;
-      // As per, http://json-schema.org/latest/json-schema-validation.html#rfc.section.6.25 and
+      const errCode = err.code || "JSON_PARSE_ERROR";
-      // https://spacetelescope.github.io/understanding-json-schema/reference/type.html JSON has
+      const e = new RestError(msg, errCode, res.status, options, res, operationResponse.bodyAsText);
-      //  ("null", "boolean", "object", "array", "number", or "string"), or "integer" as basic types.
+      return Promise.reject(e);
-      // For JSON.parse() to a parse a string, the input should have double quotes in it like "\"Some Text\"".
-      // Since this is not the case, we want to make sure that the response body was actually a string
-      // and not a malformed JSON object or JSON array. If the response body was null like "null" or
-      // a number like "10" or a boolean like "true" or "false", then JSON.parse() handles those
-      // scenarios correctly. If the input does not start with "{" or "[" then it is most probably a string.
-      if (!(textResponse.startsWith("{") || textResponse.startsWith("["))) {
-        operationResponse.bodyAsJson = textResponse;
-      } else {
-        const msg = `Error "${err}" occured while executing JSON.parse on the response body - ${textResponse}.`;
-        const errCode = err.code || "JSON_PARSE_ERROR";
-        const e = new RestError(msg, errCode, res.status, options, res, textResponse);
-        return Promise.reject(e);
-      }
     }
   }
   return Promise.resolve(operationResponse);

package.json

@@ -5,7 +5,7 @@
     "email": "azsdkteam@microsoft.com",
     "url": "https://github.com/Azure/ms-rest-js"
   },
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Isomorphic client Runtime for Typescript/node.js/browser javascript client libraries generated using AutoRest",
   "tags": [
     "isomorphic",

test/serializationTests.ts

@@ -204,7 +204,9 @@ describe("msrest", function () {
       let mapper: msRest.Mapper = { type: { name: "TimeSpan" }, required: false, serializedName: "TimeSpan" };
       let duration = moment.duration({ days: 123, hours: 22, minutes: 14, seconds: 12, milliseconds: 11 });
       let serializedDateString = Serializer.serialize(mapper, duration, "dateTimeObj");
-      serializedDateString.should.equal("P123DT22H14M12.010999999998603S");
+      if (serializedDateString !== "P123DT22H14M12.011S" && serializedDateString !== "P123DT22H14M12.010999999998603S") {
+        done(new Error(`serializedDateString: ${serializedDateString} from moment is invalid.`));
+      }
       done();
     });