Merge pull request #22 from contiamo/fix/content-type

Factor out handling of response content type handler

src/Get.tsx

@@ -1,5 +1,6 @@
 import * as React from "react";
 import RestfulReactProvider, { RestfulReactConsumer, RestfulReactProviderProps } from "./Context";
+import { processResponse } from "./util/processResponse";
 
 /**
  * A function that resolves returned data from
@@ -170,9 +171,7 @@ class ContextlessGet<TData, TError> extends React.Component<
 
     const request = new Request(`${base}${requestPath || path || ""}`, this.getRequestOptions(thisRequestOptions));
     const response = await fetch(request);
-
-    const data =
-      response.headers.get("content-type") === "application/json" ? await response.json() : await response.text();
+    const data = await processResponse(response);
 
     if (!response.ok) {
       this.setState({
@@ -208,7 +207,7 @@ class ContextlessGet<TData, TError> extends React.Component<
  * in order to provide new `base` props that contain
  * a segment of the path, creating composable URLs.
  */
-function Get<TData = {}, TError = {}>(props: GetProps<TData, TError>) {
+function Get<TData = any, TError = any>(props: GetProps<TData, TError>) {
   return (
     <RestfulReactConsumer>
       {contextProps => (

src/Mutate.tsx

@@ -154,7 +154,7 @@ class ContextlessMutate<TData, TError> extends React.Component<MutateProps<TData
  * in order to provide new `base` props that contain
  * a segment of the path, creating composable URLs.
  */
-function Mutate<TError = {}, TData = {}>(props: MutateProps<TData, TError>) {
+function Mutate<TError = any, TData = any>(props: MutateProps<TData, TError>) {
   return (
     <RestfulReactConsumer>
       {contextProps => (

src/Poll.tsx

@@ -3,6 +3,7 @@ import equal from "react-fast-compare";
 
 import { RestfulReactConsumer } from "./Context";
 import { GetProps, GetState, Meta as GetComponentMeta } from "./Get";
+import { processResponse } from "./util/processResponse";
 
 /**
  * Meta information returned from the poll.
@@ -205,22 +206,21 @@ class ContextlessPoll<TData, TError> extends React.Component<
         ...requestOptions.headers,
       },
     });
-    const response = await fetch(request);
 
-    const responseBody =
-      response.headers.get("content-type") === "application/json" ? await response.json() : await response.text();
+    const response = await fetch(request);
+    const data = await processResponse(response);
 
     if (!this.isResponseOk(response)) {
-      const error = { message: `${response.status} ${response.statusText}`, data: responseBody };
-      this.setState({ loading: false, lastResponse: response, data: responseBody, error });
+      const error = { message: `${response.status} ${response.statusText}`, data };
+      this.setState({ loading: false, lastResponse: response, data, error });
       throw new Error(`Failed to Poll: ${error}`);
     }
 
-    if (this.isModified(response, responseBody)) {
+    if (this.isModified(response, data)) {
       this.setState(() => ({
         loading: false,
         lastResponse: response,
-        data: resolve ? resolve(responseBody) : responseBody,
+        data: resolve ? resolve(data) : data,
         lastPollIndex: response.headers.get("x-polling-index") || undefined,
       }));
     }
@@ -284,7 +284,7 @@ class ContextlessPoll<TData, TError> extends React.Component<
   }
 }
 
-function Poll<TData = {}, TError = {}>(props: PollProps<TData, TError>) {
+function Poll<TData = any, TError = any>(props: PollProps<TData, TError>) {
   // Compose Contexts to allow for URL nesting
   return (
     <RestfulReactConsumer>

src/util/processResponse.ts

@@ -0,0 +1,7 @@
+export const processResponse = (response: Response) => {
+  if ((response.headers.get("content-type") || "").includes("application/json")) {
+    return response.json();
+  } else {
+    return response.text();
+  }
+};