Merge pull request #12 from dgraph-io/jatin/GRAPHQL-1007

Fixes: GRAPHQL-1007
We have allowed to paas @cascade arguments through variables in dgraph. For that we needed input validations check which is added in this library.

gqlparser.go

@@ -25,7 +25,7 @@ func LoadQuery(schema *ast.Schema, str string) (*ast.QueryDocument, gqlerror.Lis
 	if err != nil {
 		return nil, gqlerror.List{err}
 	}
-	errs := validator.Validate(schema, query)
+	errs := validator.Validate(schema, query, nil)
 	if errs != nil {
 		return nil, errs
 	}

validator/validator.go

@@ -22,7 +22,7 @@ func AddRule(name string, f ruleFunc) {
 	rules = append(rules, rule{name: name, rule: f})
 }
 
-func Validate(schema *Schema, doc *QueryDocument) gqlerror.List {
+func Validate(schema *Schema, doc *QueryDocument, variables map[string]interface{}) gqlerror.List {
 	var errs gqlerror.List
 
 	observers := &Events{}
@@ -39,6 +39,6 @@ func Validate(schema *Schema, doc *QueryDocument) gqlerror.List {
 		})
 	}
 
-	Walk(schema, doc, observers)
+	Walk(schema, doc, observers, variables)
 	return errs
 }

validator/validator_test.go

@@ -37,5 +37,5 @@ extend type Query {
 		}
 	}`})
 	require.Nil(t, err)
-	require.Nil(t, validator.Validate(s, q))
+	require.Nil(t, validator.Validate(s, q, nil))
 }

validator/vars.go

@@ -2,12 +2,11 @@ package validator
 
 import (
 	"errors"
+	"fmt"
 	"reflect"
 	"strconv"
 	"strings"
 
-	"fmt"
-
 	"github.com/dgraph-io/gqlparser/v2/ast"
 	"github.com/dgraph-io/gqlparser/v2/gqlerror"
 )

validator/walk.go

@@ -43,22 +43,23 @@ func (o *Events) OnValue(f func(walker *Walker, value *ast.Value)) {
 	o.value = append(o.value, f)
 }
 
-func Walk(schema *ast.Schema, document *ast.QueryDocument, observers *Events) {
+func Walk(schema *ast.Schema, document *ast.QueryDocument, observers *Events, variables map[string]interface{}) {
 	w := Walker{
 		Observers: observers,
 		Schema:    schema,
 		Document:  document,
+		Variables: variables,
 	}
 
 	w.walk()
 }
 
 type Walker struct {
-	Context   context.Context
-	Observers *Events
-	Schema    *ast.Schema
-	Document  *ast.QueryDocument
-
+	Context                  context.Context
+	Observers                *Events
+	Schema                   *ast.Schema
+	Document                 *ast.QueryDocument
+	Variables                map[string]interface{}
 	validatedFragmentSpreads map[string]bool
 	CurrentOperation         *ast.OperationDefinition
 }

validator/walk_test.go

@@ -25,7 +25,7 @@ func TestWalker(t *testing.T) {
 		require.Equal(t, "Query", field.ObjectDefinition.Name)
 	})
 
-	Walk(schema, query, observers)
+	Walk(schema, query, observers, nil)
 
 	require.True(t, called)
 }
@@ -46,7 +46,7 @@ func TestWalkInlineFragment(t *testing.T) {
 		require.Equal(t, "Query", field.ObjectDefinition.Name)
 	})
 
-	Walk(schema, query, observers)
+	Walk(schema, query, observers, nil)
 
 	require.True(t, called)
 }