Fix relaxed-format Date/LocalDate parsing for UTC-suffixed values (#9854)

Author: tobias-tengler

src/HotChocolate/Core/src/Types/Types/Scalars/DateType.cs

@@ -114,6 +114,15 @@ private bool TryParseStringValue(
             value = date;
             return true;
         }
+        else if (DateTimeOffset.TryParse(
+            serialized,
+            CultureInfo.InvariantCulture,
+            DateTimeStyles.None,
+            out var dateTimeOffset))
+        {
+            value = DateOnly.FromDateTime(dateTimeOffset.UtcDateTime);
+            return true;
+        }
 
         value = null;
         return false;

src/HotChocolate/Core/src/Types/Types/Scalars/LocalDateType.cs

@@ -113,6 +113,15 @@ private bool TryParseStringValue(string serialized, out DateOnly value)
             value = date;
             return true;
         }
+        else if (DateTimeOffset.TryParse(
+            serialized,
+            CultureInfo.InvariantCulture,
+            DateTimeStyles.None,
+            out var dateTimeOffset))
+        {
+            value = DateOnly.FromDateTime(dateTimeOffset.DateTime);
+            return true;
+        }
 
         value = default;
         return false;

src/HotChocolate/Core/test/Types.Tests/Types/Scalars/DateTypeTests.cs

@@ -278,6 +278,21 @@ public void DateType_Relaxed_Format_Check()
         Assert.IsType<DateOnly>(result);
     }
 
+    [Fact]
+    public void DateType_Relaxed_Format_Check_With_Utc_Z_Suffix()
+    {
+        // arrange
+        const string s = "2020-12-12T00:00:00.000Z";
+
+        // act
+        var type = new DateType(disableFormatCheck: true);
+        var inputValue = JsonDocument.Parse($"\"{s}\"").RootElement;
+        var result = type.CoerceInputValue(inputValue, null!);
+
+        // assert
+        Assert.Equal(new DateOnly(2020, 12, 12), Assert.IsType<DateOnly>(result));
+    }
+
     public class Query
     {
         [GraphQLType(typeof(DateType))]

src/HotChocolate/Core/test/Types.Tests/Types/Scalars/LocalDateTypeTests.cs

@@ -106,6 +106,36 @@ public void CoerceInputValue()
         Assert.Equal(expectedDate, runtimeValue);
     }
 
+    [Fact]
+    public void CoerceInputValue_Relaxed_Format_With_Time_Component()
+    {
+        // arrange
+        const string s = "2011-08-30T08:46:14.116";
+
+        // act
+        var type = new LocalDateType(disableFormatCheck: true);
+        var inputValue = JsonDocument.Parse($"\"{s}\"").RootElement;
+        var result = type.CoerceInputValue(inputValue, null!);
+
+        // assert
+        Assert.Equal(new DateOnly(2011, 8, 30), Assert.IsType<DateOnly>(result));
+    }
+
+    [Fact]
+    public void CoerceInputValue_Relaxed_Format_With_Utc_Z_Suffix()
+    {
+        // arrange
+        const string s = "2020-12-12T00:00:00.000Z";
+
+        // act
+        var type = new LocalDateType(disableFormatCheck: true);
+        var inputValue = JsonDocument.Parse($"\"{s}\"").RootElement;
+        var result = type.CoerceInputValue(inputValue, null!);
+
+        // assert
+        Assert.Equal(new DateOnly(2020, 12, 12), Assert.IsType<DateOnly>(result));
+    }
+
     [Fact]
     public void CoerceInputValue_Invalid_Format()
     {