Merge pull request #113 from vxsx/bugfix/poll-request-options

Add support for requestOptions as a method to Poll

src/Get.test.tsx

@@ -544,6 +544,27 @@ describe("Get", () => {
       expect(children.mock.calls[1][1].loading).toEqual(false);
       expect(children.mock.calls[1][0]).toEqual({ id: 1 });
     });
+
+    it("should add a custom header with requestOptions method", async () => {
+      nock("https://my-awesome-api.fake", { reqheaders: { foo: "bar" } })
+        .get("/")
+        .reply(200, { id: 1 });
+
+      const children = jest.fn();
+      children.mockReturnValue(<div />);
+
+      render(
+        <RestfulProvider base="https://my-awesome-api.fake">
+          <Get path="" requestOptions={() => ({ headers: { foo: "bar" } })}>
+            {children}
+          </Get>
+        </RestfulProvider>,
+      );
+
+      await wait(() => expect(children.mock.calls.length).toBe(2));
+      expect(children.mock.calls[1][1].loading).toEqual(false);
+      expect(children.mock.calls[1][0]).toEqual({ id: 1 });
+    });
   });
 
   describe("actions", () => {

src/Poll.test.tsx

@@ -657,5 +657,47 @@ describe("Poll", () => {
       expect(children.mock.calls[1][1].loading).toEqual(false);
       expect(children.mock.calls[1][0]).toEqual({ id: 1 });
     });
+
+    it("should add a custom header with requestOptions method", async () => {
+      nock("https://my-awesome-api.fake", { reqheaders: { foo: "bar" } })
+        .get("/")
+        .reply(200, { id: 1 });
+
+      const children = jest.fn();
+      children.mockReturnValue(<div />);
+
+      render(
+        <RestfulProvider base="https://my-awesome-api.fake">
+          <Poll path="" requestOptions={() => ({ headers: { foo: "bar" } })}>
+            {children}
+          </Poll>
+        </RestfulProvider>,
+      );
+
+      await wait(() => expect(children.mock.calls.length).toBe(2));
+      expect(children.mock.calls[1][1].loading).toEqual(false);
+      expect(children.mock.calls[1][0]).toEqual({ id: 1 });
+    });
+
+    it("should merge headers with providers", async () => {
+      nock("https://my-awesome-api.fake", { reqheaders: { foo: "bar", baz: "qux" } })
+        .get("/")
+        .reply(200, { id: 1 });
+
+      const children = jest.fn();
+      children.mockReturnValue(<div />);
+
+      render(
+        <RestfulProvider base="https://my-awesome-api.fake" requestOptions={{ headers: { baz: "qux" } }}>
+          <Poll path="" requestOptions={() => ({ headers: { foo: "bar" } })}>
+            {children}
+          </Poll>
+        </RestfulProvider>,
+      );
+
+      await wait(() => expect(children.mock.calls.length).toBe(2));
+      expect(children.mock.calls[1][1].loading).toEqual(false);
+      expect(children.mock.calls[1][0]).toEqual({ id: 1 });
+    });
   });
 });

src/Poll.tsx

@@ -1,3 +1,4 @@
+import merge from "lodash/merge";
 import * as qs from "qs";
 import * as React from "react";
 import equal from "react-fast-compare";
@@ -339,16 +340,22 @@ function Poll<TData = any, TError = any, TQueryParams = { [key: string]: any }>(
   // Compose Contexts to allow for URL nesting
   return (
     <RestfulReactConsumer>
-      {contextProps => (
-        <ContextlessPoll
-          {...contextProps}
-          {...props}
-          requestOptions={{
-            ...contextProps.requestOptions,
-            ...props.requestOptions,
-          }}
-        />
-      )}
+      {contextProps => {
+        const contextRequestOptions =
+          typeof contextProps.requestOptions === "function"
+            ? contextProps.requestOptions()
+            : contextProps.requestOptions || {};
+        const propsRequestOptions =
+          typeof props.requestOptions === "function" ? props.requestOptions() : props.requestOptions || {};
+
+        return (
+          <ContextlessPoll
+            {...contextProps}
+            {...props}
+            requestOptions={merge(contextRequestOptions, propsRequestOptions)}
+          />
+        );
+      }}
     </RestfulReactConsumer>
   );
 }