Merge pull request #238 from vektah/variable-validation

Add missing variable validation
99designs · Aug 1, 2018 · 600f467 · 600f467
2 parents ffee020 + d6a7625
commit 600f467
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/example/todo/todo.go b/example/todo/todo.go
@@ -1,4 +1,4 @@
-//go:generate gorunpkg github.com/vektah/gqlgen --out generated.go -v
+//go:generate gorunpkg github.com/vektah/gqlgen --out generated.go
 
 package todo
 

diff --git a/handler/graphql.go b/handler/graphql.go
@@ -12,6 +12,7 @@ import (
 	"github.com/vektah/gqlparser"
 	"github.com/vektah/gqlparser/ast"
 	"github.com/vektah/gqlparser/gqlerror"
+	"github.com/vektah/gqlparser/validator"
 )
 
 type params struct {
@@ -167,7 +168,11 @@ func GraphQL(exec graphql.ExecutableSchema, options ...Option) http.HandlerFunc
 			return
 		}
 
-		reqCtx := cfg.newRequestContext(doc, reqParams.Query, reqParams.Variables)
+		vars, err := validator.VariableValues(exec.Schema(), op, reqParams.Variables)
+		if err != nil {
+			sendError(w, http.StatusUnprocessableEntity, err)
+		}
+		reqCtx := cfg.newRequestContext(doc, reqParams.Query, vars)
 		ctx := graphql.WithRequestContext(r.Context(), reqCtx)
 
 		defer func() {

diff --git a/handler/websocket.go b/handler/websocket.go
@@ -13,6 +13,7 @@ import (
 	"github.com/vektah/gqlparser"
 	"github.com/vektah/gqlparser/ast"
 	"github.com/vektah/gqlparser/gqlerror"
+	"github.com/vektah/gqlparser/validator"
 )
 
 const (
@@ -148,7 +149,11 @@ func (c *wsConnection) subscribe(message *operationMessage) bool {
 		return true
 	}
 
-	reqCtx := c.cfg.newRequestContext(doc, reqParams.Query, reqParams.Variables)
+	vars, err := validator.VariableValues(c.exec.Schema(), op, reqParams.Variables)
+	if err != nil {
+		c.sendError(message.ID, err)
+	}
+	reqCtx := c.cfg.newRequestContext(doc, reqParams.Query, vars)
 	ctx := graphql.WithRequestContext(c.ctx, reqCtx)
 
 	if op.Operation != ast.Subscription {