Make sure formatResponse returning null doesn't affect the respon…

…se sent
apollographql · Mar 22, 2019 · 4e34508 · 4e34508
1 parent 992ab75
commit 4e34508
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/packages/apollo-server-core/src/requestPipeline.ts b/packages/apollo-server-core/src/requestPipeline.ts
@@ -348,12 +348,18 @@ export async function processGraphQLRequest<TContext>(
     }
 
     if (config.formatResponse) {
-      response = config.formatResponse(response, {
-        context: requestContext.context,
-      });
+      const formattedResponse: GraphQLResponse | null = config.formatResponse(
+        response,
+        {
+          context: requestContext.context,
+        },
+      );
+      if (formattedResponse != null) {
+        response = formattedResponse;
+      }
     }
 
-    return sendResponse(response!!);
+    return sendResponse(response);
   } finally {
     requestDidEnd();
   }