@@ -187,26 +187,25 @@ But, if you do need something from the request, then you can use create a custom
187187---- 
188188@Component 
189189public class AuthnRequestConverter implements 
190-         Converter<MySaml2AuthenticationRequestContext , AuthnRequest> { 
190+         Converter<Saml2AuthenticationRequestContext , AuthnRequest> { 
191191
192192    private final AuthnRequestBuilder authnRequestBuilder; 
193193    private final IssuerBuilder issuerBuilder; 
194194
195195    // ... constructor 
196196
197197    public AuthnRequest convert(Saml2AuthenticationRequestContext context) { 
198-         MySaml2AuthenticationRequestContext myContext = (MySaml2AuthenticationRequestContext) context; 
199198        Issuer issuer = issuerBuilder.buildObject(); 
200-         issuer.setValue(myContext .getIssuer()); 
199+         issuer.setValue(context .getIssuer()); 
201200
202201        AuthnRequest authnRequest = authnRequestBuilder.buildObject(); 
203202        authnRequest.setIssuer(issuer); 
204-         authnRequest.setDestination(myContext .getDestination()); 
205-         authnRequest.setAssertionConsumerServiceURL(myContext .getAssertionConsumerServiceUrl()); 
203+         authnRequest.setDestination(context .getDestination()); 
204+         authnRequest.setAssertionConsumerServiceURL(context .getAssertionConsumerServiceUrl()); 
206205
207206        // ... additional settings 
208207
209-         authRequest.setForceAuthn(myContext .getForceAuthn()); 
208+         authRequest.setForceAuthn(context .getForceAuthn()); 
210209        return authnRequest; 
211210    } 
212211} 
@@ -216,22 +215,21 @@ public class AuthnRequestConverter implements
216215[source,kotlin,role="secondary"] 
217216---- 
218217@Component 
219- class AuthnRequestConverter : Converter<MySaml2AuthenticationRequestContext , AuthnRequest> { 
218+ class AuthnRequestConverter : Converter<Saml2AuthenticationRequestContext , AuthnRequest> { 
220219    private val authnRequestBuilder: AuthnRequestBuilder? = null 
221220    private val issuerBuilder: IssuerBuilder? = null 
222221
223222    // ... constructor 
224223    override fun convert(context: MySaml2AuthenticationRequestContext): AuthnRequest { 
225-         val myContext: MySaml2AuthenticationRequestContext = context 
226224        val issuer: Issuer = issuerBuilder.buildObject() 
227-         issuer.value = myContext .getIssuer() 
225+         issuer.value = context .getIssuer() 
228226        val authnRequest: AuthnRequest = authnRequestBuilder.buildObject() 
229227        authnRequest.issuer = issuer 
230-         authnRequest.destination = myContext .getDestination() 
231-         authnRequest.assertionConsumerServiceURL = myContext .getAssertionConsumerServiceUrl() 
228+         authnRequest.destination = context .getDestination() 
229+         authnRequest.assertionConsumerServiceURL = context .getAssertionConsumerServiceUrl() 
232230
233231        // ... additional settings 
234-         authRequest.setForceAuthn(myContext .getForceAuthn()) 
232+         authRequest.setForceAuthn(context .getForceAuthn()) 
235233        return authnRequest 
236234    } 
237235} 
@@ -246,12 +244,11 @@ Then, you can construct your own `Saml2AuthenticationRequestContextResolver` and
246244---- 
247245@Bean 
248246Saml2AuthenticationRequestContextResolver authenticationRequestContextResolver() { 
249-     Saml2AuthenticationRequestContextResolver resolver = 
250-             new DefaultSaml2AuthenticationRequestContextResolver(); 
251-     return request -> { 
252-         Saml2AuthenticationRequestContext context = resolver.resolve(request); 
253-         return new MySaml2AuthenticationRequestContext(context, request.getParameter("force") != null); 
254-     }; 
247+ 	Saml2AuthenticationRequestContextResolver resolver = new DefaultSaml2AuthenticationRequestContextResolver(relyingPartyRegistrationResolver); 
248+ 	return request -> { 
249+ 		Saml2AuthenticationRequestContext context = resolver.resolve(request); 
250+ 		return context; 
251+ 	}; 
255252} 
256253
257254@Bean 
@@ -270,13 +267,9 @@ Saml2AuthenticationRequestFactory authenticationRequestFactory(
270267---- 
271268@Bean 
272269open fun authenticationRequestContextResolver(): Saml2AuthenticationRequestContextResolver { 
273-     val resolver: Saml2AuthenticationRequestContextResolver = DefaultSaml2AuthenticationRequestContextResolver() 
274-     return Saml2AuthenticationRequestContextResolver { request: HttpServletRequest -> 
275-         val context = resolver.resolve(request) 
276-         MySaml2AuthenticationRequestContext( 
277-             context, 
278-             request.getParameter("force") != null 
279-         ) 
270+     val resolver = DefaultSaml2AuthenticationRequestContextResolver(relyingPartyRegistrationResolver) 
271+     return Saml2AuthenticationRequestContextResolver { request -> 
272+         resolver.resolve(request) 
280273    } 
281274} 
282275
0 commit comments