Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cloud-functions: Send CORS headers on OPTIONS requests. #3557

Merged
merged 5 commits into from
Dec 18, 2019
Merged

cloud-functions: Send CORS headers on OPTIONS requests. #3557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
74dd6e6
Fix a CORS issue
dadvir Nov 25, 2019
4989a32
Merge branch 'master' into patch-1
dadvir Nov 25, 2019
5ecbf1a
Merge branch 'master' into patch-1
abernix Dec 18, 2019
64e1847
Add CHANGELOG.md for #3557.
abernix Dec 18, 2019
52e9b69
Merge remote-tracking branch 'origin/master' into HEAD
abernix Dec 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

- `apollo-server-core`: Upgrade TS to 3.7.3 [#3618](https://github.com/apollographql/apollo-server/pull/3618)
- `apollo-server-cloud-functions`: Transmit CORS headers on `OPTIONS` request. [PR #3557](https://github.com/apollographql/apollo-server/pull/3557)
- `apollo-server-caching`: De-compose options interface for `KeyValueCache.prototype.set` to accommodate better TSDoc annotations for its properties (e.g. to specify that `ttl` is defined in _seconds_). [PR #3619](https://github.com/apollographql/apollo-server/pull/3619)

### v2.9.14
Expand Down
4 changes: 2 additions & 2 deletions packages/apollo-server-cloud-functions/src/ApolloServer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@ export class ApolloServer extends ApolloServerBase {
);
}
}

res.set(corsHeaders);

if (req.method === 'OPTIONS') {
res.status(204).send('');
Expand All @@ -135,8 +137,6 @@ export class ApolloServer extends ApolloServerBase {
}
}

res.set(corsHeaders);

graphqlCloudFunction(async () => {
// In a world where this `createHandler` was async, we might avoid this
// but since we don't want to introduce a breaking change to this API
Expand Down