Merge pull request auth0#151 from auth0/fixed-json-parsing

lbalmaceda · web-flow · commit d84aa9d1a106 · 2017-03-14T10:54:54.000-03:00
Accept blanks, new line and carriage returns on JSON
diff --git a/lib/src/main/java/com/auth0/jwt/impl/JWTParser.java b/lib/src/main/java/com/auth0/jwt/impl/JWTParser.java
@@ -50,7 +50,7 @@ static ObjectMapper getDefaultObjectMapper() {
     @SuppressWarnings("WeakerAccess")
     <T> T convertFromJSON(String json, Class<T> tClazz) throws JWTDecodeException {
         JWTDecodeException exception = new JWTDecodeException(String.format("The string '%s' doesn't have a valid JSON format.", json));
-        if (json == null || !json.startsWith("{") || !json.endsWith("}")) {
+        if (json == null) {
             throw exception;
         }
         try {
diff --git a/lib/src/test/java/com/auth0/jwt/JWTDecoderTest.java b/lib/src/test/java/com/auth0/jwt/JWTDecoderTest.java
@@ -47,7 +47,7 @@ public void shouldThrowIfMoreThan3Parts() throws Exception {
     @Test
     public void shouldThrowIfPayloadHasInvalidJSONFormat() throws Exception {
         String validJson = "{}";
-        String invalidJson = "{}}{";
+        String invalidJson = "}{";
         exception.expect(JWTDecodeException.class);
         exception.expectMessage(String.format("The string '%s' doesn't have a valid JSON format.", invalidJson));
         customJWT(validJson, invalidJson, "signature");
@@ -56,7 +56,7 @@ public void shouldThrowIfPayloadHasInvalidJSONFormat() throws Exception {
     @Test
     public void shouldThrowIfHeaderHasInvalidJSONFormat() throws Exception {
         String validJson = "{}";
-        String invalidJson = "{}}{";
+        String invalidJson = "}{";
         exception.expect(JWTDecodeException.class);
         exception.expectMessage(String.format("The string '%s' doesn't have a valid JSON format.", invalidJson));
         customJWT(invalidJson, validJson, "signature");
diff --git a/lib/src/test/java/com/auth0/jwt/impl/JWTParserTest.java b/lib/src/test/java/com/auth0/jwt/impl/JWTParserTest.java
@@ -11,13 +11,12 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
-import java.io.IOException;
-
 import static com.auth0.jwt.impl.JWTParser.getDefaultObjectMapper;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 
 public class JWTParserTest {
 
@@ -45,19 +44,6 @@ public void shouldAddDeserializers() throws Exception {
         verify(mapper).registerModule(any(Module.class));
     }
 
-    @Test
-    public void shouldThrowOnReadValueException() throws Exception {
-        String jsonPayload = "{}";
-        exception.expect(JWTDecodeException.class);
-        exception.expectMessage(String.format("The string '%s' doesn't have a valid JSON format.", jsonPayload));
-
-        ObjectMapper mapper = mock(ObjectMapper.class);
-        when(mapper.readValue(eq(jsonPayload), eq(Object.class))).thenThrow(IOException.class);
-        JWTParser parser = new JWTParser(mapper);
-
-        parser.convertFromJSON(jsonPayload, Object.class);
-    }
-
     @Test
     public void shouldParsePayload() throws Exception {
         ObjectMapper mapper = mock(ObjectMapper.class);
@@ -96,7 +82,7 @@ public void shouldThrowOnInvalidHeader() throws Exception {
 
     @Test
     public void shouldConvertFromValidJSON() throws Exception {
-        String json = "{}";
+        String json = "\r\n { \r\n } \r\n";
         Object object = parser.convertFromJSON(json, Object.class);
         assertThat(object, is(notNullValue()));
     }

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ static ObjectMapper getDefaultObjectMapper() {`
`50`	`50`	`@SuppressWarnings("WeakerAccess")`
`51`	`51`	`<T> T convertFromJSON(String json, Class<T> tClazz) throws JWTDecodeException {`
`52`	`52`	`JWTDecodeException exception = new JWTDecodeException(String.format("The string '%s' doesn't have a valid JSON format.", json));`
`53`		`- if (json == null \|\| !json.startsWith("{") \|\| !json.endsWith("}")) {`
	`53`	`+ if (json == null) {`
`54`	`54`	`throw exception;`
`55`	`55`	`}`
`56`	`56`	`try {`