Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Claim.isNull() method for JSON Objects #161

Merged
merged 2 commits into from
Apr 12, 2017
Merged

Fix Claim.isNull() method for JSON Objects #161

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a496ad
fix claim.isNull() method
lbalmaceda Apr 7, 2017
283b899
make JsonNodeClaim always return false for isNull invocation
lbalmaceda Apr 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/src/main/java/com/auth0/jwt/impl/JsonNodeClaim.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public <T> T as(Class<T> tClazz) throws JWTDecodeException {

@Override
public boolean isNull() {
return !(data.isArray() || data.canConvertToLong() || data.isTextual() || data.isNumber() || data.isBoolean());
return !(data.isObject() || data.isArray() || data.canConvertToLong() || data.isTextual() || data.isNumber() || data.isBoolean());
}

/**
Expand Down
4 changes: 2 additions & 2 deletions lib/src/test/java/com/auth0/jwt/JWTDecoderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,11 +192,11 @@ public void shouldGetValidClaim() throws Exception {
}

@Test
public void shouldGetNullClaimIfClaimValueIsNull() throws Exception {
public void shouldNotGetNullClaimIfClaimIsEmptyObject() throws Exception {
DecodedJWT jwt = JWTDecoder.decode("eyJhbGciOiJIUzI1NiJ9.eyJvYmplY3QiOnt9fQ.d3nUeeL_69QsrHL0ZWij612LHEQxD8EZg1rNoY3a4aI");
assertThat(jwt, is(notNullValue()));
assertThat(jwt.getClaim("object"), is(notNullValue()));
assertThat(jwt.getClaim("object").isNull(), is(true));
assertThat(jwt.getClaim("object").isNull(), is(false));
}

@Test
Expand Down
79 changes: 73 additions & 6 deletions lib/src/test/java/com/auth0/jwt/impl/JsonNodeClaimTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@
import org.junit.Test;
import org.junit.rules.ExpectedException;

import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
import java.util.Map;
import java.util.*;

import static com.auth0.jwt.impl.JWTParser.getDefaultObjectMapper;
import static com.auth0.jwt.impl.JsonNodeClaim.claimFromNode;
Expand Down Expand Up @@ -268,12 +265,82 @@ public void shouldReturnBaseClaimWhenParsingNullValue() throws Exception {
}

@Test
public void shouldReturnValidButNullClaimIfTreeIsEmpty() throws Exception {
public void shouldReturnNonNullClaimWhenParsingObject() throws Exception {
JsonNode value = mapper.valueToTree(new Object());
Claim claim = claimFromNode(value);

assertThat(claim, is(notNullValue()));
assertThat(claim, is(instanceOf(JsonNodeClaim.class)));
assertThat(claim.isNull(), is(true));
assertThat(claim.isNull(), is(false));
}

@Test
public void shouldReturnNonNullClaimWhenParsingArray() throws Exception {
JsonNode value = mapper.valueToTree(new String[]{});
Claim claim = claimFromNode(value);

assertThat(claim, is(notNullValue()));
assertThat(claim, is(instanceOf(JsonNodeClaim.class)));
assertThat(claim.isNull(), is(false));
}

@Test
public void shouldReturnNonNullClaimWhenParsingList() throws Exception {
JsonNode value = mapper.valueToTree(new ArrayList<String>());
Claim claim = claimFromNode(value);

assertThat(claim, is(notNullValue()));
assertThat(claim, is(instanceOf(JsonNodeClaim.class)));
assertThat(claim.isNull(), is(false));
}

@Test
public void shouldReturnNonNullClaimWhenParsingStringValue() throws Exception {
JsonNode value = mapper.valueToTree("");
Claim claim = claimFromNode(value);

assertThat(claim, is(notNullValue()));
assertThat(claim, is(instanceOf(JsonNodeClaim.class)));
assertThat(claim.isNull(), is(false));
}

@Test
public void shouldReturnNonNullClaimWhenParsingIntValue() throws Exception {
JsonNode value = mapper.valueToTree(Integer.MAX_VALUE);
Claim claim = claimFromNode(value);

assertThat(claim, is(notNullValue()));
assertThat(claim, is(instanceOf(JsonNodeClaim.class)));
assertThat(claim.isNull(), is(false));
}

@Test
public void shouldReturnNonNullClaimWhenParsingDoubleValue() throws Exception {
JsonNode value = mapper.valueToTree(Double.MAX_VALUE);
Claim claim = claimFromNode(value);

assertThat(claim, is(notNullValue()));
assertThat(claim, is(instanceOf(JsonNodeClaim.class)));
assertThat(claim.isNull(), is(false));
}

@Test
public void shouldReturnNonNullClaimWhenParsingDateValue() throws Exception {
JsonNode value = mapper.valueToTree(new Date());
Claim claim = claimFromNode(value);

assertThat(claim, is(notNullValue()));
assertThat(claim, is(instanceOf(JsonNodeClaim.class)));
assertThat(claim.isNull(), is(false));
}

@Test
public void shouldReturnNonNullClaimWhenParsingBooleanValue() throws Exception {
JsonNode value = mapper.valueToTree(Boolean.TRUE);
Claim claim = claimFromNode(value);

assertThat(claim, is(notNullValue()));
assertThat(claim, is(instanceOf(JsonNodeClaim.class)));
assertThat(claim.isNull(), is(false));
}
}