X Tutup
Skip to content

Commit e5141f3

Browse files
lbalmacedalbalmaceda
authored
Merge branch 'master' into master
2 parents 6a17553 + bf0a030 commit e5141f3

File tree

8 files changed

+234
-10
lines changed

8 files changed

+234
-10
lines changed

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,7 @@ The Claim class is a wrapper for the Claim values. It allows you to get the Clai
338338
To obtain a Claim as a Collection you'll need to provide the **Class Type** of the contents to convert from.
339339

340340
* **as(class)**: Returns the value parsed as **Class Type**. For collections you should use the `asArray` and `asList` methods.
341+
* **asMap()**: Returns the value parsed as **Map<String, Object>**.
341342
* **asArray(class)**: Returns the value parsed as an Array of elements of type **Class Type**, or null if the value isn't a JSON Array.
342343
* **asList(class)**: Returns the value parsed as a List of elements of type **Class Type**, or null if the value isn't a JSON Array.
343344

‎lib/src/main/java/com/auth0/jwt/JWTDecoder.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import com.auth0.jwt.exceptions.JWTDecodeException;
44
import com.auth0.jwt.impl.JWTParser;
55
import com.auth0.jwt.interfaces.Claim;
6-
import com.auth0.jwt.interfaces.DecodedJWT;
76
import com.auth0.jwt.interfaces.Header;
87
import com.auth0.jwt.interfaces.Payload;
98
import org.apache.commons.codec.binary.Base64;

‎lib/src/main/java/com/auth0/jwt/impl/JsonNodeClaim.java‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.auth0.jwt.exceptions.JWTDecodeException;
44
import com.auth0.jwt.interfaces.Claim;
55
import com.fasterxml.jackson.core.JsonProcessingException;
6+
import com.fasterxml.jackson.core.type.TypeReference;
67
import com.fasterxml.jackson.databind.JsonNode;
78
import com.fasterxml.jackson.databind.ObjectMapper;
89

@@ -90,6 +91,22 @@ public <T> List<T> asList(Class<T> tClazz) throws JWTDecodeException {
9091
return list;
9192
}
9293

