Add extensions to response struct

99designs · Sep 17, 2018 · 60196b8 · 60196b8
1 parent bfb48f2
commit 60196b8
Show file tree

Hide file tree

Showing 13 changed files with 79 additions and 51 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
@@ -126,9 +126,9 @@ func (e *executableSchema) Query(ctx context.Context, op *ast.OperationDefinitio
 		})
 
 		return &graphql.Response{
-			Data:   buf,
-			Errors: ec.Errors,
-		}
+			Data:       buf,
+			Errors:     ec.Errors,
+			Extensions: ec.Extensions,		}
 	{{- else }}
 		return graphql.ErrorResponse(ctx, "queries are not supported")
 	{{- end }}
@@ -146,8 +146,9 @@ func (e *executableSchema) Mutation(ctx context.Context, op *ast.OperationDefini
 		})
 
 		return &graphql.Response{
-			Data:   buf,
-			Errors: ec.Errors,
+			Data:       buf,
+			Errors:     ec.Errors,
+			Extensions: ec.Extensions,
 		}
 	{{- else }}
 		return graphql.ErrorResponse(ctx, "mutations are not supported")
@@ -181,8 +182,9 @@ func (e *executableSchema) Subscription(ctx context.Context, op *ast.OperationDe
 			}
 
 			return &graphql.Response{
-				Data:   buf,
-				Errors: ec.Errors,
+				Data:       buf,
+				Errors:     ec.Errors,
+				Extensions: ec.Extensions,
 			}
 		}
 	{{- else }}

diff --git a/codegen/testserver/generated.go b/codegen/testserver/generated.go
diff --git a/example/chat/generated.go b/example/chat/generated.go
diff --git a/example/config/generated.go b/example/config/generated.go
diff --git a/example/dataloader/generated.go b/example/dataloader/generated.go
diff --git a/example/scalars/generated.go b/example/scalars/generated.go
diff --git a/example/selection/generated.go b/example/selection/generated.go
diff --git a/example/starwars/generated.go b/example/starwars/generated.go
diff --git a/example/todo/generated.go b/example/todo/generated.go
diff --git a/graphql/context.go b/graphql/context.go
@@ -25,8 +25,10 @@ type RequestContext struct {
 	DirectiveMiddleware FieldMiddleware
 	RequestMiddleware   RequestMiddleware
 
-	errorsMu sync.Mutex
-	Errors   gqlerror.List
+	errorsMu     sync.Mutex
+	Errors       gqlerror.List
+	extensionsMu sync.Mutex
+	Extensions   map[string]interface{}
 }
 
 func DefaultResolverMiddleware(ctx context.Context, next Resolver) (res interface{}, err error) {
@@ -176,3 +178,20 @@ func AddError(ctx context.Context, err error) {
 func AddErrorf(ctx context.Context, format string, args ...interface{}) {
 	GetRequestContext(ctx).Errorf(ctx, format, args...)
 }
+
+// RegisterExtension registers an extension, returns error if extension has already been registered
+func (c *RequestContext) RegisterExtension(key string, value interface{}) error {
+	c.extensionsMu.Lock()
+	defer c.extensionsMu.Unlock()
+
+	if c.Extensions == nil {
+		c.Extensions = make(map[string]interface{})
+	}
+
+	if _, ok := c.Extensions[key]; ok {
+		return fmt.Errorf("extension already registered for key %s", key)
+	}
+
+	c.Extensions[key] = value
+	return nil
+}
diff --git a/graphql/response.go b/graphql/response.go
@@ -9,8 +9,9 @@ import (
 )
 
 type Response struct {
-	Data   json.RawMessage `json:"data"`
-	Errors gqlerror.List   `json:"errors,omitempty"`
+	Data       json.RawMessage        `json:"data"`
+	Errors     gqlerror.List          `json:"errors,omitempty"`
+	Extensions map[string]interface{} `json:"extensions,omitempty"`
 }
 
 func ErrorResponse(ctx context.Context, messagef string, args ...interface{}) *Response {

diff --git a/integration/generated.go b/integration/generated.go