Restored interface for backward compatibility

Author: nicholasjackson

handler.go

@@ -1,6 +1,7 @@
 package handler
 
 import (
+	"context"
 	"encoding/json"
 	"io/ioutil"
 	"net/http"
@@ -113,7 +114,7 @@ func NewRequestOptions(r *http.Request) *RequestOptions {
 
 // ContextHandler provides an entrypoint into executing graphQL queries with a
 // user-provided context.
-func (h *Handler) ContextHandler(w http.ResponseWriter, r *http.Request) {
+func (h *Handler) ContextHandler(ctx context.Context, w http.ResponseWriter, r *http.Request) {
 	// get query
 	opts := NewRequestOptions(r)
 
@@ -123,7 +124,7 @@ func (h *Handler) ContextHandler(w http.ResponseWriter, r *http.Request) {
 		RequestString:  opts.Query,
 		VariableValues: opts.Variables,
 		OperationName:  opts.OperationName,
-		Context:        r.Context(),
+		Context:        ctx,
 	}
 	result := graphql.Do(params)
 
@@ -142,7 +143,7 @@ func (h *Handler) ContextHandler(w http.ResponseWriter, r *http.Request) {
 
 // ServeHTTP provides an entrypoint into executing graphQL queries.
 func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	h.ContextHandler(w, r)
+	h.ContextHandler(r.Context(), w, r)
 }
 
 type Config struct {

handler_test.go

@@ -70,7 +70,7 @@ func TestContextPropagated(t *testing.T) {
 	*req = *req.WithContext(context.WithValue(context.Background(), "name", "context-data"))
 	resp := httptest.NewRecorder()
 
-	h.ContextHandler(resp, req)
+	h.ContextHandler(req.Context(), resp, req)
 
 	result := decodeResponse(t, resp)