Merge pull request #15 from dgraph-io/jatin/GRAPHQL-1081

fix(GRAPHQL): Remove support of String --> int32 coercion in variables.
hypermodeinc · Mar 16, 2021 · eb159c9 · eb159c9
2 parents 6adf0a9 + 06de469
commit eb159c9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/validator/vars.go b/validator/vars.go
@@ -148,7 +148,7 @@ func (v *varValidator) validateVarType(typ *ast.Type, val reflect.Value) (reflec
 		namedType := val.Type().Name()
 		switch typ.NamedType {
 		case "Int", "Int64":
-			if kind == reflect.String || kind == reflect.Int || kind == reflect.Int32 || kind == reflect.Int64 {
+			if kind == reflect.Int || kind == reflect.Int32 || kind == reflect.Int64 || (namedType == "string" && typ.NamedType == "Int64") || namedType == "Number" {
 				var errIntCoerce error
 				var valString string
 				if kind == reflect.String {

diff --git a/validator/vars_test.go b/validator/vars_test.go
@@ -343,6 +343,14 @@ func TestValidateVars(t *testing.T) {
 			require.EqualError(t, gerr, "input: variable.var cannot use float64 as Int")
 		})
 
+		t.Run("error for invalid coercing, String -> Int ", func(t *testing.T) {
+			q := gqlparser.MustLoadQuery(schema, `query foo($var: Int!) { intArg(i: $var) }`)
+			_, gerr := validator.VariableValues(schema, q.Operations.ForName(""), map[string]interface{}{
+				"var": "18",
+			})
+			require.EqualError(t, gerr, "input: variable.var cannot use string as Int")
+		})
+
 		t.Run("out of range error for Int", func(t *testing.T) {
 			q := gqlparser.MustLoadQuery(schema, `query foo($var: Int!) { intArg(i: $var) }`)
 			_, gerr := validator.VariableValues(schema, q.Operations.ForName(""), map[string]interface{}{