From 00d0ae0646f243aed152503eaa28033aea520df1 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 01 Sep 2020 08:43:37 +0000
Subject: [PATCH] Update to Keycloak 11.0.2
---
src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java b/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java
index fecd557..4557c7a 100644
--- a/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java
+++ b/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java
@@ -3,13 +3,15 @@
import org.apache.http.HttpEntity;
import org.jboss.logging.Logger;
import org.keycloak.common.util.KeycloakUriBuilder;
+import org.keycloak.common.util.Time;
import org.keycloak.events.EventBuilder;
import org.keycloak.events.EventType;
import org.keycloak.forms.login.LoginFormsProvider;
import org.keycloak.models.*;
import org.keycloak.protocol.LoginProtocol;
import org.keycloak.protocol.cas.utils.LogoutHelper;
-import org.keycloak.services.managers.ClientSessionCode;
+import org.keycloak.protocol.oidc.utils.OAuth2Code;
+import org.keycloak.protocol.oidc.utils.OAuth2CodeParser;
import org.keycloak.services.managers.ResourceAdminManager;
import org.keycloak.sessions.AuthenticationSessionModel;
@@ -18,6 +20,7 @@
import javax.ws.rs.core.UriInfo;
import java.io.IOException;
import java.net.URI;
+import java.util.UUID;
public class CASLoginProtocol implements LoginProtocol {
private static final Logger logger = Logger.getLogger(CASLoginProtocol.class);
@@ -86,14 +89,17 @@
}
@Override
- public Response authenticated(UserSessionModel userSession, ClientSessionContext clientSessionCtx) {
+ public Response authenticated(AuthenticationSessionModel authSession, UserSessionModel userSession, ClientSessionContext clientSessionCtx) {
AuthenticatedClientSessionModel clientSession = clientSessionCtx.getClientSession();
- ClientSessionCode<AuthenticatedClientSessionModel> accessCode = new ClientSessionCode<>(session, realm, clientSession);
- String service = clientSession.getRedirectUri();
+ String service = authSession.getRedirectUri();
//TODO validate service
- String code = accessCode.getOrGenerateCode();
+ OAuth2Code codeData = new OAuth2Code(UUID.randomUUID(),
+ Time.currentTime() + userSession.getRealm().getAccessCodeLifespan(),
+ null, null, authSession.getRedirectUri(), null, null);
+ String code = OAuth2CodeParser.persistCode(session, clientSession, codeData);
+
KeycloakUriBuilder uriBuilder = KeycloakUriBuilder.fromUri(service);
uriBuilder.queryParam(TICKET_RESPONSE_PARAM, SERVICE_TICKET_PREFIX + code);
@@ -117,7 +123,7 @@
sendSingleLogoutRequest(logoutUrl, serviceTicket);
}
ClientModel client = clientSession.getClient();
- new ResourceAdminManager(session).logoutClientSession(uriInfo.getRequestUri(), realm, client, clientSession);
+ new ResourceAdminManager(session).logoutClientSession(realm, client, clientSession);
}
private void sendSingleLogoutRequest(String logoutUrl, String serviceTicket) {
--
Gitblit v1.9.1