Fix error responses when the response is not JSON (#85)

Fix error responses when the response is not JSON

Author: ehmicky

src/index.test.js

@@ -1,7 +1,7 @@
 const test = require('ava')
 const nock = require('nock')
 const fromString = require('from2-string')
-const { TextHTTPError } = require('micro-api-client')
+const { TextHTTPError, JSONHTTPError } = require('micro-api-client')
 
 const NetlifyAPI = require('./index')
 
@@ -310,7 +310,7 @@ test('Can parse text responses', async t => {
   t.true(scope.isDone())
 })
 
-test('Handle error JSON responses', async t => {
+test('Handle error empty responses', async t => {
   const account_id = '8'
   const status = 404
   const scope = nock(origin)
@@ -347,6 +347,44 @@ test('Handle error text responses', async t => {
   t.true(scope.isDone())
 })
 
+test('Handle error text responses on JSON endpoints', async t => {
+  const account_id = '9'
+  const status = 404
+  const expectedResponse = 'test'
+  const scope = nock(origin)
+    .get(`${pathPrefix}/accounts/${account_id}`)
+    .reply(status, expectedResponse, { 'Content-Type': 'application/json' })
+
+  const client = getClient()
+  const error = await t.throwsAsync(client.getAccount({ account_id }))
+
+  t.is(error.status, status)
+  t.is(error.message, 'Not Found')
+  t.is(error.data, expectedResponse)
+  t.true(error instanceof TextHTTPError)
+  t.true(error.stack !== undefined)
+  t.true(scope.isDone())
+})
+
+test('Handle error JSON responses', async t => {
+  const account_id = '8'
+  const status = 404
+  const errorJson = { error: true }
+  const scope = nock(origin)
+    .get(`${pathPrefix}/accounts/${account_id}`)
+    .reply(status, errorJson)
+
+  const client = getClient()
+  const error = await t.throwsAsync(client.getAccount({ account_id }))
+
+  t.is(error.status, status)
+  t.is(error.message, 'Not Found')
+  t.deepEqual(error.json, errorJson)
+  t.true(error instanceof JSONHTTPError)
+  t.true(error.stack !== undefined)
+  t.true(scope.isDone())
+})
+
 test('Handle network errors', async t => {
   const account_id = '10'
   const expectedResponse = 'test'

src/methods/response.js

@@ -2,10 +2,13 @@ const { JSONHTTPError, TextHTTPError } = require('micro-api-client')
 
 // Read and parse the HTTP response
 const parseResponse = async function(response) {
-  const { method, ErrorType } = getResponseType(response)
-  const parsedResponse = await response[method]()
+  const responseType = getResponseType(response)
+  const textResponse = await response.text()
+
+  const parsedResponse = parseJsonResponse(response, textResponse, responseType)
 
   if (!response.ok) {
+    const ErrorType = responseType === 'json' ? JSONHTTPError : TextHTTPError
     throw new ErrorType(response, parsedResponse)
   }
 
@@ -16,10 +19,22 @@ const getResponseType = function({ headers }) {
   const contentType = headers.get('Content-Type')
 
   if (contentType != null && contentType.includes('json')) {
-    return { method: 'json', ErrorType: JSONHTTPError }
+    return 'json'
+  }
+
+  return 'text'
+}
+
+const parseJsonResponse = function(response, textResponse, responseType) {
+  if (responseType === 'text') {
+    return textResponse
   }
 
-  return { method: 'text', ErrorType: TextHTTPError }
+  try {
+    return JSON.parse(textResponse)
+  } catch (error) {
+    throw new TextHTTPError(response, textResponse)
+  }
 }
 
 const getFetchError = function(error, url, opts) {