[java-idp-oidc] branch main updated: Switched out from some deprecated methods.
Henri Mikkonen
henri.mikkonen at iki.fi
Fri Mar 25 11:41:19 UTC 2022
This is an automated email from the git hooks/post-receive script.
hjmikkon pushed a commit to branch main
in repository java-idp-oidc.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-oidc.git;a=commit;h=01c53d431e497ad629df1b6cb4b3691c18cdb6aa
The following commit(s) were added to refs/heads/main by this push:
new 01c53d43 Switched out from some deprecated methods.
01c53d43 is described below
commit 01c53d431e497ad629df1b6cb4b3691c18cdb6aa
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Fri Mar 25 13:41:15 2022 +0200
Switched out from some deprecated methods.
---
.../idp/plugin/oidc/op/token/support/RefreshTokenClaimsSet.java | 2 +-
.../profile/context/navigate/BaseTokenRequestLookupFunctionTest.java | 2 +-
.../idp/plugin/oidc/op/token/support/AccessTokenClaimsSetTest.java | 2 +-
.../idp/plugin/oidc/op/token/support/RefreshTokenClaimsSetTest.java | 2 +-
.../oidc/op/profile/impl/SetRequestedSubjectToResponseContext.java | 4 ++--
.../oidc/op/profile/impl/SetRequestedClaimsToResponseContextTest.java | 2 +-
.../shibboleth/idp/plugin/oidc/op/profile/impl/ValidateGrantTest.java | 4 ++--
.../shibboleth/idp/plugin/oidc/op/profile/impl/ValidatePKCETest.java | 4 ++--
8 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/token/support/RefreshTokenClaimsSet.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/token/support/RefreshTokenClaimsSet.java
index ca6577c7..1bfbbf3b 100644
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/token/support/RefreshTokenClaimsSet.java
+++ b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/token/support/RefreshTokenClaimsSet.java
@@ -140,7 +140,7 @@ public final class RefreshTokenClaimsSet extends TokenClaimsSet {
setAuthenticationTime(existing.getAuthenticationTime());
setRedirectURI(existing.getRedirectURI());
setScope(existing.getScope());
- setClaims(existing.getClaimsRequest());
+ setClaimsRequest(existing.getClaimsRequest());
setDlClaims(existing.getDeliveryClaims());
setDlClaimsUI(existing.getUserinfoDeliveryClaims());
setConsentedClaims(existing.getConsentedClaims());
diff --git a/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/BaseTokenRequestLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/BaseTokenRequestLookupFunctionTest.java
index 863af2f0..3bcb3b8f 100644
--- a/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/BaseTokenRequestLookupFunctionTest.java
+++ b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/BaseTokenRequestLookupFunctionTest.java
@@ -122,7 +122,7 @@ public class BaseTokenRequestLookupFunctionTest {
.setACR(acr)
.setACR(acr)
.setNonce(nonce)
- .setClaims(claimsRequest)
+ .setClaimsRequest(claimsRequest)
.setDlClaims(tokenDeliveryClaims)
.setDlClaimsID(tokenToIdTokenDeliveryClaims)
.setDlClaimsUI(tokenToUserInfoTokenDeliveryClaims)
diff --git a/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/token/support/AccessTokenClaimsSetTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/token/support/AccessTokenClaimsSetTest.java
index db00845b..4dd5c019 100644
--- a/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/token/support/AccessTokenClaimsSetTest.java
+++ b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/token/support/AccessTokenClaimsSetTest.java
@@ -63,7 +63,7 @@ public class AccessTokenClaimsSetTest extends BaseTokenClaimsSetTest {
.setScope(scope)
.setACR(acr)
.build();
- atClaimsSet = new AccessTokenClaimsSet(acClaimsSet, scope, dlClaims, dlClaimsUI, iat, exp);
+ atClaimsSet = new AccessTokenClaimsSet.Builder(acClaimsSet, scope, dlClaims, dlClaimsUI, iat, exp).build();
}
@Test
diff --git a/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/token/support/RefreshTokenClaimsSetTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/token/support/RefreshTokenClaimsSetTest.java
index 7a11a260..586d6a84 100644
--- a/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/token/support/RefreshTokenClaimsSetTest.java
+++ b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/token/support/RefreshTokenClaimsSetTest.java
@@ -50,7 +50,7 @@ public class RefreshTokenClaimsSetTest extends BaseTokenClaimsSetTest {
.setACR(acr)
.build();
- rfClaimsSet = new RefreshTokenClaimsSet(acClaimsSet, iat, exp);
+ rfClaimsSet = new RefreshTokenClaimsSet.Builder(acClaimsSet, iat, exp).build();
}
@Test
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetRequestedSubjectToResponseContext.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetRequestedSubjectToResponseContext.java
index 5d7009f1..1c108b56 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetRequestedSubjectToResponseContext.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetRequestedSubjectToResponseContext.java
@@ -75,8 +75,8 @@ public class SetRequestedSubjectToResponseContext extends AbstractOIDCAuthentica
if (idTokenClaims != null && !idTokenClaims.isEmpty()) {
for (final Entry entry : idTokenClaims) {
if (IDTokenClaimsSet.SUB_CLAIM_NAME.equals(entry.getClaimName())) {
- log.debug("{} Setting requested sub claim value {}", getLogPrefix(), entry.getValue());
- getOidcResponseContext().setRequestedSubject(entry.getValue());
+ log.debug("{} Setting requested sub claim value {}", getLogPrefix(), entry.getValueAsString());
+ getOidcResponseContext().setRequestedSubject(entry.getValueAsString());
return;
}
}
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetRequestedClaimsToResponseContextTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetRequestedClaimsToResponseContextTest.java
index dad6db25..8c9fba72 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetRequestedClaimsToResponseContextTest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetRequestedClaimsToResponseContextTest.java
@@ -62,7 +62,7 @@ public class SetRequestedClaimsToResponseContextTest extends BaseOIDCResponseAct
.setRedirectURI(new URI("http://example.com"))
.setScope(new Scope())
.setACR(new ACR("0"))
- .setClaims(OIDCClaimsRequest.parse(
+ .setClaimsRequest(OIDCClaimsRequest.parse(
"{\"id_token\":{\"email\":{\"essential\":true}},\"userinfo\":{\"name\":{\"essential\":true}}}"))
.build();
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateGrantTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateGrantTest.java
index 29dca63b..8574ab6e 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateGrantTest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateGrantTest.java
@@ -85,7 +85,7 @@ public class ValidateGrantTest extends BaseOIDCResponseActionTest {
.setScope(new Scope())
.build();
- rfClaims = new RefreshTokenClaimsSet(acClaims, now, now.plusSeconds(100));
+ rfClaims = new RefreshTokenClaimsSet.Builder(acClaims, now, now.plusSeconds(100)).build();
final AuthorizationCode code = new AuthorizationCode(acClaims.serialize(getDataSealer()));
final RefreshToken rfToken = new RefreshToken(rfClaims.serialize(getDataSealer()));
callback = new URI("https://client.com/callback");
@@ -241,7 +241,7 @@ public class ValidateGrantTest extends BaseOIDCResponseActionTest {
public void testExpired() throws Exception {
init();
final Instant now = Instant.now();
- rfClaims = new RefreshTokenClaimsSet(acClaims, now, now.minusMillis(10));
+ rfClaims = new RefreshTokenClaimsSet.Builder(acClaims, now, now.minusMillis(10)).build();
final TokenRequest req = new TokenRequest(callback, new ClientID(clientId),
new RefreshTokenGrant(new RefreshToken(rfClaims.serialize(getDataSealer()))));
profileRequestCtx.getInboundMessageContext().setMessage(req);
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidatePKCETest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidatePKCETest.java
index 84b7e56e..6ba15f8e 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidatePKCETest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidatePKCETest.java
@@ -272,7 +272,7 @@ public class ValidatePKCETest extends BaseOIDCResponseActionTest {
final TokenRequest req = new TokenRequest(new URI("https://client.com/callback"), new ClientID(clientId),
new RefreshTokenGrant(new RefreshToken()));
setTokenRequest(req);
- final RefreshTokenClaimsSet claims = new RefreshTokenClaimsSet(
+ final RefreshTokenClaimsSet claims = new RefreshTokenClaimsSet.Builder(
new AuthorizeCodeClaimsSet.Builder()
.setJWTID(idGenerator)
.setClientID(new ClientID())
@@ -286,7 +286,7 @@ public class ValidatePKCETest extends BaseOIDCResponseActionTest {
.setScope(new Scope())
.setACR(new ACR("0"))
.build(),
- Instant.now(), Instant.now());
+ Instant.now(), Instant.now()).build();
respCtx.setAuthorizationGrantClaimsSet(claims);
final Event event = action.execute(requestCtx);
ActionTestingSupport.assertProceedEvent(event);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list