Merge pull request jwtk#165 from jwtk/107-ex-msg-utc-format

107: ensured exception message printed UTC times correctly
svanscho · Sep 11, 2016 · 5b15b93 · 5b15b93
2 parents 0f63ec8 + 1974069
commit 5b15b93
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/main/java/io/jsonwebtoken/impl/DefaultJwtParser.java b/src/main/java/io/jsonwebtoken/impl/DefaultJwtParser.java
@@ -56,7 +56,7 @@
 public class DefaultJwtParser implements JwtParser {
 
     //don't need millis since JWT date fields are only second granularity:
-    private static final String ISO_8601_FORMAT = "yyyy-MM-dd'T'HH:mm:ssZ";
+    private static final String ISO_8601_FORMAT = "yyyy-MM-dd'T'HH:mm:ss'Z'";
 
     private ObjectMapper objectMapper = new ObjectMapper();
 

diff --git a/src/test/groovy/io/jsonwebtoken/JwtParserTest.groovy b/src/test/groovy/io/jsonwebtoken/JwtParserTest.groovy
@@ -175,6 +175,9 @@ class JwtParserTest {
             fail()
         } catch (ExpiredJwtException e) {
             assertTrue e.getMessage().startsWith('JWT expired at ')
+
+            //https://github.com/jwtk/jjwt/issues/107 :
+            assertTrue e.getMessage().endsWith('Z')
         }
     }
 
@@ -190,6 +193,9 @@ class JwtParserTest {
             fail()
         } catch (PrematureJwtException e) {
             assertTrue e.getMessage().startsWith('JWT must not be accepted before ')
+
+            //https://github.com/jwtk/jjwt/issues/107 :
+            assertTrue e.getMessage().endsWith('Z')
         }
     }