Skip to content

return immediately after promise be resolved #98

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.

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

Merged
merged 1 commit into from
Aug 21, 2017
Merged
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ function graphqlHTTP(options: Options): Middleware {
// a result, otherwise return a 400: Bad Request.
if (!query) {
if (showGraphiQL) {
resolve(null);
return resolve(null);
}
throw httpError(400, 'Must provide query string.');
}
Expand All @@ -218,15 +218,15 @@ function graphqlHTTP(options: Options): Middleware {
} catch (syntaxError) {
// Return 400: Bad Request if any syntax errors errors exist.
response.status = 400;
resolve({ errors: [syntaxError] });
return resolve({ errors: [syntaxError] });
}

// Validate AST, reporting any errors.
const validationErrors = validate(schema, documentAST, validationRules);
if (validationErrors.length > 0) {
// Return 400: Bad Request if any validation errors exist.
response.status = 400;
resolve({ errors: validationErrors });
return resolve({ errors: validationErrors });
}

// Only query operations are allowed on GET requests.
Expand All @@ -238,7 +238,7 @@ function graphqlHTTP(options: Options): Middleware {
// provide it to GraphiQL so that the requester may perform it
// themselves if desired.
if (showGraphiQL) {
resolve(null);
return resolve(null);
}

// Otherwise, report a 405: Method Not Allowed error.
Expand Down