Fix error messages when the error response is not JSON

Author: ehmicky

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) {