Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/version_3.1.4' into version_3.1.4
Browse files Browse the repository at this point in the history
  • Loading branch information
@yuriyz
yuriyz committed Jul 5, 2018
2 parents 1540bf9 + 96e11b8 commit 821f7db
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 2 deletions.
5 changes: 4 additions & 1 deletion Client/src/test/java/org/xdi/oxauth/interop/SupportsReturningClaimsInIdToken.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
* OC5:FeatureTest-Supports Returning Claims in ID Token
*
* @author Javier Rojas Blum
* @version November 3, 2016
* @version July 4, 2018
*/
public class SupportsReturningClaimsInIdToken extends BaseTest {

Expand All @@ -53,6 +53,9 @@ public void supportsReturningClaimsInIdToken(
StringUtils.spaceSeparatedToList(redirectUris));
registerRequest.setResponseTypes(responseTypes);
registerRequest.setSectorIdentifierUri(sectorIdentifierUri);
registerRequest.setClaims(Arrays.asList(
JwtClaimName.NAME,
JwtClaimName.EMAIL));

RegisterClient registerClient = new RegisterClient(registrationEndpoint);
registerClient.setRequest(registerRequest);
Expand Down
17 changes: 16 additions & 1 deletion Client/src/test/java/org/xdi/oxauth/ws/rs/MultivaluedClaims.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

/**
* @author Javier Rojas Blum
* @version April 2, 2018
* @version July 4, 2018
*/
public class MultivaluedClaims extends BaseTest {

Expand Down Expand Up @@ -1399,6 +1399,7 @@ public void authorizationRequestObjectWithMultivaluedClaimNone(
registerRequest.setIdTokenSignedResponseAlg(SignatureAlgorithm.NONE);
registerRequest.setUserInfoSignedResponseAlg(SignatureAlgorithm.NONE);
registerRequest.setRequestObjectSigningAlg(SignatureAlgorithm.NONE);
registerRequest.setClaims(Arrays.asList("member_of"));

RegisterClient registerClient = new RegisterClient(registrationEndpoint);
registerClient.setRequest(registerRequest);
Expand Down Expand Up @@ -1494,6 +1495,7 @@ public void authorizationRequestObjectWithMultivaluedClaimHS256(
registerRequest.setIdTokenSignedResponseAlg(SignatureAlgorithm.HS256);
registerRequest.setUserInfoSignedResponseAlg(SignatureAlgorithm.HS256);
registerRequest.setRequestObjectSigningAlg(SignatureAlgorithm.HS256);
registerRequest.setClaims(Arrays.asList("member_of"));

RegisterClient registerClient = new RegisterClient(registrationEndpoint);
registerClient.setRequest(registerRequest);
Expand Down Expand Up @@ -1591,6 +1593,7 @@ public void authorizationRequestObjectWithMultivaluedClaimHS384(
registerRequest.setIdTokenSignedResponseAlg(SignatureAlgorithm.HS384);
registerRequest.setUserInfoSignedResponseAlg(SignatureAlgorithm.HS384);
registerRequest.setRequestObjectSigningAlg(SignatureAlgorithm.HS384);
registerRequest.setClaims(Arrays.asList("member_of"));

RegisterClient registerClient = new RegisterClient(registrationEndpoint);
registerClient.setRequest(registerRequest);
Expand Down Expand Up @@ -1688,6 +1691,7 @@ public void authorizationRequestObjectWithMultivaluedClaimHS512(
registerRequest.setIdTokenSignedResponseAlg(SignatureAlgorithm.HS512);
registerRequest.setUserInfoSignedResponseAlg(SignatureAlgorithm.HS512);
registerRequest.setRequestObjectSigningAlg(SignatureAlgorithm.HS512);
registerRequest.setClaims(Arrays.asList("member_of"));

RegisterClient registerClient = new RegisterClient(registrationEndpoint);
registerClient.setRequest(registerRequest);
Expand Down Expand Up @@ -1787,6 +1791,7 @@ public void authorizationRequestObjectWithMultivaluedClaimRS256(
registerRequest.setUserInfoSignedResponseAlg(SignatureAlgorithm.RS256);
registerRequest.setRequestObjectSigningAlg(SignatureAlgorithm.RS256);
registerRequest.setJwksUri(clientJwksUri);
registerRequest.setClaims(Arrays.asList("member_of"));

RegisterClient registerClient = new RegisterClient(registrationEndpoint);
registerClient.setRequest(registerRequest);
Expand Down Expand Up @@ -1890,6 +1895,7 @@ public void authorizationRequestObjectWithMultivaluedClaimRS384(
registerRequest.setUserInfoSignedResponseAlg(SignatureAlgorithm.RS384);
registerRequest.setRequestObjectSigningAlg(SignatureAlgorithm.RS384);
registerRequest.setJwksUri(clientJwksUri);
registerRequest.setClaims(Arrays.asList("member_of"));

RegisterClient registerClient = new RegisterClient(registrationEndpoint);
registerClient.setRequest(registerRequest);
Expand Down Expand Up @@ -1993,6 +1999,7 @@ public void authorizationRequestObjectWithMultivaluedClaimRS512(
registerRequest.setUserInfoSignedResponseAlg(SignatureAlgorithm.RS512);
registerRequest.setRequestObjectSigningAlg(SignatureAlgorithm.RS512);
registerRequest.setJwksUri(clientJwksUri);
registerRequest.setClaims(Arrays.asList("member_of"));

RegisterClient registerClient = new RegisterClient(registrationEndpoint);
registerClient.setRequest(registerRequest);
Expand Down Expand Up @@ -2096,6 +2103,7 @@ public void authorizationRequestObjectWithMultivaluedClaimES256(
registerRequest.setUserInfoSignedResponseAlg(SignatureAlgorithm.ES256);
registerRequest.setRequestObjectSigningAlg(SignatureAlgorithm.ES256);
registerRequest.setJwksUri(clientJwksUri);
registerRequest.setClaims(Arrays.asList("member_of"));

RegisterClient registerClient = new RegisterClient(registrationEndpoint);
registerClient.setRequest(registerRequest);
Expand Down Expand Up @@ -2199,6 +2207,7 @@ public void authorizationRequestObjectWithMultivaluedClaimES384(
registerRequest.setUserInfoSignedResponseAlg(SignatureAlgorithm.ES384);
registerRequest.setRequestObjectSigningAlg(SignatureAlgorithm.ES384);
registerRequest.setJwksUri(clientJwksUri);
registerRequest.setClaims(Arrays.asList("member_of"));

RegisterClient registerClient = new RegisterClient(registrationEndpoint);
registerClient.setRequest(registerRequest);
Expand Down Expand Up @@ -2302,6 +2311,7 @@ public void authorizationRequestObjectWithMultivaluedClaimES512(
registerRequest.setUserInfoSignedResponseAlg(SignatureAlgorithm.ES512);
registerRequest.setRequestObjectSigningAlg(SignatureAlgorithm.ES512);
registerRequest.setJwksUri(clientJwksUri);
registerRequest.setClaims(Arrays.asList("member_of"));

RegisterClient registerClient = new RegisterClient(registrationEndpoint);
registerClient.setRequest(registerRequest);
Expand Down Expand Up @@ -2405,6 +2415,7 @@ public void authorizationRequestObjectWithMultivaluedClaimAlgA128KWEncA128GCM(
registerRequest.setUserInfoEncryptedResponseEnc(BlockEncryptionAlgorithm.A128GCM);
registerRequest.setRequestObjectEncryptionAlg(KeyEncryptionAlgorithm.A128KW);
registerRequest.setRequestObjectEncryptionEnc(BlockEncryptionAlgorithm.A128GCM);
registerRequest.setClaims(Arrays.asList("member_of"));

RegisterClient registerClient = new RegisterClient(registrationEndpoint);
registerClient.setRequest(registerRequest);
Expand Down Expand Up @@ -2503,6 +2514,7 @@ public void authorizationRequestObjectWithMultivaluedClaimAlgA256KWEncA256GCM(
registerRequest.setUserInfoEncryptedResponseEnc(BlockEncryptionAlgorithm.A256GCM);
registerRequest.setRequestObjectEncryptionAlg(KeyEncryptionAlgorithm.A256KW);
registerRequest.setRequestObjectEncryptionEnc(BlockEncryptionAlgorithm.A256GCM);
registerRequest.setClaims(Arrays.asList("member_of"));

RegisterClient registerClient = new RegisterClient(registrationEndpoint);
registerClient.setRequest(registerRequest);
Expand Down Expand Up @@ -2605,6 +2617,7 @@ public void authorizationRequestObjectWithMultivaluedClaimAlgRSA15EncA128CBCPLUS
registerRequest.setUserInfoEncryptedResponseEnc(BlockEncryptionAlgorithm.A128CBC_PLUS_HS256);
registerRequest.setRequestObjectEncryptionAlg(KeyEncryptionAlgorithm.RSA1_5);
registerRequest.setRequestObjectEncryptionEnc(BlockEncryptionAlgorithm.A128CBC_PLUS_HS256);
registerRequest.setClaims(Arrays.asList("member_of"));

RegisterClient registerClient = new RegisterClient(registrationEndpoint);
registerClient.setRequest(registerRequest);
Expand Down Expand Up @@ -2715,6 +2728,7 @@ public void authorizationRequestObjectWithMultivaluedClaimAlgRSA15EncA256CBCPLUS
registerRequest.setUserInfoEncryptedResponseEnc(BlockEncryptionAlgorithm.A256CBC_PLUS_HS512);
registerRequest.setRequestObjectEncryptionAlg(KeyEncryptionAlgorithm.RSA1_5);
registerRequest.setRequestObjectEncryptionEnc(BlockEncryptionAlgorithm.A256CBC_PLUS_HS512);
registerRequest.setClaims(Arrays.asList("member_of"));

RegisterClient registerClient = new RegisterClient(registrationEndpoint);
registerClient.setRequest(registerRequest);
Expand Down Expand Up @@ -2825,6 +2839,7 @@ public void authorizationRequestObjectWithMultivaluedClaimAlgRSAOAEPEncA256GCM(
registerRequest.setUserInfoEncryptedResponseEnc(BlockEncryptionAlgorithm.A256GCM);
registerRequest.setRequestObjectEncryptionAlg(KeyEncryptionAlgorithm.RSA_OAEP);
registerRequest.setRequestObjectEncryptionEnc(BlockEncryptionAlgorithm.A256GCM);
registerRequest.setClaims(Arrays.asList("member_of"));

RegisterClient registerClient = new RegisterClient(registrationEndpoint);
registerClient.setRequest(registerRequest);
Expand Down

0 comments on commit 821f7db

Please sign in to comment.