From 2b35c926bf402a750ca43a9c5aefa215fd2e9961 Mon Sep 17 00:00:00 2001
From: Updater Bot <updater@travis-ci.org>
Date: Wed, 19 Dec 2018 18:11:26 +0000
Subject: [PATCH] Update to Keycloak 4.8.0.Final
---
src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java | 24 ++++++++----------------
1 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java b/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java
index b796962..fecd557 100644
--- a/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java
+++ b/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java
@@ -12,13 +12,11 @@
import org.keycloak.services.managers.ClientSessionCode;
import org.keycloak.services.managers.ResourceAdminManager;
import org.keycloak.sessions.AuthenticationSessionModel;
-import org.keycloak.sessions.CommonClientSessionModel;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import java.io.IOException;
-import java.lang.reflect.Method;
import java.net.URI;
public class CASLoginProtocol implements LoginProtocol {
@@ -27,6 +25,7 @@
public static final String LOGIN_PROTOCOL = "cas";
public static final String SERVICE_PARAM = "service";
+ public static final String TARGET_PARAM = "TARGET";
public static final String RENEW_PARAM = "renew";
public static final String GATEWAY_PARAM = "gateway";
public static final String TICKET_PARAM = "ticket";
@@ -87,22 +86,14 @@
}
@Override
- public Response authenticated(UserSessionModel userSession, AuthenticatedClientSessionModel clientSession) {
+ public Response authenticated(UserSessionModel userSession, ClientSessionContext clientSessionCtx) {
+ AuthenticatedClientSessionModel clientSession = clientSessionCtx.getClientSession();
ClientSessionCode<AuthenticatedClientSessionModel> accessCode = new ClientSessionCode<>(session, realm, clientSession);
String service = clientSession.getRedirectUri();
//TODO validate service
- String code;
- try {
- // Keycloak >3.4 branch: Method getCode was renamed to getOrGenerateCode, CODE_TO_TOKEN was removed
- Method getOrGenerateCode = ClientSessionCode.class.getMethod("getOrGenerateCode");
- code = (String) getOrGenerateCode.invoke(accessCode);
- } catch (ReflectiveOperationException e) {
- // Keycloak <=3.3 branch
- accessCode.setAction(CommonClientSessionModel.Action.CODE_TO_TOKEN.name());
- code = accessCode.getCode();
- }
+ String code = accessCode.getOrGenerateCode();
KeycloakUriBuilder uriBuilder = KeycloakUriBuilder.fromUri(service);
uriBuilder.queryParam(TICKET_RESPONSE_PARAM, SERVICE_TICKET_PREFIX + code);
@@ -151,13 +142,14 @@
event.event(EventType.LOGOUT);
event.user(userSession.getUser()).session(userSession).success();
- LoginFormsProvider infoPage = session.getProvider(LoginFormsProvider.class).setSuccess("Logout successful");
+
if (redirectUri != null) {
- infoPage.setAttribute("pageRedirectUri", redirectUri);
+ return Response.status(302).location(URI.create(redirectUri)).build();
} else {
+ LoginFormsProvider infoPage = session.getProvider(LoginFormsProvider.class).setSuccess("Logout successful");
infoPage.setAttribute("skipLink", true);
+ return infoPage.createInfoPage();
}
- return infoPage.createInfoPage();
}
@Override
--
Gitblit v1.9.1