fix long to date conversion

lbalmaceda · lbalmaceda · commit b29626229afc · 2017-01-23T18:24:55.000-03:00
diff --git a/lib/build.gradle b/lib/build.gradle
@@ -52,7 +52,7 @@ jacocoTestReport {
 
 test {
     testLogging {
-        events "passed", "skipped", "failed", "standardError"
+        events "skipped", "failed", "standardError"
         exceptionFormat "short"
     }
 }
diff --git a/lib/src/main/java/com/auth0/jwt/impl/PayloadSerializer.java b/lib/src/main/java/com/auth0/jwt/impl/PayloadSerializer.java
@@ -54,7 +54,7 @@ public void serialize(ClaimsHolder holder, JsonGenerator gen, SerializerProvider
         gen.writeObject(safePayload);
     }
 
-    private int dateToSeconds(Date date) {
-        return (int) (date.getTime() / 1000);
+    private long dateToSeconds(Date date) {
+        return date.getTime() / 1000;
     }
 }
diff --git a/lib/src/test/java/com/auth0/jwt/impl/PayloadDeserializerTest.java b/lib/src/test/java/com/auth0/jwt/impl/PayloadDeserializerTest.java
@@ -219,6 +219,19 @@ public void shouldGetDateWhenParsingNumericNode() throws Exception {
         assertThat(date.getTime(), is(seconds * 1000));
     }
 
+    @Test
+    public void shouldGetLargeDateWhenParsingNumericNode() throws Exception {
+        Map<String, JsonNode> tree = new HashMap<>();
+        long seconds = Integer.MAX_VALUE + 10000L;
+        LongNode node = new LongNode(seconds);
+        tree.put("key", node);
+
+        Date date = deserializer.getDateFromSeconds(tree, "key");
+        assertThat(date, is(notNullValue()));
+        assertThat(date.getTime(), is(seconds * 1000));
+        assertThat(date.getTime(), is(2147493647L * 1000));
+    }
+
     @Test
     public void shouldGetNullStringWhenParsingNullNode() throws Exception {
         Map<String, JsonNode> tree = new HashMap<>();
diff --git a/lib/src/test/java/com/auth0/jwt/impl/PayloadSerializerTest.java b/lib/src/test/java/com/auth0/jwt/impl/PayloadSerializerTest.java
@@ -14,8 +14,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.assertThat;
 
 public class PayloadSerializerTest {
@@ -117,6 +116,26 @@ public void shouldSerializeCustomDateInSeconds() throws Exception {
         assertThat(writer.toString(), is(equalTo("{\"birthdate\":1478874}")));
     }
 
+    @Test
+    public void shouldSerializeDatesUsingLong() throws Exception {
+        long secs = Integer.MAX_VALUE + 10000L;
+        Date date = new Date(secs * 1000L);
+        Map<String, Object> claims = new HashMap<String, Object>();
+        claims.put("iat", date);
+        claims.put("nbf", date);
+        claims.put("exp", date);
+        claims.put("ctm", date);
+        ClaimsHolder holder = new ClaimsHolder(claims);
+        serializer.serialize(holder, jsonGenerator, serializerProvider);
+        jsonGenerator.flush();
+
+        String json = writer.toString();
+        assertThat(json, containsString("\"iat\":2147493647"));
+        assertThat(json, containsString("\"nbf\":2147493647"));
+        assertThat(json, containsString("\"exp\":2147493647"));
+        assertThat(json, containsString("\"ctm\":2147493647"));
+    }
+
     @Test
     public void shouldSerializeStrings() throws Exception {
         ClaimsHolder holder = holderFor("name", "Auth0 Inc");

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ jacocoTestReport {`
`52`	`52`
`53`	`53`	`test {`
`54`	`54`	`testLogging {`
`55`		`- events "passed", "skipped", "failed", "standardError"`
	`55`	`+ events "skipped", "failed", "standardError"`
`56`	`56`	`exceptionFormat "short"`
`57`	`57`	`}`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public void serialize(ClaimsHolder holder, JsonGenerator gen, SerializerProvider`
`54`	`54`	`gen.writeObject(safePayload);`
`55`	`55`	`}`
`56`	`56`
`57`		`- private int dateToSeconds(Date date) {`
`58`		`- return (int) (date.getTime() / 1000);`
	`57`	`+ private long dateToSeconds(Date date) {`
	`58`	`+ return date.getTime() / 1000;`
`59`	`59`	`}`
`60`	`60`	`}`