From 3f0be1d3581c343abe65a97238309064315200ca Mon Sep 17 00:00:00 2001 From: Doccrazy <Doccrazy@users.noreply.github.com> Date: Mon, 22 Jan 2018 19:51:14 +0000 Subject: [PATCH] Update README.md --- src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java b/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java index 7d82a9a..dd08b5b 100644 --- a/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java +++ b/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java @@ -11,6 +11,7 @@ import org.keycloak.protocol.cas.utils.LogoutHelper; import org.keycloak.services.managers.ClientSessionCode; import org.keycloak.services.managers.ResourceAdminManager; +import org.keycloak.sessions.AuthenticationSessionModel; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; @@ -84,14 +85,15 @@ } @Override - public Response authenticated(UserSessionModel userSession, ClientSessionCode accessCode) { - ClientSessionModel clientSession = accessCode.getClientSession(); + public Response authenticated(UserSessionModel userSession, AuthenticatedClientSessionModel clientSession) { + ClientSessionCode<AuthenticatedClientSessionModel> accessCode = new ClientSessionCode<>(session, realm, clientSession); String service = clientSession.getRedirectUri(); //TODO validate service - accessCode.setAction(ClientSessionModel.Action.CODE_TO_TOKEN.name()); + + String code = accessCode.getOrGenerateCode(); KeycloakUriBuilder uriBuilder = KeycloakUriBuilder.fromUri(service); - uriBuilder.queryParam(TICKET_RESPONSE_PARAM, SERVICE_TICKET_PREFIX + accessCode.getCode()); + uriBuilder.queryParam(TICKET_RESPONSE_PARAM, SERVICE_TICKET_PREFIX + code); URI redirectUri = uriBuilder.build(); @@ -100,12 +102,12 @@ } @Override - public Response sendError(ClientSessionModel clientSession, Error error) { + public Response sendError(AuthenticationSessionModel authSession, Error error) { return Response.serverError().entity(error).build(); } @Override - public void backchannelLogout(UserSessionModel userSession, ClientSessionModel clientSession) { + public void backchannelLogout(UserSessionModel userSession, AuthenticatedClientSessionModel clientSession) { String logoutUrl = clientSession.getRedirectUri(); String serviceTicket = clientSession.getNote(CASLoginProtocol.SESSION_SERVICE_TICKET); //check if session is fully authenticated (i.e. serviceValidate has been called) @@ -127,7 +129,7 @@ } @Override - public Response frontchannelLogout(UserSessionModel userSession, ClientSessionModel clientSession) { + public Response frontchannelLogout(UserSessionModel userSession, AuthenticatedClientSessionModel clientSession) { // todo oidc redirect support throw new RuntimeException("NOT IMPLEMENTED"); } @@ -148,8 +150,8 @@ } @Override - public boolean requireReauthentication(UserSessionModel userSession, ClientSessionModel clientSession) { - return "true".equals(clientSession.getNote(CASLoginProtocol.RENEW_PARAM)); + public boolean requireReauthentication(UserSessionModel userSession, AuthenticationSessionModel authSession) { + return "true".equals(authSession.getClientNote(CASLoginProtocol.RENEW_PARAM)); } @Override -- Gitblit v1.9.1