diff --git a/pom.xml b/pom.xml index c4f141cab9..48d505632f 100644 --- a/pom.xml +++ b/pom.xml @@ -169,7 +169,7 @@ 2.14.0 3.3.1 - 0.11.2 + 0.12.6 false false twilio @@ -491,4 +491,4 @@ oss-parent 7 - \ No newline at end of file + diff --git a/src/test/java/com/twilio/jwt/accesstoken/AccessTokenTest.java b/src/test/java/com/twilio/jwt/accesstoken/AccessTokenTest.java index 1cb6d868f8..09bfb638cf 100644 --- a/src/test/java/com/twilio/jwt/accesstoken/AccessTokenTest.java +++ b/src/test/java/com/twilio/jwt/accesstoken/AccessTokenTest.java @@ -33,9 +33,9 @@ private void validateToken(Claims claims) { } private Claims getClaimFromJwtToken(Jwt token) { - return Jwts.parserBuilder() - .setSigningKey(SECRET.getBytes()).build() - .parseClaimsJws(token.toJwt()) + return Jwts.parser() + .setSigningKey(SECRET.getBytes()).build() + .parseSignedClaims(token.toJwt()) .getBody(); } @@ -100,9 +100,9 @@ public void testRegion() { .region("foo") .build(); - JwsHeader header = Jwts.parserBuilder() + JwsHeader header = Jwts.parser() .setSigningKey(SECRET.getBytes()).build() - .parseClaimsJws(token.toJwt()) + .parseSignedClaims(token.toJwt()) .getHeader(); Assert.assertEquals("foo", header.get("twr")); @@ -112,9 +112,9 @@ public void testRegion() { public void testEmptyRegion() { Jwt token = new AccessToken.Builder(ACCOUNT_SID, SIGNING_KEY_SID, SECRET).build(); - JwsHeader header = Jwts.parserBuilder() + JwsHeader header = Jwts.parser() .setSigningKey(SECRET.getBytes()).build() - .parseClaimsJws(token.toJwt()) + .parseSignedClaims(token.toJwt()) .getHeader(); Assert.assertEquals(null, header.get("twr")); diff --git a/src/test/java/com/twilio/jwt/client/ClientCapabilityTest.java b/src/test/java/com/twilio/jwt/client/ClientCapabilityTest.java index 7a63abb49e..bd4da16d9b 100644 --- a/src/test/java/com/twilio/jwt/client/ClientCapabilityTest.java +++ b/src/test/java/com/twilio/jwt/client/ClientCapabilityTest.java @@ -6,6 +6,7 @@ import org.junit.Assert; import org.junit.Test; +import javax.crypto.spec.SecretKeySpec; import java.util.Arrays; import java.util.Date; import java.util.List; @@ -23,9 +24,9 @@ public void testEmptyToken() { Jwt jwt = new ClientCapability.Builder(ACCOUNT_SID, SECRET).build(); Claims claims = - Jwts.parserBuilder() + Jwts.parser() .setSigningKey(SECRET.getBytes()).build() - .parseClaimsJws(jwt.toJwt()) + .parseSignedClaims(jwt.toJwt()) .getBody(); Assert.assertEquals(ACCOUNT_SID, claims.getIssuer()); @@ -43,8 +44,8 @@ public void testToken() { Claims claims = Jwts.parser() - .setSigningKey(SECRET.getBytes()) - .parseClaimsJws(jwt.toJwt()) + .setSigningKey(SECRET.getBytes()).build() + .parseSignedClaims(jwt.toJwt()) .getBody(); Assert.assertEquals(ACCOUNT_SID, claims.getIssuer()); diff --git a/src/test/java/com/twilio/jwt/taskrouter/TaskRouterCapabilityTest.java b/src/test/java/com/twilio/jwt/taskrouter/TaskRouterCapabilityTest.java index f084174841..4bdfa9c4b7 100644 --- a/src/test/java/com/twilio/jwt/taskrouter/TaskRouterCapabilityTest.java +++ b/src/test/java/com/twilio/jwt/taskrouter/TaskRouterCapabilityTest.java @@ -35,9 +35,9 @@ public void testToken() { .policies(policies) .build(); Claims claims = - Jwts.parserBuilder() + Jwts.parser() .setSigningKey(AUTH_TOKEN.getBytes()).build() - .parseClaimsJws(jwt.toJwt()) + .parseSignedClaims(jwt.toJwt()) .getBody(); Assert.assertEquals(WORKSPACE_SID, claims.get("workspace_sid")); @@ -78,9 +78,9 @@ public void testWorkerToken() { .policies(policies) .build(); final Claims claims = - Jwts.parserBuilder() + Jwts.parser() .setSigningKey(AUTH_TOKEN.getBytes()).build() - .parseClaimsJws(jwt.toJwt()) + .parseSignedClaims(jwt.toJwt()) .getBody(); Assert.assertEquals(WORKSPACE_SID, claims.get("workspace_sid")); diff --git a/src/test/java/com/twilio/jwt/validation/ValidationTokenTest.java b/src/test/java/com/twilio/jwt/validation/ValidationTokenTest.java index a1dc059534..d5b24ceb14 100644 --- a/src/test/java/com/twilio/jwt/validation/ValidationTokenTest.java +++ b/src/test/java/com/twilio/jwt/validation/ValidationTokenTest.java @@ -88,9 +88,9 @@ public void testTokenBuilder() { .build(); Claims claims = - Jwts.parserBuilder() + Jwts.parser() .setSigningKey(privateKey).build() - .parseClaimsJws(jwt.toJwt()) + .parseSignedClaims(jwt.toJwt()) .getBody(); this.validateToken(claims); @@ -113,8 +113,8 @@ public void testTokenValidAlgorithms() { .build(); Claims claims = - Jwts.parserBuilder().setSigningKey(publicKey).build() - .parseClaimsJws(jwt.toJwt()) + Jwts.parser().setSigningKey(publicKey).build() + .parseSignedClaims(jwt.toJwt()) .getBody(); validateToken(claims); } @@ -135,8 +135,8 @@ public void testTokenInvalidAlgorithms() { .build(); - Jwts.parserBuilder().setSigningKey(publicKey).build() - .parseClaimsJws(jwt.toJwt()) + Jwts.parser().setSigningKey(publicKey).build() + .parseSignedClaims(jwt.toJwt()) .getBody(); } } @@ -151,9 +151,9 @@ public void testTokenFromHttpRequest() throws IOException { Jwt jwt = ValidationToken.fromHttpRequest(ACCOUNT_SID, CREDENTIAL_SID, SIGNING_KEY_SID, privateKey, request, SIGNED_HEADERS); Claims claims = - Jwts.parserBuilder().setSigningKey(privateKey).build() - .parseClaimsJws(jwt.toJwt()) - .getBody(); + Jwts.parser().setSigningKey(privateKey).build() + .parseSignedClaims(jwt.toJwt()) + .getBody(); this.validateToken(claims); Assert.assertEquals("authorization;host", claims.get("hrh")); @@ -172,9 +172,9 @@ public void testTokenFromEntityRequest() throws IOException { Jwt jwt = ValidationToken.fromHttpRequest(ACCOUNT_SID, CREDENTIAL_SID, SIGNING_KEY_SID, privateKey, requestWithEntity, SIGNED_HEADERS); Claims claims = - Jwts.parserBuilder() + Jwts.parser() .setSigningKey(privateKey).build() - .parseClaimsJws(jwt.toJwt()) + .parseSignedClaims(jwt.toJwt()) .getBody(); this.validateToken(claims); @@ -193,9 +193,9 @@ public void testTokenFromHttpRequestWithHostPort() throws IOException { Jwt jwt = ValidationToken.fromHttpRequest(ACCOUNT_SID, CREDENTIAL_SID, SIGNING_KEY_SID, privateKey, request, SIGNED_HEADERS); Claims claims = - Jwts.parserBuilder() + Jwts.parser() .setSigningKey(privateKey).build() - .parseClaimsJws(jwt.toJwt()) + .parseSignedClaims(jwt.toJwt()) .getBody();