From cb8984ba66d2de8352fb1ff08fc3d23d04c3dba7 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 12 Jul 2023 08:47:25 +0000
Subject: [PATCH] Update to Keycloak 22.0.0
---
src/main/java/org/keycloak/protocol/cas/endpoints/LogoutEndpoint.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/keycloak/protocol/cas/endpoints/LogoutEndpoint.java b/src/main/java/org/keycloak/protocol/cas/endpoints/LogoutEndpoint.java
index aaaa45d..bf65e22 100644
--- a/src/main/java/org/keycloak/protocol/cas/endpoints/LogoutEndpoint.java
+++ b/src/main/java/org/keycloak/protocol/cas/endpoints/LogoutEndpoint.java
@@ -4,7 +4,10 @@
import org.jboss.resteasy.annotations.cache.NoCache;
import org.jboss.resteasy.spi.HttpRequest;
import org.keycloak.common.ClientConnection;
+import org.keycloak.events.Details;
+import org.keycloak.events.Errors;
import org.keycloak.events.EventBuilder;
+import org.keycloak.events.EventType;
import org.keycloak.models.ClientModel;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.RealmModel;
@@ -20,6 +23,7 @@
import javax.ws.rs.core.Context;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.Response;
+import java.net.URI;
public class LogoutEndpoint {
private static final Logger logger = Logger.getLogger(LogoutEndpoint.class);
@@ -37,13 +41,11 @@
private HttpHeaders headers;
private RealmModel realm;
- private EventBuilder event;
private ClientModel client;
private String redirectUri;
- public LogoutEndpoint(RealmModel realm, EventBuilder event) {
+ public LogoutEndpoint(RealmModel realm) {
this.realm = realm;
- this.event = event;
}
@GET
@@ -55,13 +57,22 @@
if (authResult != null) {
UserSessionModel userSession = authResult.getSession();
userSession.setNote(AuthenticationManager.KEYCLOAK_LOGOUT_PROTOCOL, CASLoginProtocol.LOGIN_PROTOCOL);
- if (redirectUri != null) userSession.setNote(CASLoginProtocol.LOGOUT_REDIRECT_URI, redirectUri);
+
+ if (redirectUri != null) {
+ userSession.setNote(CASLoginProtocol.LOGOUT_REDIRECT_URI, redirectUri);
+ }
logger.debug("Initiating CAS browser logout");
Response response = AuthenticationManager.browserLogout(session, realm, authResult.getSession(), session.getContext().getUri(), clientConnection, headers);
logger.debug("finishing CAS browser logout");
return response;
}
+
+ if (redirectUri != null) {
+ logger.debugv("no active session, redirecting to {0}", redirectUri);
+ return Response.status(302).location(URI.create(redirectUri)).build();
+ }
+
return ErrorPage.error(session, null, Response.Status.BAD_REQUEST, Messages.FAILED_LOGOUT);
}
--
Gitblit v1.9.1