Make request options asyncable

contiamo · Dec 13, 2019 · d10cbe4 · d10cbe4
1 parent c11818e
commit d10cbe4
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 15 deletions.
diff --git a/src/Context.tsx b/src/Context.tsx
@@ -18,7 +18,7 @@ export interface RestfulReactProviderProps<T = any> {
   /**
    * Options passed to the fetch request.
    */
-  requestOptions?: (() => Partial<RequestInit>) | Partial<RequestInit>;
+  requestOptions?: (() => Partial<RequestInit> | Promise<Partial<RequestInit>>) | Partial<RequestInit>;
   /**
    * Trigger on each error.
    * For `Get` and `Mutation` calls, you can also call `retry` to retry the exact same request.
@@ -48,7 +48,7 @@ export interface InjectedProps {
 }
 
 export default class RestfulReactProvider<T> extends React.Component<RestfulReactProviderProps<T>> {
-  static displayName = "RestfulProviderContext";
+  public static displayName = "RestfulProviderContext";
 
   public render() {
     const { children, ...value } = this.props;
@@ -69,4 +69,4 @@ export default class RestfulReactProvider<T> extends React.Component<RestfulReac
   }
 }
 
-export const RestfulReactConsumer = Context.Consumer;
+export const RestfulReactConsumer = Context.Consumer;
diff --git a/src/Get.tsx b/src/Get.tsx
@@ -204,20 +204,21 @@ class ContextlessGet<TData, TError, TQueryParams> extends React.Component<
     this.abortController.abort();
   }
 
-  public getRequestOptions = (
+  public getRequestOptions = async (
     extraOptions?: Partial<RequestInit>,
     extraHeaders?: boolean | { [key: string]: string },
   ) => {
     const { requestOptions } = this.props;
 
     if (typeof requestOptions === "function") {
+      const options = (await requestOptions()) || {};
       return {
         ...extraOptions,
-        ...requestOptions(),
+        ...options,
         headers: new Headers({
           ...(typeof extraHeaders !== "boolean" ? extraHeaders : {}),
           ...(extraOptions || {}).headers,
-          ...(requestOptions() || {}).headers,
+          ...options.headers,
         }),
       };
     }
@@ -254,7 +255,7 @@ class ContextlessGet<TData, TError, TQueryParams> extends React.Component<
       return url;
     };
 
-    const request = new Request(makeRequestPath(), this.getRequestOptions(thisRequestOptions));
+    const request = new Request(makeRequestPath(), await this.getRequestOptions(thisRequestOptions));
     try {
       const response = await fetch(request, { signal: this.signal });
       const { data, responseError } = await processResponse(response);

diff --git a/src/Mutate.tsx b/src/Mutate.tsx
@@ -166,7 +166,7 @@ class ContextlessMutate<TData, TError, TQueryParams, TRequestBody> extends React
       headers: {
         "content-type": typeof body === "object" ? "application/json" : "text/plain",
         ...(typeof providerRequestOptions === "function"
-          ? providerRequestOptions().headers
+          ? (await providerRequestOptions()).headers
           : (providerRequestOptions || {}).headers),
         ...(mutateRequestOptions ? mutateRequestOptions.headers : {}),
       },

diff --git a/src/Poll.tsx b/src/Poll.tsx
@@ -219,7 +219,7 @@ class ContextlessPoll<TData, TError, TQueryParams> extends React.Component<
     // If we should keep going,
     const { base, path, interval, wait } = this.props;
     const { lastPollIndex } = this.state;
-    const requestOptions = this.getRequestOptions();
+    const requestOptions = await this.getRequestOptions();
 
     let url = composeUrl(base!, "", path);
 
@@ -343,13 +343,13 @@ function Poll<TData = any, TError = any, TQueryParams = { [key: string]: any }>(
   // Compose Contexts to allow for URL nesting
   return (
     <RestfulReactConsumer>
-      {contextProps => {
+      {async contextProps => {
         const contextRequestOptions =
           typeof contextProps.requestOptions === "function"
             ? contextProps.requestOptions()
             : contextProps.requestOptions || {};
         const propsRequestOptions =
-          typeof props.requestOptions === "function" ? props.requestOptions() : props.requestOptions || {};
+          typeof props.requestOptions === "function" ? await props.requestOptions() : props.requestOptions || {};
 
         return (
           <ContextlessPoll

diff --git a/src/useGet.tsx b/src/useGet.tsx
@@ -87,10 +87,10 @@ async function _fetchData<TData, TError, TQueryParams>(
   }
 
   const requestOptions =
-    (typeof props.requestOptions === "function" ? props.requestOptions() : props.requestOptions) || {};
+    (typeof props.requestOptions === "function" ? await props.requestOptions() : props.requestOptions) || {};
 
   const contextRequestOptions =
-    (typeof context.requestOptions === "function" ? context.requestOptions() : context.requestOptions) || {};
+    (typeof context.requestOptions === "function" ? await context.requestOptions() : context.requestOptions) || {};
 
   const request = new Request(
     resolvePath(base, path, { ...context.queryParams, ...queryParams }),

diff --git a/src/useMutate.tsx b/src/useMutate.tsx
@@ -78,10 +78,10 @@ export function useMutate<
       const signal = abortController.current.signal;
 
       const propsRequestOptions =
-        (typeof props.requestOptions === "function" ? props.requestOptions() : props.requestOptions) || {};
+        (typeof props.requestOptions === "function" ? await props.requestOptions() : props.requestOptions) || {};
 
       const contextRequestOptions =
-        (typeof context.requestOptions === "function" ? context.requestOptions() : context.requestOptions) || {};
+        (typeof context.requestOptions === "function" ? await context.requestOptions() : context.requestOptions) || {};
 
       const options: RequestInit = {
         method: verb,