Additionally remove dependency on gorilla/schema

Author: AmandaCameron

handler.go

@@ -4,10 +4,11 @@ import (
 	"encoding/json"
 	"io/ioutil"
 	"net/http"
+	"net/url"
 	"strings"
 
-	"github.com/gorilla/schema"
 	"github.com/graphql-go/graphql"
+
 	"golang.org/x/net/context"
 )
 
@@ -17,8 +18,6 @@ const (
 	ContentTypeFormURLEncoded = "application/x-www-form-urlencoded"
 )
 
-var decoder = schema.NewDecoder()
-
 type Handler struct {
 	Schema *graphql.Schema
 
@@ -37,26 +36,34 @@ type requestOptionsCompatibility struct {
 	OperationName string `json:"operationName" url:"operationName" schema:"operationName"`
 }
 
-// RequestOptions Parses a http.Request into GraphQL request options struct
-func NewRequestOptions(r *http.Request) *RequestOptions {
-
-	query := r.URL.Query().Get("query")
+func getFromForm(values url.Values) *RequestOptions {
+	query := values.Get("query")
 	if query != "" {
-
 		// get variables map
 		var variables map[string]interface{}
-		variablesStr := r.URL.Query().Get("variables")
+		variablesStr := values.Get("variables")
 		json.Unmarshal([]byte(variablesStr), variables)
 
 		return &RequestOptions{
 			Query:         query,
 			Variables:     variables,
-			OperationName: r.URL.Query().Get("operationName"),
+			OperationName: values.Get("operationName"),
 		}
 	}
+
+	return nil
+}
+
+// RequestOptions Parses a http.Request into GraphQL request options struct
+func NewRequestOptions(r *http.Request) *RequestOptions {
+	if reqOpt := getFromForm(r.URL.Query()); reqOpt != nil {
+		return reqOpt
+	}
+
 	if r.Method != "POST" {
 		return &RequestOptions{}
 	}
+
 	if r.Body == nil {
 		return &RequestOptions{}
 	}
@@ -76,16 +83,16 @@ func NewRequestOptions(r *http.Request) *RequestOptions {
 			Query: string(body),
 		}
 	case ContentTypeFormURLEncoded:
-		var opts RequestOptions
-		err := r.ParseForm()
-		if err != nil {
+		if err := r.ParseForm(); err != nil {
 			return &RequestOptions{}
 		}
-		err = decoder.Decode(&opts, r.PostForm)
-		if err != nil {
-			return &RequestOptions{}
+
+		if reqOpt := getFromForm(r.PostForm); reqOpt != nil {
+			return reqOpt
 		}
-		return &opts
+
+		return &RequestOptions{}
+
 	case ContentTypeJSON:
 		fallthrough
 	default: