Parent resolver generated contexts

99designs · Oct 2, 2018 · faf0416 · faf0416
1 parent 14cf46b
commit faf0416
Show file tree

Hide file tree

Showing 17 changed files with 1,250 additions and 511 deletions.
diff --git a/codegen/object.go b/codegen/object.go
@@ -203,7 +203,7 @@ func (f *Field) CallArgs() string {
 	var args []string
 
 	if f.IsResolver() {
-		args = append(args, "ctx")
+		args = append(args, "rctx")
 
 		if !f.Object.Root {
 			args = append(args, "obj")

diff --git a/codegen/templates/data.go b/codegen/templates/data.go
diff --git a/codegen/templates/field.gotpl b/codegen/templates/field.gotpl
@@ -14,6 +14,7 @@
 		ctx = graphql.WithResolverContext(ctx, &graphql.ResolverContext{
 			Field: field,
 		})
+		rctx := ctx // FIXME: subscriptions are missing request middleware stack https://github.com/99designs/gqlgen/issues/259
 		results, err := ec.resolvers.{{ $field.ShortInvocation }}
 		if err != nil {
 			ec.Error(ctx, err)
@@ -46,7 +47,8 @@
 			Field: field,
 		}
 		ctx = graphql.WithResolverContext(ctx, rctx)
-		resTmp := ec.FieldMiddleware(ctx, {{if $object.Root}}nil{{else}}obj{{end}}, func(ctx context.Context) (interface{}, error) {
+		resTmp := ec.FieldMiddleware(ctx, {{if $object.Root}}nil{{else}}obj{{end}}, func(rctx context.Context) (interface{}, error) {
+			ctx = rctx  // use context from middleware stack in children
 			{{- if $field.IsResolver }}
 				return ec.resolvers.{{ $field.ShortInvocation }}
 			{{- else if $field.IsMethod }}