You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2017/06/22 16:39:43 UTC
[1/2] syncope git commit: Removing warnings for local variable hiding
class field + using UUID.randomUUID as other test cases
Repository: syncope
Updated Branches:
refs/heads/2_0_X 579d5b7c8 -> d501f3551
refs/heads/master a4f351196 -> 0dc6593ff
Removing warnings for local variable hiding class field + using UUID.randomUUID as other test cases
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/d501f355
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/d501f355
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/d501f355
Branch: refs/heads/2_0_X
Commit: d501f3551e9cbe908d7ccee8457b71eb868bdf1f
Parents: 579d5b7
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Thu Jun 22 18:39:03 2017 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Thu Jun 22 18:39:03 2017 +0200
----------------------------------------------------------------------
.../org/apache/syncope/fit/core/JWTITCase.java | 63 ++++++++++----------
1 file changed, 31 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/d501f355/fit/core-reference/src/test/java/org/apache/syncope/fit/core/JWTITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/JWTITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/JWTITCase.java
index bc1767a..27af849 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/JWTITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/JWTITCase.java
@@ -18,17 +18,19 @@
*/
package org.apache.syncope.fit.core;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.security.AccessControlException;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
-
+import java.util.UUID;
import javax.ws.rs.core.Response;
import javax.xml.ws.WebServiceException;
-
import org.apache.cxf.rs.security.jose.common.JoseType;
import org.apache.cxf.rs.security.jose.jwa.SignatureAlgorithm;
import org.apache.cxf.rs.security.jose.jws.HmacJwsSignatureProvider;
@@ -48,8 +50,6 @@ import org.apache.syncope.common.rest.api.service.UserSelfService;
import org.apache.syncope.fit.AbstractITCase;
import org.junit.Test;
-import com.fasterxml.uuid.Generators;
-
/**
* Some tests for JWT Tokens
*/
@@ -58,8 +58,8 @@ public class JWTITCase extends AbstractITCase {
@Test
public void testGetJWTToken() throws ParseException {
// Get the token
- SyncopeClient adminClient = clientFactory.create(ADMIN_UNAME, ADMIN_PWD);
- AccessTokenService accessTokenService = adminClient.getService(AccessTokenService.class);
+ SyncopeClient localClient = clientFactory.create(ADMIN_UNAME, ADMIN_PWD);
+ AccessTokenService accessTokenService = localClient.getService(AccessTokenService.class);
Response response = accessTokenService.login();
String token = response.getHeaderString(RESTHeaders.TOKEN);
@@ -70,7 +70,7 @@ public class JWTITCase extends AbstractITCase {
// Validate the signature
JwsJwtCompactConsumer consumer = new JwsJwtCompactConsumer(token);
JwsSignatureVerifier jwsSignatureVerifier =
- new HmacJwsSignatureVerifier(JWS_KEY.getBytes(), SignatureAlgorithm.HS512);
+ new HmacJwsSignatureVerifier(JWS_KEY.getBytes(), SignatureAlgorithm.HS512);
assertTrue(consumer.verifySignatureWith(jwsSignatureVerifier));
Date now = new Date();
@@ -80,7 +80,7 @@ public class JWTITCase extends AbstractITCase {
assertNotNull(expiryTime);
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX");
- Date tokenDate = dateFormat.parse(dateFormat.format(new Date(expiryTime.longValue())));
+ Date tokenDate = dateFormat.parse(dateFormat.format(new Date(expiryTime)));
Date parsedDate = dateFormat.parse(expiry);
assertEquals(tokenDate, parsedDate);
@@ -89,7 +89,7 @@ public class JWTITCase extends AbstractITCase {
// Verify issuedAt
Long issuedAt = consumer.getJwtClaims().getIssuedAt();
assertNotNull(issuedAt);
- assertTrue(new Date(issuedAt.longValue()).before(now));
+ assertTrue(new Date(issuedAt).before(now));
// Validate subject + issuer
assertEquals("admin", consumer.getJwtClaims().getSubject());
@@ -98,14 +98,14 @@ public class JWTITCase extends AbstractITCase {
// Verify NotBefore
Long notBefore = consumer.getJwtClaims().getNotBefore();
assertNotNull(notBefore);
- assertTrue(new Date(notBefore.longValue()).before(now));
+ assertTrue(new Date(notBefore).before(now));
}
@Test
public void testQueryUsingToken() throws ParseException {
// Get the token
- SyncopeClient adminClient = clientFactory.create(ADMIN_UNAME, ADMIN_PWD);
- AccessTokenService accessTokenService = adminClient.getService(AccessTokenService.class);
+ SyncopeClient localClient = clientFactory.create(ADMIN_UNAME, ADMIN_PWD);
+ AccessTokenService accessTokenService = localClient.getService(AccessTokenService.class);
Response response = accessTokenService.login();
String token = response.getHeaderString(RESTHeaders.TOKEN);
@@ -130,8 +130,8 @@ public class JWTITCase extends AbstractITCase {
@Test
public void testTokenValidation() throws ParseException {
// Get an initial token
- SyncopeClient adminClient = clientFactory.create(ADMIN_UNAME, ADMIN_PWD);
- AccessTokenService accessTokenService = adminClient.getService(AccessTokenService.class);
+ SyncopeClient localClient = clientFactory.create(ADMIN_UNAME, ADMIN_PWD);
+ AccessTokenService accessTokenService = localClient.getService(AccessTokenService.class);
Response response = accessTokenService.login();
String token = response.getHeaderString(RESTHeaders.TOKEN);
@@ -159,7 +159,7 @@ public class JWTITCase extends AbstractITCase {
JwsJwtCompactProducer producer = new JwsJwtCompactProducer(jwtToken);
JwsSignatureProvider jwsSignatureProvider =
- new HmacJwsSignatureProvider(JWS_KEY.getBytes(), SignatureAlgorithm.HS512);
+ new HmacJwsSignatureProvider(JWS_KEY.getBytes(), SignatureAlgorithm.HS512);
String signed = producer.signWith(jwsSignatureProvider);
SyncopeClient jwtClient = clientFactory.create(signed);
@@ -170,8 +170,8 @@ public class JWTITCase extends AbstractITCase {
@Test
public void testInvalidIssuer() throws ParseException {
// Get an initial token
- SyncopeClient adminClient = clientFactory.create(ADMIN_UNAME, ADMIN_PWD);
- AccessTokenService accessTokenService = adminClient.getService(AccessTokenService.class);
+ SyncopeClient localClient = clientFactory.create(ADMIN_UNAME, ADMIN_PWD);
+ AccessTokenService accessTokenService = localClient.getService(AccessTokenService.class);
Response response = accessTokenService.login();
String token = response.getHeaderString(RESTHeaders.TOKEN);
@@ -199,7 +199,7 @@ public class JWTITCase extends AbstractITCase {
JwsJwtCompactProducer producer = new JwsJwtCompactProducer(jwtToken);
JwsSignatureProvider jwsSignatureProvider =
- new HmacJwsSignatureProvider(JWS_KEY.getBytes(), SignatureAlgorithm.HS512);
+ new HmacJwsSignatureProvider(JWS_KEY.getBytes(), SignatureAlgorithm.HS512);
String signed = producer.signWith(jwsSignatureProvider);
SyncopeClient jwtClient = clientFactory.create(signed);
@@ -215,8 +215,8 @@ public class JWTITCase extends AbstractITCase {
@Test
public void testExpiredToken() throws ParseException {
// Get an initial token
- SyncopeClient adminClient = clientFactory.create(ADMIN_UNAME, ADMIN_PWD);
- AccessTokenService accessTokenService = adminClient.getService(AccessTokenService.class);
+ SyncopeClient localClient = clientFactory.create(ADMIN_UNAME, ADMIN_PWD);
+ AccessTokenService accessTokenService = localClient.getService(AccessTokenService.class);
Response response = accessTokenService.login();
String token = response.getHeaderString(RESTHeaders.TOKEN);
@@ -244,7 +244,7 @@ public class JWTITCase extends AbstractITCase {
JwsJwtCompactProducer producer = new JwsJwtCompactProducer(jwtToken);
JwsSignatureProvider jwsSignatureProvider =
- new HmacJwsSignatureProvider(JWS_KEY.getBytes(), SignatureAlgorithm.HS512);
+ new HmacJwsSignatureProvider(JWS_KEY.getBytes(), SignatureAlgorithm.HS512);
String signed = producer.signWith(jwsSignatureProvider);
SyncopeClient jwtClient = clientFactory.create(signed);
@@ -260,8 +260,8 @@ public class JWTITCase extends AbstractITCase {
@Test
public void testNotBefore() throws ParseException {
// Get an initial token
- SyncopeClient adminClient = clientFactory.create(ADMIN_UNAME, ADMIN_PWD);
- AccessTokenService accessTokenService = adminClient.getService(AccessTokenService.class);
+ SyncopeClient localClient = clientFactory.create(ADMIN_UNAME, ADMIN_PWD);
+ AccessTokenService accessTokenService = localClient.getService(AccessTokenService.class);
Response response = accessTokenService.login();
String token = response.getHeaderString(RESTHeaders.TOKEN);
@@ -289,7 +289,7 @@ public class JWTITCase extends AbstractITCase {
JwsJwtCompactProducer producer = new JwsJwtCompactProducer(jwtToken);
JwsSignatureProvider jwsSignatureProvider =
- new HmacJwsSignatureProvider(JWS_KEY.getBytes(), SignatureAlgorithm.HS512);
+ new HmacJwsSignatureProvider(JWS_KEY.getBytes(), SignatureAlgorithm.HS512);
String signed = producer.signWith(jwsSignatureProvider);
SyncopeClient jwtClient = clientFactory.create(signed);
@@ -305,8 +305,8 @@ public class JWTITCase extends AbstractITCase {
@Test
public void testNoneSignature() throws ParseException {
// Get an initial token
- SyncopeClient adminClient = clientFactory.create(ADMIN_UNAME, ADMIN_PWD);
- AccessTokenService accessTokenService = adminClient.getService(AccessTokenService.class);
+ SyncopeClient localClient = clientFactory.create(ADMIN_UNAME, ADMIN_PWD);
+ AccessTokenService accessTokenService = localClient.getService(AccessTokenService.class);
Response response = accessTokenService.login();
String token = response.getHeaderString(RESTHeaders.TOKEN);
@@ -315,7 +315,6 @@ public class JWTITCase extends AbstractITCase {
String tokenId = consumer.getJwtClaims().getTokenId();
// Create a new token using the Id of the first token
-
JwtClaims jwtClaims = new JwtClaims();
jwtClaims.setTokenId(tokenId);
jwtClaims.setSubject(consumer.getJwtClaims().getSubject());
@@ -344,8 +343,8 @@ public class JWTITCase extends AbstractITCase {
@Test
public void testUnknownId() throws ParseException {
// Get an initial token
- SyncopeClient adminClient = clientFactory.create(ADMIN_UNAME, ADMIN_PWD);
- AccessTokenService accessTokenService = adminClient.getService(AccessTokenService.class);
+ SyncopeClient localClient = clientFactory.create(ADMIN_UNAME, ADMIN_PWD);
+ AccessTokenService accessTokenService = localClient.getService(AccessTokenService.class);
Response response = accessTokenService.login();
String token = response.getHeaderString(RESTHeaders.TOKEN);
@@ -359,7 +358,7 @@ public class JWTITCase extends AbstractITCase {
expiry.add(Calendar.MINUTE, 5);
JwtClaims jwtClaims = new JwtClaims();
- jwtClaims.setTokenId(Generators.randomBasedGenerator().generate().toString());
+ jwtClaims.setTokenId(UUID.randomUUID().toString());
jwtClaims.setSubject("admin");
jwtClaims.setIssuedAt(now.getTime());
jwtClaims.setIssuer(JWT_ISSUER);
@@ -371,7 +370,7 @@ public class JWTITCase extends AbstractITCase {
JwsJwtCompactProducer producer = new JwsJwtCompactProducer(jwtToken);
JwsSignatureProvider jwsSignatureProvider =
- new HmacJwsSignatureProvider(JWS_KEY.getBytes(), SignatureAlgorithm.HS512);
+ new HmacJwsSignatureProvider(JWS_KEY.getBytes(), SignatureAlgorithm.HS512);
String signed = producer.signWith(jwsSignatureProvider);
SyncopeClient jwtClient = clientFactory.create(signed);
[2/2] syncope git commit: Removing warnings for local variable hiding
class field + using UUID.randomUUID as other test cases
Posted by il...@apache.org.
Removing warnings for local variable hiding class field + using UUID.randomUUID as other test cases
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/0dc6593f
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/0dc6593f
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/0dc6593f
Branch: refs/heads/master
Commit: 0dc6593ffccd559cd147e088a4832368d33532b5
Parents: a4f3511
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Thu Jun 22 18:39:03 2017 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Thu Jun 22 18:39:31 2017 +0200
----------------------------------------------------------------------
.../org/apache/syncope/fit/core/JWTITCase.java | 63 ++++++++++----------
1 file changed, 31 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/0dc6593f/fit/core-reference/src/test/java/org/apache/syncope/fit/core/JWTITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/JWTITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/JWTITCase.java
index bc1767a..27af849 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/JWTITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/JWTITCase.java
@@ -18,17 +18,19 @@
*/
package org.apache.syncope.fit.core;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.security.AccessControlException;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
-
+import java.util.UUID;
import javax.ws.rs.core.Response;
import javax.xml.ws.WebServiceException;
-
import org.apache.cxf.rs.security.jose.common.JoseType;
import org.apache.cxf.rs.security.jose.jwa.SignatureAlgorithm;
import org.apache.cxf.rs.security.jose.jws.HmacJwsSignatureProvider;
@@ -48,8 +50,6 @@ import org.apache.syncope.common.rest.api.service.UserSelfService;
import org.apache.syncope.fit.AbstractITCase;
import org.junit.Test;
-import com.fasterxml.uuid.Generators;
-
/**
* Some tests for JWT Tokens
*/
@@ -58,8 +58,8 @@ public class JWTITCase extends AbstractITCase {
@Test
public void testGetJWTToken() throws ParseException {
// Get the token
- SyncopeClient adminClient = clientFactory.create(ADMIN_UNAME, ADMIN_PWD);
- AccessTokenService accessTokenService = adminClient.getService(AccessTokenService.class);
+ SyncopeClient localClient = clientFactory.create(ADMIN_UNAME, ADMIN_PWD);
+ AccessTokenService accessTokenService = localClient.getService(AccessTokenService.class);
Response response = accessTokenService.login();
String token = response.getHeaderString(RESTHeaders.TOKEN);
@@ -70,7 +70,7 @@ public class JWTITCase extends AbstractITCase {
// Validate the signature
JwsJwtCompactConsumer consumer = new JwsJwtCompactConsumer(token);
JwsSignatureVerifier jwsSignatureVerifier =
- new HmacJwsSignatureVerifier(JWS_KEY.getBytes(), SignatureAlgorithm.HS512);
+ new HmacJwsSignatureVerifier(JWS_KEY.getBytes(), SignatureAlgorithm.HS512);
assertTrue(consumer.verifySignatureWith(jwsSignatureVerifier));
Date now = new Date();
@@ -80,7 +80,7 @@ public class JWTITCase extends AbstractITCase {
assertNotNull(expiryTime);
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX");
- Date tokenDate = dateFormat.parse(dateFormat.format(new Date(expiryTime.longValue())));
+ Date tokenDate = dateFormat.parse(dateFormat.format(new Date(expiryTime)));
Date parsedDate = dateFormat.parse(expiry);
assertEquals(tokenDate, parsedDate);
@@ -89,7 +89,7 @@ public class JWTITCase extends AbstractITCase {
// Verify issuedAt
Long issuedAt = consumer.getJwtClaims().getIssuedAt();
assertNotNull(issuedAt);
- assertTrue(new Date(issuedAt.longValue()).before(now));
+ assertTrue(new Date(issuedAt).before(now));
// Validate subject + issuer
assertEquals("admin", consumer.getJwtClaims().getSubject());
@@ -98,14 +98,14 @@ public class JWTITCase extends AbstractITCase {
// Verify NotBefore
Long notBefore = consumer.getJwtClaims().getNotBefore();
assertNotNull(notBefore);
- assertTrue(new Date(notBefore.longValue()).before(now));
+ assertTrue(new Date(notBefore).before(now));
}
@Test
public void testQueryUsingToken() throws ParseException {
// Get the token
- SyncopeClient adminClient = clientFactory.create(ADMIN_UNAME, ADMIN_PWD);
- AccessTokenService accessTokenService = adminClient.getService(AccessTokenService.class);
+ SyncopeClient localClient = clientFactory.create(ADMIN_UNAME, ADMIN_PWD);
+ AccessTokenService accessTokenService = localClient.getService(AccessTokenService.class);
Response response = accessTokenService.login();
String token = response.getHeaderString(RESTHeaders.TOKEN);
@@ -130,8 +130,8 @@ public class JWTITCase extends AbstractITCase {
@Test
public void testTokenValidation() throws ParseException {
// Get an initial token
- SyncopeClient adminClient = clientFactory.create(ADMIN_UNAME, ADMIN_PWD);
- AccessTokenService accessTokenService = adminClient.getService(AccessTokenService.class);
+ SyncopeClient localClient = clientFactory.create(ADMIN_UNAME, ADMIN_PWD);
+ AccessTokenService accessTokenService = localClient.getService(AccessTokenService.class);
Response response = accessTokenService.login();
String token = response.getHeaderString(RESTHeaders.TOKEN);
@@ -159,7 +159,7 @@ public class JWTITCase extends AbstractITCase {
JwsJwtCompactProducer producer = new JwsJwtCompactProducer(jwtToken);
JwsSignatureProvider jwsSignatureProvider =
- new HmacJwsSignatureProvider(JWS_KEY.getBytes(), SignatureAlgorithm.HS512);
+ new HmacJwsSignatureProvider(JWS_KEY.getBytes(), SignatureAlgorithm.HS512);
String signed = producer.signWith(jwsSignatureProvider);
SyncopeClient jwtClient = clientFactory.create(signed);
@@ -170,8 +170,8 @@ public class JWTITCase extends AbstractITCase {
@Test
public void testInvalidIssuer() throws ParseException {
// Get an initial token
- SyncopeClient adminClient = clientFactory.create(ADMIN_UNAME, ADMIN_PWD);
- AccessTokenService accessTokenService = adminClient.getService(AccessTokenService.class);
+ SyncopeClient localClient = clientFactory.create(ADMIN_UNAME, ADMIN_PWD);
+ AccessTokenService accessTokenService = localClient.getService(AccessTokenService.class);
Response response = accessTokenService.login();
String token = response.getHeaderString(RESTHeaders.TOKEN);
@@ -199,7 +199,7 @@ public class JWTITCase extends AbstractITCase {
JwsJwtCompactProducer producer = new JwsJwtCompactProducer(jwtToken);
JwsSignatureProvider jwsSignatureProvider =
- new HmacJwsSignatureProvider(JWS_KEY.getBytes(), SignatureAlgorithm.HS512);
+ new HmacJwsSignatureProvider(JWS_KEY.getBytes(), SignatureAlgorithm.HS512);
String signed = producer.signWith(jwsSignatureProvider);
SyncopeClient jwtClient = clientFactory.create(signed);
@@ -215,8 +215,8 @@ public class JWTITCase extends AbstractITCase {
@Test
public void testExpiredToken() throws ParseException {
// Get an initial token
- SyncopeClient adminClient = clientFactory.create(ADMIN_UNAME, ADMIN_PWD);
- AccessTokenService accessTokenService = adminClient.getService(AccessTokenService.class);
+ SyncopeClient localClient = clientFactory.create(ADMIN_UNAME, ADMIN_PWD);
+ AccessTokenService accessTokenService = localClient.getService(AccessTokenService.class);
Response response = accessTokenService.login();
String token = response.getHeaderString(RESTHeaders.TOKEN);
@@ -244,7 +244,7 @@ public class JWTITCase extends AbstractITCase {
JwsJwtCompactProducer producer = new JwsJwtCompactProducer(jwtToken);
JwsSignatureProvider jwsSignatureProvider =
- new HmacJwsSignatureProvider(JWS_KEY.getBytes(), SignatureAlgorithm.HS512);
+ new HmacJwsSignatureProvider(JWS_KEY.getBytes(), SignatureAlgorithm.HS512);
String signed = producer.signWith(jwsSignatureProvider);
SyncopeClient jwtClient = clientFactory.create(signed);
@@ -260,8 +260,8 @@ public class JWTITCase extends AbstractITCase {
@Test
public void testNotBefore() throws ParseException {
// Get an initial token
- SyncopeClient adminClient = clientFactory.create(ADMIN_UNAME, ADMIN_PWD);
- AccessTokenService accessTokenService = adminClient.getService(AccessTokenService.class);
+ SyncopeClient localClient = clientFactory.create(ADMIN_UNAME, ADMIN_PWD);
+ AccessTokenService accessTokenService = localClient.getService(AccessTokenService.class);
Response response = accessTokenService.login();
String token = response.getHeaderString(RESTHeaders.TOKEN);
@@ -289,7 +289,7 @@ public class JWTITCase extends AbstractITCase {
JwsJwtCompactProducer producer = new JwsJwtCompactProducer(jwtToken);
JwsSignatureProvider jwsSignatureProvider =
- new HmacJwsSignatureProvider(JWS_KEY.getBytes(), SignatureAlgorithm.HS512);
+ new HmacJwsSignatureProvider(JWS_KEY.getBytes(), SignatureAlgorithm.HS512);
String signed = producer.signWith(jwsSignatureProvider);
SyncopeClient jwtClient = clientFactory.create(signed);
@@ -305,8 +305,8 @@ public class JWTITCase extends AbstractITCase {
@Test
public void testNoneSignature() throws ParseException {
// Get an initial token
- SyncopeClient adminClient = clientFactory.create(ADMIN_UNAME, ADMIN_PWD);
- AccessTokenService accessTokenService = adminClient.getService(AccessTokenService.class);
+ SyncopeClient localClient = clientFactory.create(ADMIN_UNAME, ADMIN_PWD);
+ AccessTokenService accessTokenService = localClient.getService(AccessTokenService.class);
Response response = accessTokenService.login();
String token = response.getHeaderString(RESTHeaders.TOKEN);
@@ -315,7 +315,6 @@ public class JWTITCase extends AbstractITCase {
String tokenId = consumer.getJwtClaims().getTokenId();
// Create a new token using the Id of the first token
-
JwtClaims jwtClaims = new JwtClaims();
jwtClaims.setTokenId(tokenId);
jwtClaims.setSubject(consumer.getJwtClaims().getSubject());
@@ -344,8 +343,8 @@ public class JWTITCase extends AbstractITCase {
@Test
public void testUnknownId() throws ParseException {
// Get an initial token
- SyncopeClient adminClient = clientFactory.create(ADMIN_UNAME, ADMIN_PWD);
- AccessTokenService accessTokenService = adminClient.getService(AccessTokenService.class);
+ SyncopeClient localClient = clientFactory.create(ADMIN_UNAME, ADMIN_PWD);
+ AccessTokenService accessTokenService = localClient.getService(AccessTokenService.class);
Response response = accessTokenService.login();
String token = response.getHeaderString(RESTHeaders.TOKEN);
@@ -359,7 +358,7 @@ public class JWTITCase extends AbstractITCase {
expiry.add(Calendar.MINUTE, 5);
JwtClaims jwtClaims = new JwtClaims();
- jwtClaims.setTokenId(Generators.randomBasedGenerator().generate().toString());
+ jwtClaims.setTokenId(UUID.randomUUID().toString());
jwtClaims.setSubject("admin");
jwtClaims.setIssuedAt(now.getTime());
jwtClaims.setIssuer(JWT_ISSUER);
@@ -371,7 +370,7 @@ public class JWTITCase extends AbstractITCase {
JwsJwtCompactProducer producer = new JwsJwtCompactProducer(jwtToken);
JwsSignatureProvider jwsSignatureProvider =
- new HmacJwsSignatureProvider(JWS_KEY.getBytes(), SignatureAlgorithm.HS512);
+ new HmacJwsSignatureProvider(JWS_KEY.getBytes(), SignatureAlgorithm.HS512);
String signed = producer.signWith(jwsSignatureProvider);
SyncopeClient jwtClient = clientFactory.create(signed);