remove calculate headers as a function (#1337)

apollographql · Jul 13, 2018 · 78dcf4f · 78dcf4f
1 parent 7f157da
commit 78dcf4f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 12 deletions.
diff --git a/packages/apollo-server-core/src/caching.ts b/packages/apollo-server-core/src/caching.ts
@@ -1,10 +1,6 @@
 import { ExecutionResult } from 'graphql';
 import { CacheControlFormat } from 'apollo-cache-control';
 
-export type HttpHeaderCalculation = (
-  responses: Array<ExecutionResult & { extensions?: Record<string, any> }>,
-) => Record<string, string>;
-
 export function calculateCacheControlHeaders(
   responses: Array<ExecutionResult & { extensions?: Record<string, any> }>,
 ): Record<string, string> {

diff --git a/packages/apollo-server-core/src/graphqlOptions.ts b/packages/apollo-server-core/src/graphqlOptions.ts
@@ -3,7 +3,6 @@ import {
   ValidationContext,
   GraphQLFieldResolver,
 } from 'graphql';
-import { HttpHeaderCalculation } from './caching';
 import { GraphQLExtension } from 'graphql-extensions';
 import { CacheControlExtensionOptions } from 'apollo-cache-control';
 import { KeyValueCache } from 'apollo-server-caching';
@@ -42,7 +41,7 @@ export interface GraphQLServerOptions<
   cacheControl?:
     | boolean
     | (CacheControlExtensionOptions & {
-        calculateHttpHeaders?: boolean | HttpHeaderCalculation;
+        calculateHttpHeaders?: boolean;
         stripFormattedExtensions?: boolean;
       });
   extensions?: Array<() => GraphQLExtension>;

diff --git a/packages/apollo-server-core/src/runHttpQuery.ts b/packages/apollo-server-core/src/runHttpQuery.ts
@@ -16,7 +16,7 @@ import {
   PersistedQueryNotSupportedError,
   PersistedQueryNotFoundError,
 } from 'apollo-server-errors';
-import { calculateCacheControlHeaders, HttpHeaderCalculation } from './caching';
+import { calculateCacheControlHeaders } from './caching';
 
 export interface HttpQueryRequest {
   method: string;
@@ -103,7 +103,7 @@ export async function runHttpQuery(
     process.env.NODE_ENV !== 'production' && process.env.NODE_ENV !== 'test';
   let cacheControl:
     | CacheControlExtensionOptions & {
-        calculateHttpHeaders: boolean | HttpHeaderCalculation;
+        calculateHttpHeaders: boolean;
         stripFormattedExtensions: boolean;
       }
     | undefined;
@@ -445,10 +445,7 @@ export async function runHttpQuery(
 
   if (cacheControl) {
     if (cacheControl.calculateHttpHeaders) {
-      const calculatedHeaders =
-        typeof cacheControl.calculateHttpHeaders === 'function'
-          ? cacheControl.calculateHttpHeaders(responses)
-          : calculateCacheControlHeaders(responses);
+      const calculatedHeaders = calculateCacheControlHeaders(responses);
 
       responseInit.headers = {
         ...responseInit.headers,