hiro/apollo-server
1
0
Fork 0
mirror of https://github.com/vale981/apollo-server synced 2025-03-05 17:51:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use graphiql option variables if query variables are not supplied

Browse source
This commit is contained in:
Alan Christensen 2016-12-26 15:39:44 -06:00
parent ebe86044f4
commit 539dd641bf
6 changed files with 37 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -1,6 +1,8 @@
# Changelog
### VNEXT
* Fix GraphiQL options variables. Issue #193. ([@alanchristensen](https://github.com/alanchristensen)) on
[PR #255](https://github.com/apollostack/apollo-server/pull/255)
### v0.5.1
* add support for HTTP GET Method ([@DxCx](https://github.com/DxCx)) on [#180](https://github.com/apollostack/graphql-server/pull/180)

3
packages/graphql-server-express/src/expressApollo.ts
View file

@ -68,13 +68,12 @@ export function graphiqlExpress(options: GraphiQL.GraphiQLData) {
return (req: express.Request, res: express.Response) => {
const q = req.url && url.parse(req.url, true).query || {};
const query = q.query || '';
const variables = q.variables || '{}';
const operationName = q.operationName || '';
const graphiQLString = GraphiQL.renderGraphiQL({
endpointURL: options.endpointURL,
query: query || options.query,
variables: JSON.parse(variables) || options.variables,
variables: q.variables && JSON.parse(q.variables) || options.variables,
operationName: operationName || options.operationName,
passHeader: options.passHeader,
});

4
packages/graphql-server-hapi/src/hapiApollo.test.ts
View file

@ -24,9 +24,7 @@ function createApp(options: CreateAppOptions) {
register: graphiqlHapi,
options: {
path: '/graphiql',
graphiqlOptions: {
endpointURL: '/graphql',
},
graphiqlOptions: (options && options.graphiqlOptions) || { endpointURL: '/graphql' },
},
});

4
packages/graphql-server-hapi/src/hapiApollo.ts
View file

@ -112,7 +112,7 @@ graphiqlHapi.attributes = {
function getGraphiQLParams(request, reply) {
const q = request.query || {};
const query = q.query || '';
const variables = q.variables || '{}';
const variables = q.variables;
const operationName = q.operationName || '';
reply({ query, variables, operationName});
}
@ -122,7 +122,7 @@ function renderGraphiQL(route, graphiqlParams: any, reply) {
const graphiQLString = GraphiQL.renderGraphiQL({
endpointURL: graphiqlOptions.endpointURL,
query: graphiqlParams.query || graphiqlOptions.query,
variables: JSON.parse(graphiqlParams.variables) || graphiqlOptions.variables,
variables: graphiqlParams.variables && JSON.parse(graphiqlParams.variables) || graphiqlOptions.variables,
operationName: graphiqlParams.operationName || graphiqlOptions.operationName,
passHeader: graphiqlOptions.passHeader,
});

30
packages/graphql-server-integration-testsuite/src/index.ts
View file

@ -693,6 +693,36 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => {
expect(response.text).to.include('graphiql.min.js');
});
});
it('presents options variables', () => {
app = createApp({graphiqlOptions: {
endpointURL: '/graphql',
variables: {key: 'optionsValue'},
}});
const req = request(app)
.get('/graphiql')
.set('Accept', 'text/html');
return req.then((response) => {
expect(response.status).to.equal(200);
expect(response.text.replace(/\s/g, '')).to.include('variables:"{\\n\\"key\\":\\"optionsValue\\"\\n}"');
});
});
it('presents query variables over options variables', () => {
app = createApp({graphiqlOptions: {
endpointURL: '/graphql',
variables: {key: 'optionsValue'},
}});
const req = request(app)
.get('/graphiql?variables={"key":"queryValue"}')
.set('Accept', 'text/html');
return req.then((response) => {
expect(response.status).to.equal(200);
expect(response.text.replace(/\s/g, '')).to.include('variables:"{\\n\\"key\\":\\"queryValue\\"\\n}"');
});
});
});
describe('stored queries', () => {

3
packages/graphql-server-koa/src/koaApollo.ts
View file

@ -49,13 +49,12 @@ export function graphiqlKoa(options: GraphiQL.GraphiQLData) {
const q = ctx.request.query || {};
const query = q.query || '';
const variables = q.variables || '{}';
const operationName = q.operationName || '';
const graphiQLString = GraphiQL.renderGraphiQL({
endpointURL: options.endpointURL,
query: query || options.query,
variables: JSON.parse(variables) || options.variables,
variables: q.variables && JSON.parse(q.variables) || options.variables,
operationName: operationName || options.operationName,
passHeader: options.passHeader,
});