Skip to content
This repository has been archived by the owner on Mar 20, 2023. It is now read-only.

Simplify "validationRules" processing #496

Merged
merged 1 commit into from
May 15, 2019
Merged

Simplify "validationRules" processing #496

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 5 additions & 10 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,14 +242,10 @@ function graphqlHTTP(options: Options): Middleware {
const rootValue = optionsData.rootValue;
const fieldResolver = optionsData.fieldResolver;
const typeResolver = optionsData.typeResolver;
const validationRules = optionsData.validationRules || [];
const graphiql = optionsData.graphiql;
context = optionsData.context || request;

let validationRules = specifiedRules;
if (optionsData.validationRules) {
validationRules = validationRules.concat(optionsData.validationRules);
}

// GraphQL HTTP only supports GET and POST methods.
if (request.method !== 'GET' && request.method !== 'POST') {
response.setHeader('Allow', 'GET, POST');
Expand Down Expand Up @@ -292,11 +288,10 @@ function graphqlHTTP(options: Options): Middleware {
}

// Validate AST, reporting any errors.
const validationErrors = validateFn(
schema,
documentAST,
validationRules,
);
const validationErrors = validateFn(schema, documentAST, [
...specifiedRules,
...validationRules,
]);

if (validationErrors.length > 0) {
// Return 400: Bad Request if any validation errors exist.
Expand Down