Skip to content

Commit 7fc94c5

Browse files
authored
fix for KnownDirectives (#2037)
1 parent 5617e08 commit 7fc94c5

2 files changed

Lines changed: 63 additions & 8 deletions

File tree

‎src/main/java/graphql/validation/rules/KnownDirectives.java‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import graphql.validation.ValidationErrorType;
2020

2121
import java.util.List;
22+
import java.util.EnumSet;
2223

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

4748
@SuppressWarnings("deprecation") // the suppression stands because its deprecated but still in graphql spec
4849
private boolean hasInvalidLocation(GraphQLDirective directive, Node ancestor) {
50+
EnumSet<DirectiveLocation> validLocations = directive.validLocations();
4951
if (ancestor instanceof OperationDefinition) {
5052
Operation operation = ((OperationDefinition) ancestor).getOperation();
51-
return Operation.QUERY.equals(operation) ?
52-
!(directive.validLocations().contains(DirectiveLocation.QUERY)) :
53-
!(directive.validLocations().contains(DirectiveLocation.MUTATION));
53+
if (Operation.QUERY.equals(operation)) {
54+
return !validLocations.contains(DirectiveLocation.QUERY);
55+
} else if (Operation.MUTATION.equals(operation)) {
56+
return !validLocations.contains(DirectiveLocation.MUTATION);
57+
} else if (Operation.SUBSCRIPTION.equals(operation)) {
58+
return !validLocations.contains(DirectiveLocation.SUBSCRIPTION);
59+
}
5460
} else if (ancestor instanceof Field) {
55-
return !(directive.validLocations().contains(DirectiveLocation.FIELD));
61+
return !(validLocations.contains(DirectiveLocation.FIELD));
5662
} else if (ancestor instanceof FragmentSpread) {
57-
return !(directive.validLocations().contains(DirectiveLocation.FRAGMENT_SPREAD));
63+
return !(validLocations.contains(DirectiveLocation.FRAGMENT_SPREAD));
5864
} else if (ancestor instanceof FragmentDefinition) {
59-
return !(directive.validLocations().contains(DirectiveLocation.FRAGMENT_DEFINITION));
65+
return !(validLocations.contains(DirectiveLocation.FRAGMENT_DEFINITION));
6066
} else if (ancestor instanceof InlineFragment) {
61-
return !(directive.validLocations().contains(DirectiveLocation.INLINE_FRAGMENT));
67+
return !(validLocations.contains(DirectiveLocation.INLINE_FRAGMENT));
6268
} else if (ancestor instanceof VariableDefinition) {
63-
return !(directive.validLocations().contains(DirectiveLocation.VARIABLE_DEFINITION));
69+
return !(validLocations.contains(DirectiveLocation.VARIABLE_DEFINITION));
6470
}
6571
return true;
6672
}

‎src/test/groovy/graphql/validation/rules/KnownDirectivesTest.groovy‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package graphql.validation.rules
22

33
import graphql.StarWarsSchema
4+
import graphql.TestUtil
45
import graphql.language.Document
56
import graphql.parser.Parser
67
import graphql.validation.LanguageTraversal
@@ -9,6 +10,7 @@ import graphql.validation.TraversalContext
910
import graphql.validation.ValidationContext
1011
import graphql.validation.ValidationErrorCollector
1112
import graphql.validation.ValidationErrorType
13+
import graphql.validation.Validator
1214
import spock.lang.Specification
1315

1416
class KnownDirectivesTest extends Specification {
@@ -234,5 +236,52 @@ class KnownDirectivesTest extends Specification {
234236

235237
}
236238

239+
def sdl = '''
240+
241+
directive @queryDirective on QUERY
242+
243+
directive @subDirective on SUBSCRIPTION
244+
245+
type Query {
246+
field: String
247+
}
248+
249+
'''
250+
251+
def schema = TestUtil.schema(sdl)
252+
253+
254+
def "invalid directive on SUBSCRIPTION"() {
255+
def spec = '''
256+
subscription sub @queryDirective{
257+
field
258+
}
259+
'''
260+
261+
when:
262+
def document = TestUtil.parseQuery(spec)
263+
def validator = new Validator();
264+
def validationErrors = validator.validateDocument(schema, document);
265+
266+
then:
267+
validationErrors.size() == 1
268+
validationErrors.get(0).message == "Validation error of type MisplacedDirective: Directive queryDirective not allowed here"
269+
}
270+
271+
def "valid directive on SUBSCRIPTION"() {
272+
def spec = '''
273+
subscription sub @subDirective{
274+
field
275+
}
276+
'''
277+
278+
when:
279+
def document = TestUtil.parseQuery(spec)
280+
def validator = new Validator();
281+
def validationErrors = validator.validateDocument(schema, document);
282+
283+
then:
284+
validationErrors.size() == 0
285+
}
237286

238287
}

0 commit comments

Comments
 (0)