Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Diagnostics.CodeAnalysis;
using System.Globalization;
using System.IO.Pipelines;
using System.Text.Json;
using Microsoft.AspNetCore.Http;
Expand Down Expand Up @@ -418,7 +419,7 @@ private static IValueNode ParseValueNode(object? value, ITypeDefinition type)
return new IntValueNode(i);
}

if (value is string s && int.TryParse(s, out var intValue))
if (value is string s && int.TryParse(s, NumberStyles.Integer, CultureInfo.InvariantCulture, out var intValue))
{
return new IntValueNode(intValue);
}
Expand Down Expand Up @@ -449,7 +450,14 @@ private static IValueNode ParseValueNode(object? value, ITypeDefinition type)
return new FloatValueNode(d);
}

if (value is string s && double.TryParse(s, out var doubleValue))
if (value is string s
&& double.TryParse(
s,
NumberStyles.Float,
CultureInfo.InvariantCulture,
out var doubleValue)
&& !double.IsNaN(doubleValue)
&& !double.IsInfinity(doubleValue))
{
return new FloatValueNode(doubleValue);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,48 @@ query GetUser($userName: String!) @http(method: GET, route: "/users-details", qu
response.MatchSnapshot();
}

[Fact]
public async Task Http_Get_With_Query_Parameter_Float_Value()
{
// arrange
var storage = new TestOpenApiDefinitionStorage(
"""
query SearchProducts($text: String, $minPrice: Float)
@http(method: GET, route: "/search", queryParameters: ["text", "minPrice"]) {
searchProducts(text: $text, minPrice: $minPrice)
}
""");
var server = CreateTestServer(storage);
var client = server.CreateClient();

// act
var response = await client.GetAsync("/search?text=Bed&minPrice=500");

// assert
response.MatchSnapshot();
}

[Fact]
public async Task Http_Get_With_Query_Parameter_Float_Value_With_Decimals()
{
// arrange
var storage = new TestOpenApiDefinitionStorage(
"""
query SearchProducts($text: String, $minPrice: Float)
@http(method: GET, route: "/search", queryParameters: ["text", "minPrice"]) {
searchProducts(text: $text, minPrice: $minPrice)
}
""");
var server = CreateTestServer(storage);
var client = server.CreateClient();

// act
var response = await client.GetAsync("/search?text=Bed&minPrice=500.99");

// assert
response.MatchSnapshot();
}

[Fact]
public async Task Http_Get_Invalid_Type_In_Route_Parameter()
{
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Headers:
Content-Type: application/json
-------------------------->
Status Code: OK
-------------------------->
"Searched for: Bed, minPrice: 500"
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Headers:
Content-Type: application/json
-------------------------->
Status Code: OK
-------------------------->
"Searched for: Bed, minPrice: 500.99"
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System.Globalization;
using System.Text.Json;
using HotChocolate.Authorization;
using HotChocolate.Features;
Expand Down Expand Up @@ -87,6 +88,12 @@ public ComplexObject GetComplexObject(ComplexObjectInput input)
input.Url,
input.Uuid);
}

public string SearchProducts(string? text, float? minPrice)
{
var formattedMinPrice = minPrice?.ToString(CultureInfo.InvariantCulture);
return $"Searched for: {text ?? "all"}, minPrice: {formattedMinPrice}";
}
Comment thread
tobias-tengler marked this conversation as resolved.
}

public class Mutation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ private FusionScalarTypeDefinition CreateSpecScalar(string name)
default,
FusionDirectiveCollection.Empty,
specifiedBy: null,
serializationType: ScalarSerializationType.String,
serializationType: GetSpecScalarSerializationType(name),
pattern: null));

_typeDefinitionNodeLookup = _typeDefinitionNodeLookup.SetItem(name, typeDef);
Expand All @@ -181,6 +181,19 @@ private FusionScalarTypeDefinition CreateSpecScalar(string name)
return type;
}