94+
@Override
95+
public Map<String, Object> asMap() throws JWTDecodeException {
96+
if (!data.isObject()) {
97+
return null;
98+
}
99+
100+
ObjectMapper mapper = new ObjectMapper();
101+
try {
102+
TypeReference<Map<String, Object>> mapType = new TypeReference<Map<String, Object>>() {
103+
};
104+
return mapper.treeAsTokens(data).readValueAs(mapType);
105+
} catch (IOException e) {
106+
throw new JWTDecodeException("Couldn't map the Claim value to Map", e);
107+
}
108+
}
109+
93110
@Override
94111
public <T> T as(Class<T> tClazz) throws JWTDecodeException {
95112
ObjectMapper mapper = new ObjectMapper();
@@ -102,7 +119,7 @@ public <T> T as(Class<T> tClazz) throws JWTDecodeException {
102119

103120
@Override
104121
public boolean isNull() {
105-
return !(data.isArray() || data.canConvertToLong() || data.isTextual() || data.isNumber() || data.isBoolean());
122+
return false;
106123
}
107124

108125
/**

‎lib/src/main/java/com/auth0/jwt/impl/NullClaim.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
import java.util.Date;
77
import java.util.List;
8+
import java.util.Map;
89

910
/**
1011
* The {@link NullClaim} class is a Claim implementation that returns null when any of it's methods it's called.
@@ -50,6 +51,11 @@ public <T> List<T> asList(Class<T> tClazz) throws JWTDecodeException {
5051
return null;
5152
}
5253

54+
@Override
55+
public Map<String, Object> asMap() throws JWTDecodeException {
56+
return null;
57+
}
58+
5359
@Override
5460
public <T> T as(Class<T> tClazz) throws JWTDecodeException {
5561
return null;

‎lib/src/main/java/com/auth0/jwt/interfaces/Claim.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,18 @@
44

55
import java.util.Date;
66
import java.util.List;
7+
import java.util.Map;
78

89
/**
910
* The Claim class holds the value in a generic way so that it can be recovered in many representations.
1011
*/
1112
public interface Claim {
1213

14+
/**
15+
* Whether this Claim has a null value or not.
16+
*
17+
* @return whether this Claim has a null value or not.
18+
*/
1319
boolean isNull();
1420

1521
/**
@@ -70,6 +76,14 @@ public interface Claim {
7076
*/
7177
<T> List<T> asList(Class<T> tClazz) throws JWTDecodeException;
7278

79+
/**
80+
* Get this Claim as a generic Map of values.
81+
*
82+
* @return the value as instance of Map.
83+
* @throws JWTDecodeException if the value can't be converted to a Map.
84+
*/
85+
Map<String, Object> asMap() throws JWTDecodeException;
86+
7387
/**
7488
* Get this Claim as a custom type T.
7589
*

‎lib/src/test/java/com/auth0/jwt/JWTDecoderTest.java‎

Lines changed: 63 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import org.apache.commons.codec.binary.Base64;
88
import org.hamcrest.collection.IsCollectionWithSize;
99
import org.hamcrest.core.IsCollectionContaining;
10+
import org.junit.Assert;
1011
import org.junit.Rule;
1112
import org.junit.Test;
1213
import org.junit.rules.ExpectedException;
@@ -192,11 +193,71 @@ public void shouldGetValidClaim() throws Exception {
192193
}
193194

194195
@Test
195-
public void shouldGetNullClaimIfClaimValueIsNull() throws Exception {
196+
public void shouldNotGetNullClaimIfClaimIsEmptyObject() throws Exception {
196197
DecodedJWT jwt = JWTDecoder.decode("eyJhbGciOiJIUzI1NiJ9.eyJvYmplY3QiOnt9fQ.d3nUeeL_69QsrHL0ZWij612LHEQxD8EZg1rNoY3a4aI");
197198
assertThat(jwt, is(notNullValue()));
198199
assertThat(jwt.getClaim("object"), is(notNullValue()));
199-
assertThat(jwt.getClaim("object").isNull(), is(true));
200+
assertThat(jwt.getClaim("object").isNull(), is(false));
201+
}
202+
203+
@Test
204+
public void shouldGetCustomClaimOfTypeInteger() throws Exception {
205+
String token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYW1lIjoxMjN9.XZAudnA7h3_Al5kJydzLjw6RzZC3Q6OvnLEYlhNW7HA";
206+
DecodedJWT jwt = JWT.decode(token);
207+
Assert.assertThat(jwt, is(notNullValue()));
208+
Assert.assertThat(jwt.getClaim("name").asInt(), is(123));
209+
}
210+
211+
@Test
212+
public void shouldGetCustomClaimOfTypeDouble() throws Exception {
213+
String token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYW1lIjoyMy40NX0.7pyX2OmEGaU9q15T8bGFqRm-d3RVTYnqmZNZtxMKSlA";
214+
DecodedJWT jwt = JWT.decode(token);
215+
Assert.assertThat(jwt, is(notNullValue()));
216+
Assert.assertThat(jwt.getClaim("name").asDouble(), is(23.45));
217+
}
218+
219+
@Test
220+
public void shouldGetCustomClaimOfTypeBoolean() throws Exception {
221+
String token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYW1lIjp0cnVlfQ.FwQ8VfsZNRqBa9PXMinSIQplfLU4-rkCLfIlTLg_MV0";
222+
DecodedJWT jwt = JWT.decode(token);
223+
Assert.assertThat(jwt, is(notNullValue()));
224+
Assert.assertThat(jwt.getClaim("name").asBoolean(), is(true));
225+
}
226+
227+
@Test
228+
public void shouldGetCustomClaimOfTypeDate() throws Exception {
229+
String token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYW1lIjoxNDc4ODkxNTIxfQ.mhioumeok8fghQEhTKF3QtQAksSvZ_9wIhJmgZLhJ6c";
230+
Date date = new Date(1478891521000L);
231+
DecodedJWT jwt = JWT.decode(token);
232+
Assert.assertThat(jwt, is(notNullValue()));
233+
Assert.assertThat(jwt.getClaim("name").asDate().getTime(), is(date.getTime()));
234+
}
235+
236+
@Test
237+
public void shouldGetCustomArrayClaimOfTypeString() throws Exception {
238+
String token = "eyJhbGciOiJIUzI1NiJ9.eyJuYW1lIjpbInRleHQiLCIxMjMiLCJ0cnVlIl19.lxM8EcmK1uSZRAPd0HUhXGZJdauRmZmLjoeqz4J9yAA";
239+
DecodedJWT jwt = JWT.decode(token);
240+
Assert.assertThat(jwt, is(notNullValue()));
241+
Assert.assertThat(jwt.getClaim("name").asArray(String.class), arrayContaining("text", "123", "true"));
242+
}
243+
244+
@Test
245+
public void shouldGetCustomArrayClaimOfTypeInteger() throws Exception {
246+
String token = "eyJhbGciOiJIUzI1NiJ9.eyJuYW1lIjpbMSwyLDNdfQ.UEuMKRQYrzKAiPpPLhIVawWkKWA1zj0_GderrWUIyFE";
247+
DecodedJWT jwt = JWT.decode(token);
248+
Assert.assertThat(jwt, is(notNullValue()));
249+
Assert.assertThat(jwt.getClaim("name").asArray(Integer.class), arrayContaining(1, 2, 3));
250+
}
251+
252+
@Test
253+
public void shouldGetCustomMapClaim() throws Exception {
254+
String token = "eyJhbGciOiJIUzI1NiJ9.eyJuYW1lIjp7InN0cmluZyI6InZhbHVlIiwibnVtYmVyIjoxLCJib29sZWFuIjp0cnVlfX0.-8aIaXd2-rp1lLuDEQmCeisCBX9X_zbqdPn2llGxNoc";
255+
DecodedJWT jwt = JWT.decode(token);
256+
Assert.assertThat(jwt, is(notNullValue()));
257+
Map<String, Object> map = jwt.getClaim("name").asMap();
258+
Assert.assertThat(map, hasEntry("string", (Object) "value"));
259+
Assert.assertThat(map, hasEntry("number", (Object) 1));
260+
Assert.assertThat(map, hasEntry("boolean", (Object) true));
200261
}
201262

202263
@Test

‎lib/src/test/java/com/auth0/jwt/impl/JsonNodeClaimTest.java‎

Lines changed: 127 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,27 @@
55
import com.auth0.jwt.interfaces.Claim;
66
import com.fasterxml.jackson.databind.JsonNode;
77
import com.fasterxml.jackson.databind.ObjectMapper;
8+
import com.fasterxml.jackson.databind.node.JsonNodeType;
89
import com.fasterxml.jackson.databind.node.MissingNode;
910
import com.fasterxml.jackson.databind.node.NullNode;
11+
import com.fasterxml.jackson.databind.node.ObjectNode;
12+
import org.hamcrest.collection.IsMapContaining;
1013
import org.junit.Before;
1114
import org.junit.Rule;
1215
import org.junit.Test;
1316
import org.junit.rules.ExpectedException;
1417

15-
import java.util.Arrays;
16-
import java.util.Collections;
17-
import java.util.Date;
18-
import java.util.Map;
18+
import java.io.IOException;
19+
import java.util.*;
1920

2021
import static com.auth0.jwt.impl.JWTParser.getDefaultObjectMapper;
2122
import static com.auth0.jwt.impl.JsonNodeClaim.claimFromNode;
2223
import static org.hamcrest.Matchers.*;
2324
import static org.hamcrest.core.IsNull.notNullValue;
2425
import static org.hamcrest.core.IsNull.nullValue;
2526
import static org.junit.Assert.assertThat;
27+
import static org.mockito.Mockito.mock;
28+
import static org.mockito.Mockito.when;
2629

2730
public class JsonNodeClaimTest {
2831

@@ -206,6 +209,54 @@ public void shouldThrowIfListClassMismatch() throws Exception {
206209
claim.asList(UserPojo.class);
207210
}
208211

212+
@Test
213+
public void shouldGetNullMapIfNullValue() throws Exception {
214+
JsonNode value = mapper.valueToTree(null);
215+
Claim claim = claimFromNode(value);
216+
217+
assertThat(claim.asMap(), is(nullValue()));
218+
}
219+
220+
@Test
221+
public void shouldGetNullMapIfNonArrayValue() throws Exception {
222+
JsonNode value = mapper.valueToTree(1);
223+
Claim claim = claimFromNode(value);
224+
225+
assertThat(claim.asMap(), is(nullValue()));
226+
}
227+
228+
@Test
229+
public void shouldGetMapValue() throws Exception {
230+
Map<String, Object> map = new HashMap<>();
231+
map.put("text", "extraValue");
232+
map.put("number", 12);
233+
map.put("boolean", true);
234+
map.put("object", Collections.singletonMap("something", "else"));
235+
236+
JsonNode value = mapper.valueToTree(map);
237+
Claim claim = claimFromNode(value);
238+
239+
assertThat(claim, is(notNullValue()));
240+
Map<String, Object> backMap = claim.asMap();
241+
assertThat(backMap, is(notNullValue()));
242+
assertThat(backMap, hasEntry("text", (Object) "extraValue"));
243+
assertThat(backMap, hasEntry("number", (Object) 12));
244+
assertThat(backMap, hasEntry("boolean", (Object) true));
245+
assertThat(backMap, hasKey("object"));
246+
assertThat((Map<String, Object>) backMap.get("object"), IsMapContaining.hasEntry("something", (Object) "else"));
247+
}
248+
249+
@Test
250+
public void shouldThrowIfAnExtraordinaryExceptionHappensWhenParsingAsGenericMap() throws Exception {
251+
JsonNode value = mock(ObjectNode.class);
252+
when(value.getNodeType()).thenReturn(JsonNodeType.OBJECT);
253+
when(value.fields()).thenThrow(IOException.class);
254+
Claim claim = claimFromNode(value);
255+
256+
exception.expect(JWTDecodeException.class);
257+
claim.asMap();
258+
}
259+
209260
@Test
210261
public void shouldGetCustomClassValue() throws Exception {
211262
JsonNode value = mapper.valueToTree(new UserPojo("john", 123));
@@ -268,12 +319,82 @@ public void shouldReturnBaseClaimWhenParsingNullValue() throws Exception {
268319
}
269320

270321
@Test
271-
public void shouldReturnValidButNullClaimIfTreeIsEmpty() throws Exception {
322+
public void shouldReturnNonNullClaimWhenParsingObject() throws Exception {
272323
JsonNode value = mapper.valueToTree(new Object());
273324
Claim claim = claimFromNode(value);
274325

275326
assertThat(claim, is(notNullValue()));
276327
assertThat(claim, is(instanceOf(JsonNodeClaim.class)));
277-
assertThat(claim.isNull(), is(true));
328+
assertThat(claim.isNull(), is(false));
329+
}
330+
331+
@Test
332+
public void shouldReturnNonNullClaimWhenParsingArray() throws Exception {
333+
JsonNode value = mapper.valueToTree(new String[]{});
334+
Claim claim = claimFromNode(value);
335+
336+
assertThat(claim, is(notNullValue()));
337+
assertThat(claim, is(instanceOf(JsonNodeClaim.class)));
338+
assertThat(claim.isNull(), is(false));
339+
}
340+
341+
@Test
342+
public void shouldReturnNonNullClaimWhenParsingList() throws Exception {
343+
JsonNode value = mapper.valueToTree(new ArrayList<String>());
344+
Claim claim = claimFromNode(value);
345+
346+
assertThat(claim, is(notNullValue()));
347+
assertThat(claim, is(instanceOf(JsonNodeClaim.class)));
348+
assertThat(claim.isNull(), is(false));
349+
}
350+
351+
@Test
352+
public void shouldReturnNonNullClaimWhenParsingStringValue() throws Exception {
353+
JsonNode value = mapper.valueToTree("");
354+
Claim claim = claimFromNode(value);
355+
356+
assertThat(claim, is(notNullValue()));
357+
assertThat(claim, is(instanceOf(JsonNodeClaim.class)));
358+
assertThat(claim.isNull(), is(false));
359+
}
360+
361+
@Test
362+
public void shouldReturnNonNullClaimWhenParsingIntValue() throws Exception {
363+
JsonNode value = mapper.valueToTree(Integer.MAX_VALUE);
364+
Claim claim = claimFromNode(value);
365+
366+
assertThat(claim, is(notNullValue()));
367+
assertThat(claim, is(instanceOf(JsonNodeClaim.class)));
368+
assertThat(claim.isNull(), is(false));
369+
}
370+
371+
@Test
372+
public void shouldReturnNonNullClaimWhenParsingDoubleValue() throws Exception {
373+
JsonNode value = mapper.valueToTree(Double.MAX_VALUE);
374+
Claim claim = claimFromNode(value);
375+
376+
assertThat(claim, is(notNullValue()));
377+
assertThat(claim, is(instanceOf(JsonNodeClaim.class)));
378+
assertThat(claim.isNull(), is(false));
379+
}
380+
381+
@Test
382+
public void shouldReturnNonNullClaimWhenParsingDateValue() throws Exception {
383+
JsonNode value = mapper.valueToTree(new Date());
384+
Claim claim = claimFromNode(value);
385+
386+
assertThat(claim, is(notNullValue()));
387+
assertThat(claim, is(instanceOf(JsonNodeClaim.class)));
388+
assertThat(claim.isNull(), is(false));
389+
}
390+
391+
@Test
392+
public void shouldReturnNonNullClaimWhenParsingBooleanValue() throws Exception {
393+
JsonNode value = mapper.valueToTree(Boolean.TRUE);
394+
Claim claim = claimFromNode(value);
395+
396+
assertThat(claim, is(notNullValue()));
397+
assertThat(claim, is(instanceOf(JsonNodeClaim.class)));
398+
assertThat(claim.isNull(), is(false));
278399
}
279400
}

‎lib/src/test/java/com/auth0/jwt/impl/NullClaimTest.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,11 @@ public void shouldGetAsList() throws Exception {
5656
assertThat(claim.asList(Object.class), is(nullValue()));
5757
}
5858

59+
@Test
60+
public void shouldGetAsMap() throws Exception {
61+
assertThat(claim.asMap(), is(nullValue()));
62+
}
63+
5964
@Test
6065
public void shouldGetAsCustomClass() throws Exception {
6166
assertThat(claim.as(Object.class), is(nullValue()));

0 commit comments

Comments
 (0)
X Tutup