fix: 304 don't read body

Author: ajaishankar

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "openapi-typescript-fetch",
   "description": "A typed fetch client for openapi-typescript",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "engines": {
     "node": ">= 12.0.0",
     "npm": ">= 7.0.0"

package.json

@@ -136,7 +136,8 @@ function getFetchParams(request: Request) {
 
 async function getResponseData(response: Response) {
   const contentType = response.headers.get('content-type')
-  if (response.status === 204 /* no content */) {
+  // no content or not modified
+  if (response.status === 204 || response.status === 304) {
     return undefined
   }
   if (contentType && contentType.indexOf('application/json') !== -1) {

src/fetcher.ts

@@ -118,6 +118,20 @@ describe('fetch', () => {
     expect(data).toBeUndefined()
   })
 
+  it(`GET /notmodified (should not read body)`, async () => {
+    const fun = fetcher.path('/notmodified').method('get').create()
+    try {
+      await fun(undefined)
+      throw new Error('should throw api exception')
+    } catch (err) {
+      expect(err instanceof ApiError).toBe(true)
+      if (err instanceof ApiError) {
+        expect(err.headers.get('content-type')).toBe('application/json')
+        expect(err.status).toBe(304)
+      }
+    }
+  })
+
   it('GET /error', async () => {
     expect.assertions(3)
 

test/fetch.test.ts

@@ -87,6 +87,14 @@ const methods = {
     rest.post(`${HOST}/nocontent`, (req, res, ctx) => {
       return res(ctx.status(204))
     }),
+    rest.get(`${HOST}/notmodified`, (req, res) => {
+      // force bad json response
+      return res((res) => {
+        res.status = 304
+        res.headers.set('Content-Type', 'application/json')
+        return res
+      })
+    }),
     rest.get(`${HOST}/defaulterror`, (req, res, ctx) => {
       return res(ctx.status(500), ctx.body('internal server error'))
     }),

test/mocks/handlers.ts

@@ -70,6 +70,14 @@ export type paths = {
       }
     }
   }
+  '/notmodified': {
+    get: {
+      parameters: {}
+      responses: {
+        304: unknown
+      }
+    }
+  }
   '/error/{status}': {
     get: {
       parameters: {