private static ScalarSerializationType GetSpecScalarSerializationType(string name)
=> name switch
{
SpecScalarNames.String.Name => ScalarSerializationType.String,
SpecScalarNames.Int.Name => ScalarSerializationType.Int,
SpecScalarNames.Float.Name => ScalarSerializationType.Float,
SpecScalarNames.Boolean.Name => ScalarSerializationType.Boolean,
SpecScalarNames.ID.Name => ScalarSerializationType.String | ScalarSerializationType.Int,
_ => throw new ArgumentOutOfRangeException(
nameof(name),
$"The specified name `{name}` is not a valid spec scalar name.")
};

private static IType CreateType(ITypeNode typeNode, ITypeDefinition compositeNamedType)
{
if (typeNode is NonNullTypeNode nonNullType)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,9 @@ public bool IsValueCompatible(IValueNode valueLiteral)
SyntaxKind.NullValue => true,
SyntaxKind.EnumValue => false,
SyntaxKind.StringValue => ValueKind.HasFlag(ScalarValueKind.String),
SyntaxKind.IntValue => ValueKind.HasFlag(ScalarValueKind.Integer),
SyntaxKind.IntValue =>
ValueKind.HasFlag(ScalarValueKind.Integer)
|| ValueKind.HasFlag(ScalarValueKind.Float),
SyntaxKind.FloatValue => ValueKind.HasFlag(ScalarValueKind.Float),
SyntaxKind.BooleanValue => ValueKind.HasFlag(ScalarValueKind.Boolean),
SyntaxKind.ListValue => ValueKind.HasFlag(ScalarValueKind.List),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,117 @@ query testQuery($input: String!) {
await MatchSnapshotAsync(gateway, request, result);
}

[Fact]
public async Task Float_Input_Accepts_Whole_Number()
{
// arrange
using var serverA = CreateSourceSchema(
"A",
r => r.AddQueryType<SourceSchema2.Query>());

using var gateway = await CreateCompositeSchemaAsync(
[
("A", serverA)
]);

using var client = GraphQLHttpClient.Create(gateway.CreateClient());

// act
var request = new OperationRequest(
"""
query testQuery($input: Float!) {
field(input: $input)
}
""",
variables: new Dictionary<string, object?>
{
["input"] = 500
});

using var result = await client.PostAsync(
request,
new Uri("http://localhost:5000/graphql"));

using var response = await result.ReadAsResultAsync();

// assert
Assert.Equal(500, response.Data.GetProperty("field").GetDouble());
}

[Fact]
public async Task Float_Input_Accepts_Zero_Decimal()
{
// arrange
using var serverA = CreateSourceSchema(
"A",
r => r.AddQueryType<SourceSchema2.Query>());

using var gateway = await CreateCompositeSchemaAsync(
[
("A", serverA)
]);

using var client = GraphQLHttpClient.Create(gateway.CreateClient());

// act
var request = new OperationRequest(
"""
query testQuery($input: Float!) {
field(input: $input)
}
""",
variables: new Dictionary<string, object?>
{
["input"] = 500.0
});

using var result = await client.PostAsync(
request,
new Uri("http://localhost:5000/graphql"));

using var response = await result.ReadAsResultAsync();

// assert
Assert.Equal(500, response.Data.GetProperty("field").GetDouble());
}

[Fact]
public async Task Float_Input_Accepts_Fractional_Decimal()
{
// arrange
using var serverA = CreateSourceSchema(
"A",
r => r.AddQueryType<SourceSchema2.Query>());

using var gateway = await CreateCompositeSchemaAsync(
[
("A", serverA)
]);

// act
using var client = GraphQLHttpClient.Create(gateway.CreateClient());

var request = new OperationRequest(
"""
query testQuery($input: Float!) {
field(input: $input)
}
""",
variables: new Dictionary<string, object?>
{
["input"] = 500.99
});

using var result = await client.PostAsync(
request,
new Uri("http://localhost:5000/graphql"));

using var response = await result.ReadAsResultAsync();

// assert
Assert.Equal(500.99, response.Data.GetProperty("field").GetDouble(), precision: 2);
}

[Fact]
public async Task InputObject_Invalid_Field()
{
Expand Down Expand Up @@ -462,4 +573,12 @@ public class Query
public string GetField(string input) => input;
}
}

public static class SourceSchema2
{
public class Query
{
public double GetField(double input) => input;
}
}
}
Loading