From 6285ff6b8faba1a942042c8d58a14c1a2640dafd Mon Sep 17 00:00:00 2001 From: Misagh Moayyed Date: Thu, 28 Jan 2016 13:18:03 -0700 Subject: [PATCH] allow better control over WS-FED principal resolver # Conflicts: # cas-server-core-authentication/src/main/java/org/jasig/cas/authentication/principal/PersonDirectoryPrincipalResolver.java # cas-server-support-wsfederation/src/main/java/org/jasig/cas/support/wsfederation/web/flow/WsFederationAction.java --- .../support/wsfederation/web/flow/WsFederationAction.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cas-server-support-wsfederation/src/main/java/org/jasig/cas/support/wsfederation/web/flow/WsFederationAction.java b/cas-server-support-wsfederation/src/main/java/org/jasig/cas/support/wsfederation/web/flow/WsFederationAction.java index 94709f5cae9c..16aa523c081e 100644 --- a/cas-server-support-wsfederation/src/main/java/org/jasig/cas/support/wsfederation/web/flow/WsFederationAction.java +++ b/cas-server-support-wsfederation/src/main/java/org/jasig/cas/support/wsfederation/web/flow/WsFederationAction.java @@ -130,8 +130,8 @@ protected Event doExecute(final RequestContext context) throws Exception { restoreRequestAttribute(request, session, LOCALE); restoreRequestAttribute(request, session, METHOD); - final AuthenticationResult authenticationResult = - this.authenticationSystemSupport.handleAndFinalizeSingleAuthenticationTransaction(service, credential); + final AuthenticationContextBuilder builder = new DefaultAuthenticationContextBuilder( + this.authenticationSystemSupport.getPrincipalElectionStrategy()); final AuthenticationTransaction transaction = AuthenticationTransaction.wrap(credential); this.authenticationSystemSupport.getAuthenticationTransactionManager() @@ -139,7 +139,7 @@ protected Event doExecute(final RequestContext context) throws Exception { final AuthenticationContext authenticationContext = builder.build(service); WebUtils.putTicketGrantingTicketInScopes(context, - this.centralAuthenticationService.createTicketGrantingTicket(authenticationResult)); + this.centralAuthenticationService.createTicketGrantingTicket(authenticationContext)); logger.info("Token validated and new {} created: {}", credential.getClass().getName(), credential); return success();