Fix some issues with directive middlewares

99designs · Jul 26, 2018 · 73a8e3a · 73a8e3a
1 parent 8416324
commit 73a8e3a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/codegen/templates/data.go b/codegen/templates/data.go
diff --git a/codegen/templates/generated.gotpl b/codegen/templates/generated.gotpl
@@ -150,16 +150,15 @@ type executionContext struct {
 func (ec *executionContext) FieldMiddleware(ctx context.Context, next graphql.Resolver) interface{} {
 	{{- if .Directives }}
 	rctx := graphql.GetResolverContext(ctx)
-	if len(rctx.Field.Directives) != 0 {
-		for _, d := range rctx.Field.Directives {
-			switch d.Name {
-			{{- range $directive := .Directives }}
-			case "{{$directive.Name}}":
-				next = func(ctx context.Context) (interface{}, error) {
-					return ec.directives.{{$directive.GoName}}(ctx, next)
-				}
-			{{- end }}
+	for _, d := range rctx.Field.Definition.Directives {
+		switch d.Name {
+		{{- range $directive := .Directives }}
+		case "{{$directive.Name}}":
+			n := next
+			next = func(ctx context.Context) (interface{}, error) {
+				return ec.directives.{{$directive.GoName}}(ctx, n)
 			}
+		{{- end }}
 		}
 	}
 	{{- end }}