From ad7b86964f8348e37a1dbd96967d91e429d8e66f Mon Sep 17 00:00:00 2001
From: dondonz <13839920+dondonz@users.noreply.github.com>
Date: Thu, 24 Nov 2022 16:20:25 +1100
Subject: [PATCH] Add specifiedByURL and do not permit negative 0 offset

---
 .../scalars/datetime/DateTimeScalar.java       | 11 ++++++++---
 .../scalars/datetime/DateTimeScalarTest.groovy | 18 ++++++++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/main/java/graphql/scalars/datetime/DateTimeScalar.java b/src/main/java/graphql/scalars/datetime/DateTimeScalar.java
index 06b3aa3..ef52333 100644
--- a/src/main/java/graphql/scalars/datetime/DateTimeScalar.java
+++ b/src/main/java/graphql/scalars/datetime/DateTimeScalar.java
@@ -22,6 +22,7 @@
 import static java.time.temporal.ChronoField.HOUR_OF_DAY;
 import static java.time.temporal.ChronoField.MINUTE_OF_HOUR;
 import static java.time.temporal.ChronoField.NANO_OF_SECOND;
+import static java.time.temporal.ChronoField.OFFSET_SECONDS;
 import static java.time.temporal.ChronoField.SECOND_OF_MINUTE;
 
 /**
@@ -95,7 +96,11 @@ public Value<?> valueToLiteral(Object input) {
 
             private OffsetDateTime parseOffsetDateTime(String s, Function<String, RuntimeException> exceptionMaker) {
                 try {
-                    return OffsetDateTime.parse(s, DateTimeFormatter.ISO_OFFSET_DATE_TIME);
+                    OffsetDateTime parse = OffsetDateTime.parse(s, DateTimeFormatter.ISO_OFFSET_DATE_TIME);
+                    if (parse.get(OFFSET_SECONDS) == 0 && s.endsWith("-00:00")) {
+                        throw exceptionMaker.apply("Invalid value : '" + s + "'. Negative zero offset is not allowed");
+                    }
+                    return parse;
                 } catch (DateTimeParseException e) {
                     throw exceptionMaker.apply("Invalid RFC3339 value : '" + s + "'. because of : '" + e.getMessage() + "'");
                 }
@@ -104,7 +109,8 @@ private OffsetDateTime parseOffsetDateTime(String s, Function<String, RuntimeExc
 
         INSTANCE = GraphQLScalarType.newScalar()
                 .name("DateTime")
-                .description("An RFC-3339 compliant DateTime Scalar")
+                .description("A slightly refined version of RFC-3339 compliant DateTime Scalar")
+                .specifiedByUrl("https://scalars.graphql.org/andimarek/date-time") // TODO: Change to .specifiedByURL after release of graphql-java v20
                 .coercing(coercing)
                 .build();
     }
@@ -124,5 +130,4 @@ private static DateTimeFormatter getCustomDateTimeFormatter() {
                 .toFormatter();
     }
 
-
 }
diff --git a/src/test/groovy/graphql/scalars/datetime/DateTimeScalarTest.groovy b/src/test/groovy/graphql/scalars/datetime/DateTimeScalarTest.groovy
index 699907a..42c6c9c 100644
--- a/src/test/groovy/graphql/scalars/datetime/DateTimeScalarTest.groovy
+++ b/src/test/groovy/graphql/scalars/datetime/DateTimeScalarTest.groovy
@@ -2,6 +2,7 @@ package graphql.scalars.datetime
 
 import graphql.language.StringValue
 import graphql.scalars.ExtendedScalars
+import graphql.schema.CoercingParseLiteralException
 import graphql.schema.CoercingParseValueException
 import graphql.schema.CoercingSerializeException
 import spock.lang.Specification
@@ -28,6 +29,7 @@ class DateTimeScalarTest extends Specification {
         "1985-04-12T23:20:50.52Z"       | mkOffsetDT("1985-04-12T23:20:50.52Z")
         "1996-12-19T16:39:57-08:00"     | mkOffsetDT("1996-12-19T16:39:57-08:00")
         "1937-01-01T12:00:27.87+00:20"  | mkOffsetDT("1937-01-01T12:00:27.87+00:20")
+        "2022-11-24T01:00:01.02+00:00"  | mkOffsetDT("2022-11-24T01:00:01.02+00:00")
         mkOffsetDT(year: 1980, hour: 3) | mkOffsetDT("1980-08-08T03:10:09+10:00")
         mkZonedDT(year: 1980, hour: 3)  | mkOffsetDT("1980-08-08T03:10:09+10:00")
     }
@@ -45,6 +47,7 @@ class DateTimeScalarTest extends Specification {
         "1996-12-19T16:39:57-08:00"     | mkStringValue("1996-12-19T16:39:57.000-08:00")
         "1937-01-01T12:00:27.87+00:20"  | mkStringValue("1937-01-01T12:00:27.870+00:20")
         "1937-01-01T12:00+00:20"        | mkStringValue("1937-01-01T12:00:00.000+00:20")
+        "2022-11-24T01:00:01.02+00:00"  | mkStringValue("2022-11-24T01:00:01.020Z")
         mkOffsetDT(year: 1980, hour: 3) | mkStringValue("1980-08-08T03:10:09.000+10:00")
         mkZonedDT(year: 1980, hour: 3)  | mkStringValue("1980-08-08T03:10:09.000+10:00")
     }
@@ -59,6 +62,7 @@ class DateTimeScalarTest extends Specification {
         where:
         input                          | expectedValue
         "1985-04-12"                   | CoercingParseValueException
+        "2022-11-24T01:00:01.02-00:00" | CoercingParseValueException
         mkLocalDT(year: 1980, hour: 3) | CoercingParseValueException
         666                           || CoercingParseValueException
     }
@@ -85,6 +89,7 @@ class DateTimeScalarTest extends Specification {
         "1985-04-12T23:20:50.52Z"       | "1985-04-12T23:20:50.520Z"
         "1996-12-19T16:39:57-08:00"     | "1996-12-19T16:39:57.000-08:00"
         "1937-01-01T12:00:27.87+00:20"  | "1937-01-01T12:00:27.870+00:20"
+        "2022-11-24T01:00:01.02+00:00"  | "2022-11-24T01:00:01.020Z"
         mkOffsetDT(year: 1980, hour: 3) | "1980-08-08T03:10:09.000+10:00"
         mkZonedDT(year: 1980, hour: 3)  | "1980-08-08T03:10:09.000+10:00"
     }
@@ -98,8 +103,21 @@ class DateTimeScalarTest extends Specification {
         where:
         input                          | expectedValue
         "1985-04-12"                   | CoercingSerializeException
+        "2022-11-24T01:00:01.02-00:00" | CoercingSerializeException
         mkLocalDT(year: 1980, hour: 3) | CoercingSerializeException
         666                           || CoercingSerializeException
     }
 
+    @Unroll
+    def "datetime parseLiteral bad inputs"() {
+
+        when:
+        coercing.parseLiteral(input)
+        then:
+        thrown(expectedValue)
+        where:
+        input                          | expectedValue
+        "2022-11-24T01:00:01.02-00:00" | CoercingParseLiteralException
+    }
+
 }