Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix issue #160: validateVarType parsing numbers #162

Closed
wants to merge 1 commit into from
Closed

fix issue #160: validateVarType parsing numbers #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions validator/vars.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package validator

import (
"encoding/json"
"reflect"
"strings"

Expand Down Expand Up @@ -29,6 +30,7 @@ func VariableValues(schema *ast.Schema, op *ast.OperationDefinition, variables m
}

val, hasValue := variables[v.Variable]

if !hasValue {
if v.DefaultValue != nil {
var err error
Expand All @@ -50,6 +52,24 @@ func VariableValues(schema *ast.Schema, op *ast.OperationDefinition, variables m
coercedVars[v.Variable] = nil
} else {
rv := reflect.ValueOf(val)

jsonNumber, isJsonNumber := val.(json.Number)
if isJsonNumber {
if v.Type.NamedType == "Int" {
n, err := jsonNumber.Int64()
if err != nil {
return nil, gqlerror.ErrorPathf(validator.path, "cannot use value %s as %s", n, v.Type.NamedType)
Copy link

@si3nloong si3nloong Sep 30, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see you have typo here, it should be

gqlerror.ErrorPathf(validator.path, "cannot use value %d as %s", n, v.Type.NamedType)

Because n is not a string, it's a int64

}
rv = reflect.ValueOf(n)
} else if v.Type.NamedType == "Float" {
f, err := jsonNumber.Float64()
if err != nil {
return nil, gqlerror.ErrorPathf(validator.path, "cannot use value %f as %s", f, v.Type.NamedType)
}
rv = reflect.ValueOf(f)

}
}
if rv.Kind() == reflect.Ptr || rv.Kind() == reflect.Interface {
rv = rv.Elem()
}
Expand Down
15 changes: 11 additions & 4 deletions validator/vars_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ import (
"io/ioutil"
"testing"

"encoding/json"

"github.com/stretchr/testify/require"
"github.com/vektah/gqlparser/v2"
"github.com/vektah/gqlparser/v2/ast"
Expand Down Expand Up @@ -272,10 +270,19 @@ func TestValidateVars(t *testing.T) {
t.Run("Json Number -> Int", func(t *testing.T) {
q := gqlparser.MustLoadQuery(schema, `query foo($var: Int) { optionalIntArg(i: $var) }`)
vars, gerr := validator.VariableValues(schema, q.Operations.ForName(""), map[string]interface{}{
"var": json.Number("10"),
"var": 10,
})
require.Nil(t, gerr)
require.Equal(t, 10, vars["var"])
})

t.Run("Json Number -> Float", func(t *testing.T) {
q := gqlparser.MustLoadQuery(schema, `query foo($var: Float!) { floatArg(i: $var) }`)
vars, gerr := validator.VariableValues(schema, q.Operations.ForName(""), map[string]interface{}{
"var": 10.2,
})
require.Nil(t, gerr)
require.Equal(t, json.Number("10"), vars["var"])
require.Equal(t, 10.2, vars["var"])
})

t.Run("Nil -> Int", func(t *testing.T) {
Expand Down