Use Spec Language in RelyingPartyRegistration

Changed conventions to better follow the metadata descriptors that the registration is meant to represent. Closes spring-projectsgh-8777
jzheaux · Jul 3, 2020 · c330e1f · c330e1f
1 parent 4fb5ff3
commit c330e1f
Show file tree

Hide file tree

Showing 10 changed files with 387 additions and 171 deletions.
diff --git a/.../security/saml2/provider/service/authentication/OpenSamlAuthenticationRequestFactory.java b/.../security/saml2/provider/service/authentication/OpenSamlAuthenticationRequestFactory.java
@@ -57,7 +57,7 @@ public String createAuthenticationRequest(Saml2AuthenticationRequest request) {
 	@Override
 	public Saml2PostAuthenticationRequest createPostAuthenticationRequest(Saml2AuthenticationRequestContext context) {
 		AuthnRequest authnRequest = createAuthnRequest(context);
-		String xml = context.getRelyingPartyRegistration().getProviderDetails().isSignAuthNRequest() ?
+		String xml = context.getRelyingPartyRegistration().getProviderDetails().getWantsAuthnRequestsSigned() ?
 			this.saml.serialize(authnRequest, context.getRelyingPartyRegistration().getSigningCredentials()) :
 			this.saml.serialize(authnRequest);
 
@@ -78,7 +78,7 @@ public Saml2RedirectAuthenticationRequest createRedirectAuthenticationRequest(Sa
 		result.samlRequest(deflatedAndEncoded)
 				.relayState(context.getRelayState());
 
-		if (context.getRelyingPartyRegistration().getProviderDetails().isSignAuthNRequest()) {
+		if (context.getRelyingPartyRegistration().getProviderDetails().getWantsAuthnRequestsSigned()) {
 			List<Saml2X509Credential> signingCredentials = context.getRelyingPartyRegistration().getSigningCredentials();
 			Map<String, String> signedParams = this.saml.signQueryParameters(
 					signingCredentials,

diff --git a/...ork/security/saml2/provider/service/authentication/Saml2AuthenticationRequestContext.java b/...ork/security/saml2/provider/service/authentication/Saml2AuthenticationRequestContext.java
@@ -91,7 +91,7 @@ public String getRelayState() {
 	 * @return the Destination value
 	 */
 	public String getDestination() {
-		return this.getRelyingPartyRegistration().getProviderDetails().getWebSsoUrl();
+		return this.getRelyingPartyRegistration().getProviderDetails().getSingleSignOnServiceLocation();
 	}
 
 	/**