From 9b0efa03bac7220f1d9a61dc54110737abb8a62e Mon Sep 17 00:00:00 2001 From: michiel de wilde Date: Mon, 16 Dec 2019 14:14:07 +0100 Subject: [PATCH 1/2] feature: Add delegate option to cors middleware --- packages/apollo-server-express/src/ApolloServer.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-express/src/ApolloServer.ts b/packages/apollo-server-express/src/ApolloServer.ts index 82729e517f0..9fd6915ab56 100644 --- a/packages/apollo-server-express/src/ApolloServer.ts +++ b/packages/apollo-server-express/src/ApolloServer.ts @@ -24,7 +24,7 @@ export { GraphQLOptions, GraphQLExtension } from 'apollo-server-core'; export interface GetMiddlewareOptions { path?: string; - cors?: corsMiddleware.CorsOptions | boolean; + cors?: corsMiddleware.CorsOptions | corsMiddleware.CorsOptionsDelegate | boolean; bodyParserConfig?: OptionsJson | boolean; onHealthCheck?: (req: express.Request) => Promise; disableHealthCheck?: boolean; From 676b776fbcdf9be8119022b5b3b7e1b4b5a87e76 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 31 Jan 2020 20:36:20 +0200 Subject: [PATCH 2/2] Add CHANGELOG.md for #3613. --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ceb50d35aa0..8fa0bd5d932 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ The version headers in this history reflect the versions of Apollo Server itself > The changes noted within this `vNEXT` section have not been released yet. New PRs and commits which introduce changes should include an entry in this `vNEXT` section as part of their development. When a release is being prepared, a new header will be (manually) created below and the the appropriate changes within that release will be moved into the new section. - Move TContext generic from requestDidStart method to ApolloServerPlugin Interface [#3525](https://github.com/apollographql/apollo-server/pull/3525) +- `apollo-server-express`: Support `CorsOptionsDelegate` type on `cors` parameter to `applyMiddleware`, to align with the supported type of the underlying [`cors`](https://npm.im/cors) middleware [itself](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/31483b781ac30f98bdf4d40a517e921f2fc2ce37/types/cors/index.d.ts#L32). [PR #3613](https://github.com/apollographql/apollo-server/pull/3613) ### v2.9.13