Skip to content
Merged
Show file tree
Hide file tree
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
22 changes: 14 additions & 8 deletions src/main/java/graphql/validation/rules/KnownDirectives.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import graphql.validation.ValidationErrorType;

import java.util.List;
import java.util.EnumSet;

@Internal
public class KnownDirectives extends AbstractRule {
Expand Down Expand Up @@ -46,21 +47,26 @@ public void checkDirective(Directive directive, List<Node> ancestors) {

@SuppressWarnings("deprecation") // the suppression stands because its deprecated but still in graphql spec
private boolean hasInvalidLocation(GraphQLDirective directive, Node ancestor) {
EnumSet<DirectiveLocation> validLocations = directive.validLocations();
if (ancestor instanceof OperationDefinition) {
Operation operation = ((OperationDefinition) ancestor).getOperation();
return Operation.QUERY.equals(operation) ?
!(directive.validLocations().contains(DirectiveLocation.QUERY)) :
!(directive.validLocations().contains(DirectiveLocation.MUTATION));
if (Operation.QUERY.equals(operation)) {
return !validLocations.contains(DirectiveLocation.QUERY);
} else if (Operation.MUTATION.equals(operation)) {
return !validLocations.contains(DirectiveLocation.MUTATION);
} else if (Operation.SUBSCRIPTION.equals(operation)) {
return !validLocations.contains(DirectiveLocation.SUBSCRIPTION);
}
} else if (ancestor instanceof Field) {
return !(directive.validLocations().contains(DirectiveLocation.FIELD));
return !(validLocations.contains(DirectiveLocation.FIELD));
} else if (ancestor instanceof FragmentSpread) {
return !(directive.validLocations().contains(DirectiveLocation.FRAGMENT_SPREAD));
return !(validLocations.contains(DirectiveLocation.FRAGMENT_SPREAD));
} else if (ancestor instanceof FragmentDefinition) {
return !(directive.validLocations().contains(DirectiveLocation.FRAGMENT_DEFINITION));
return !(validLocations.contains(DirectiveLocation.FRAGMENT_DEFINITION));
} else if (ancestor instanceof InlineFragment) {
return !(directive.validLocations().contains(DirectiveLocation.INLINE_FRAGMENT));
return !(validLocations.contains(DirectiveLocation.INLINE_FRAGMENT));
} else if (ancestor instanceof VariableDefinition) {
return !(directive.validLocations().contains(DirectiveLocation.VARIABLE_DEFINITION));
return !(validLocations.contains(DirectiveLocation.VARIABLE_DEFINITION));
}
return true;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package graphql.validation.rules

import graphql.StarWarsSchema
import graphql.TestUtil
import graphql.language.Document
import graphql.parser.Parser
import graphql.validation.LanguageTraversal
Expand All @@ -9,6 +10,7 @@ import graphql.validation.TraversalContext
import graphql.validation.ValidationContext
import graphql.validation.ValidationErrorCollector
import graphql.validation.ValidationErrorType
import graphql.validation.Validator
import spock.lang.Specification

class KnownDirectivesTest extends Specification {
Expand Down Expand Up @@ -234,5 +236,52 @@ class KnownDirectivesTest extends Specification {

}

def sdl = '''
directive @queryDirective on QUERY
directive @subDirective on SUBSCRIPTION
type Query {
field: String
}
'''

def schema = TestUtil.schema(sdl)


def "invalid directive on SUBSCRIPTION"() {
def spec = '''
subscription sub @queryDirective{
field
}
'''

when:
def document = TestUtil.parseQuery(spec)
def validator = new Validator();
def validationErrors = validator.validateDocument(schema, document);

then:
validationErrors.size() == 1
validationErrors.get(0).message == "Validation error of type MisplacedDirective: Directive queryDirective not allowed here"
}

def "valid directive on SUBSCRIPTION"() {
def spec = '''
subscription sub @subDirective{
field
}
'''

when:
def document = TestUtil.parseQuery(spec)
def validator = new Validator();
def validationErrors = validator.validateDocument(schema, document);

then:
validationErrors.size() == 0
}

}