fix json transform when data is pre-stringified

axios · Sep 6, 2021 · 5f45be2 · 5f45be2
1 parent 4f25380
commit 5f45be2
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 1 deletion.
diff --git a/lib/defaults.js b/lib/defaults.js
@@ -26,6 +26,21 @@ function getDefaultAdapter() {
   return adapter;
 }
 
+function stringifySafely(rawValue, parser, encoder) {
+  if (utils.isString(rawValue)) {
+    try {
+      (parser || JSON.parse)(rawValue);
+      return utils.trim(rawValue);
+    } catch (e) {
+      if (e.name !== 'SyntaxError') {
+        throw e;
+      }
+    }
+  }
+
+  return (encoder || JSON.stringify)(rawValue);
+}
+
 var defaults = {
 
   transitional: {
@@ -58,7 +73,7 @@ var defaults = {
     }
     if (utils.isObject(data) || (headers && headers['Content-Type'] === 'application/json')) {
       setContentTypeIfUnset(headers, 'application/json');
-      return JSON.stringify(data);
+      return stringifySafely(data);
     }
     return data;
   }],

diff --git a/test/specs/defaults.spec.js b/test/specs/defaults.spec.js
@@ -20,6 +20,30 @@ describe('defaults', function () {
     expect(defaults.transformRequest[0]({foo: 'bar'})).toEqual('{"foo":"bar"}');
   });
 
+  it("should also transform request json when 'Content-Type' is 'application/json'", function () {
+    expect(defaults.transformRequest[0](JSON.stringify({foo: 'bar'}), {
+      'Content-Type': 'application/json'
+    })).toEqual('{"foo":"bar"}');
+    expect(defaults.transformRequest[0]([42, 43], {
+      'Content-Type': 'application/json'
+    })).toEqual('[42,43]');
+    expect(defaults.transformRequest[0]('foo', {
+      'Content-Type': 'application/json'
+    })).toEqual('"foo"');
+    expect(defaults.transformRequest[0](42, {
+      'Content-Type': 'application/json'
+    })).toEqual('42');
+    expect(defaults.transformRequest[0](true, {
+      'Content-Type': 'application/json'
+    })).toEqual('true');
+    expect(defaults.transformRequest[0](false, {
+      'Content-Type': 'application/json'
+    })).toEqual('false');
+    expect(defaults.transformRequest[0](null, {
+      'Content-Type': 'application/json'
+    })).toEqual('null');
+  });
+
   it('should do nothing to request string', function () {
     expect(defaults.transformRequest[0]('foo=bar')).toEqual('foo=bar');
   });