sends accept: application/json header when in json mode

bbc · Oct 11, 2023 · fa79732 · fa79732
1 parent d27fbcf
commit fa79732
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 4 deletions.
diff --git a/lib/transport/node-fetch.js b/lib/transport/node-fetch.js
@@ -50,15 +50,17 @@ class FetchTransport extends Transport {
       }
     }
 
+    if (this.jsonMode(ctx)) req.addHeader('Accept', 'application/json');
+
     if (req.hasHeaders()) opts.headers = req.getHeaders();
 
     return opts;
   }
 
-  parseAsJson(ctx, contentType) {
+  jsonMode(ctx) {
     if (ctx.opts?.json !== undefined) return ctx.opts.json;
 
-    return this.defaults?.json || contentType?.includes('json');
+    return this.defaults?.json;
   }
 
   async toResponse(ctx, from) {
@@ -76,7 +78,7 @@ class FetchTransport extends Transport {
     if (text) {
       to.body = text;
       const contentType = to.headers['content-type'];
-      if (this.parseAsJson(ctx, contentType)) {
+      if (this.jsonMode(ctx, contentType) || contentType?.includes('json')) {
         try {
           to.body = JSON.parse(to.body);
         } catch {} // If body is not parseable, leave as text

diff --git a/test/transport/node-fetch.js b/test/transport/node-fetch.js
@@ -246,7 +246,7 @@ describe('Request HTTP transport', () => {
         .catch(assert.ifError);
     });
 
-    it('allows disabling of  timing request', () => {
+    it('allows disabling of timing request', () => {
       nock.cleanAll();
       api.get('/').reply(200, responseBody);
 
@@ -288,6 +288,32 @@ describe('Request HTTP transport', () => {
           });
       });
 
+      it('if json default option is passed in as true, send an accept: application/json header', () => {
+        nock.cleanAll();
+        nock(host, {
+          reqheaders: {
+            accept: 'application/json'
+          }
+        })
+          .get(path)
+          .reply(200, responseBody, header);
+
+        const ctx = createContext(url);
+        const options = {
+          defaults: {
+            json: true
+          }
+        };
+
+        const fetchTransport = new FetchTransport(options);
+        return fetchTransport
+          .execute(ctx)
+          .catch(assert.ifError)
+          .then((ctx) => {
+            assert.equal(ctx.res.statusCode, 200);
+          });
+      });
+
       it('if there is no json default option passed in, but the content type header includes application/json, then parse body as json', () => {
         nock.cleanAll();
         api.get(path).reply(200, JSONResponseBody, jsonHeader);