From 331415a81840f05fdb13bb114f15e5235a5cb3fe Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 12 Sep 2023 08:47:12 +0000 Subject: [PATCH] Update to Keycloak 22.0.2 --- src/main/java/org/keycloak/protocol/cas/endpoints/LogoutEndpoint.java | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 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 ac7d74c..bd3a48a 100644 --- a/src/main/java/org/keycloak/protocol/cas/endpoints/LogoutEndpoint.java +++ b/src/main/java/org/keycloak/protocol/cas/endpoints/LogoutEndpoint.java @@ -1,13 +1,14 @@ package org.keycloak.protocol.cas.endpoints; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import org.jboss.logging.Logger; 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; @@ -18,11 +19,7 @@ import org.keycloak.services.managers.AuthenticationManager; import org.keycloak.services.messages.Messages; -import javax.ws.rs.GET; -import javax.ws.rs.QueryParam; -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); @@ -66,6 +63,12 @@ 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