don't parse body as json on 204 responses (stoplightio#2252)

stainless-api · Apr 7, 2023 · 00233b7 · 00233b7
1 parent 686bdb1
commit 00233b7
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/packages/http/src/utils/__tests__/parseResponse.spec.ts b/packages/http/src/utils/__tests__/parseResponse.spec.ts
@@ -10,6 +10,7 @@ describe('parseResponseBody()', () => {
           headers: new Headers({ 'content-type': 'application/json' }),
           json: jest.fn().mockResolvedValue({ test: 'test' }),
           text: jest.fn(),
+          status: 200,
         };
 
         expect(response.text).not.toHaveBeenCalled();
@@ -20,6 +21,7 @@ describe('parseResponseBody()', () => {
     describe('body is not parseable', () => {
       it('returns error', () => {
         const response = {
+          status: 200,
           headers: new Headers({ 'content-type': 'application/json' }),
           json: jest.fn().mockRejectedValue(new Error('Big Bada Boom')),
           text: jest.fn(),
@@ -35,6 +37,7 @@ describe('parseResponseBody()', () => {
     describe('body is readable', () => {
       it('returns body text', () => {
         const response = {
+          status: 200,
           headers: new Headers({ 'content-type': 'text/html' }),
           json: jest.fn(),
           text: jest.fn().mockResolvedValue('<html>Test</html>'),
@@ -48,9 +51,11 @@ describe('parseResponseBody()', () => {
     describe('body is not readable', () => {
       it('returns error', () => {
         const response = {
+          status: 200,
           headers: new Headers(),
           json: jest.fn(),
           text: jest.fn().mockRejectedValue(new Error('Big Bada Boom')),
+
         };
 
         expect(response.json).not.toHaveBeenCalled();
@@ -62,6 +67,7 @@ describe('parseResponseBody()', () => {
   describe('content-type header not set', () => {
     it('returns body text', () => {
       const response = {
+        status: 200,
         headers: new Headers(),
         json: jest.fn(),
         text: jest.fn().mockResolvedValue('Plavalaguna'),
@@ -71,6 +77,20 @@ describe('parseResponseBody()', () => {
       return assertResolvesRight(parseResponseBody(response), body => expect(body).toEqual('Plavalaguna'));
     });
   });
+
+  describe('content-type header is set', () => {
+    it('does not call json() on 204', () => {
+      const response = {
+        status: 204,
+        headers: new Headers({ 'content-type': 'application/json' }),
+        json: jest.fn(),
+        text: jest.fn().mockResolvedValue(''),
+      };
+
+      expect(response.json).not.toHaveBeenCalled();
+      return assertResolvesRight(parseResponseBody(response), body => expect(body).toEqual(''));
+    });
+  });
 });
 
 describe('parseResponseHeaders()', () => {

diff --git a/packages/http/src/utils/parseResponse.ts b/packages/http/src/utils/parseResponse.ts
@@ -8,11 +8,11 @@ import { Dictionary } from '@stoplight/types';
 import { IHttpResponse } from '../types';
 
 export const parseResponseBody = (
-  response: Pick<Response, 'headers' | 'json' | 'text'>
+  response: Pick<Response, 'headers' | 'json' | 'text' | 'status'>
 ): TE.TaskEither<Error, unknown> =>
   TE.tryCatch(
     () =>
-      typeIs(response.headers.get('content-type') || '', ['application/json', 'application/*+json'])
+      (response.status != 204 && typeIs(response.headers.get('content-type') || '', ['application/json', 'application/*+json']))
         ? response.json()
         : response.text(),
     E.toError