Skip to content

Commit d4ed0ad

Browse files
Brummolixjzheaux
authored andcommitted
Replace deprecated OpenSaml methods
1 parent 6f8ec3d commit d4ed0ad

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/metadata/OpenSamlMetadataResolver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ private SingleLogoutService buildSingleLogoutService(RelyingPartyRegistration re
186186

187187
private NameIDFormat buildNameIDFormat(RelyingPartyRegistration registration) {
188188
NameIDFormat nameIdFormat = build(NameIDFormat.DEFAULT_ELEMENT_NAME);
189-
nameIdFormat.setFormat(registration.getNameIdFormat());
189+
nameIdFormat.setURI(registration.getNameIdFormat());
190190
return nameIdFormat;
191191
}
192192

saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/web/authentication/logout/OpenSamlLogoutRequestResolver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ Saml2LogoutRequest resolve(HttpServletRequest request, Authentication authentica
143143
Saml2AuthenticatedPrincipal principal = (Saml2AuthenticatedPrincipal) authentication.getPrincipal();
144144
for (String index : principal.getSessionIndexes()) {
145145
SessionIndex sessionIndex = this.sessionIndexBuilder.buildObject();
146-
sessionIndex.setSessionIndex(index);
146+
sessionIndex.setValue(index);
147147
logoutRequest.getSessionIndexes().add(sessionIndex);
148148
}
149149
}

saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/authentication/TestOpenSamlObjects.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ static List<AttributeStatement> attributeStatements() {
364364
Attribute websiteAttr = attributeBuilder.buildObject();
365365
websiteAttr.setName("website");
366366
XSURI uri = new XSURIBuilder().buildObject(AttributeValue.DEFAULT_ELEMENT_NAME, XSURI.TYPE_NAME);
367-
uri.setValue("https://johndoe.com/");
367+
uri.setURI("https://johndoe.com/");
368368
websiteAttr.getAttributeValues().add(uri);
369369
attrStmt2.getAttributes().add(websiteAttr);
370370
Attribute registeredAttr = attributeBuilder.buildObject();

saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/web/authentication/logout/OpenSamlLogoutRequestResolverTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public void resolvePostWhenAuthenticatedThenIncludesName() {
8787
LogoutRequest logoutRequest = getLogoutRequest(saml2LogoutRequest.getSamlRequest(), binding);
8888
assertThat(logoutRequest.getNameID().getValue()).isEqualTo(authentication.getName());
8989
assertThat(logoutRequest.getSessionIndexes()).hasSize(1);
90-
assertThat(logoutRequest.getSessionIndexes().get(0).getSessionIndex()).isEqualTo("session-index");
90+
assertThat(logoutRequest.getSessionIndexes().get(0).getValue()).isEqualTo("session-index");
9191
}
9292

9393
private Saml2Authentication authentication(RelyingPartyRegistration registration) {

0 commit comments

Comments
 (0)