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

Added vhost option for Hapi #611

Merged
merged 3 commits into from
Oct 16, 2017
Merged

Added vhost option for Hapi #611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ecc0ab
Added vhost option for Hapi
robinvdvleuten Oct 10, 2017
ec579b7
Added PR to changelog
robinvdvleuten Oct 10, 2017
4c66c40
Merge branch 'master' into hapi-vhost
martijnwalraven Oct 16, 2017
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
@@ -1,6 +1,7 @@
# Changelog

### vNEXT
* Added support for the vhost option for Hapi [PR #611](https://github.com/apollographql/apollo-server/pull/611)

### v1.1.6
* Fixes bug where CORS would not allow `Access-Control-Allow-Origin: *` with credential 'include', changed to 'same-origin' [Issue #514](https://github.com/apollographql/apollo-server/issues/514)
Expand Down
2 changes: 2 additions & 0 deletions packages/apollo-server-hapi/src/hapiApollo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export interface HapiOptionsFunction {

export interface HapiPluginOptions {
path: string;
vhost?: string;
route?: any;
graphqlOptions: GraphQLOptions | HapiOptionsFunction;
}
Expand Down Expand Up @@ -58,6 +59,7 @@ const graphqlHapi: IRegister = function(server: Server, options: HapiPluginOptio
server.route({
method: ['GET', 'POST'],
path: options.path || '/graphql',
vhost: options.vhost || undefined,
config: options.route || {},
handler: (request, reply) => runHttpQueryWrapper(options.graphqlOptions, request, reply),
});
Expand Down