From b92028de86e6b25a87c12ff34ae00338a455308d Mon Sep 17 00:00:00 2001 From: Laurent Meunier <lme@atolcd.com> Date: Fri, 21 Jun 2024 11:50:28 +0000 Subject: [PATCH] Fix NPE in backchannel logout --- src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java b/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java index 0317f0d..adf1019 100644 --- a/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java +++ b/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java @@ -1,5 +1,8 @@ package org.keycloak.protocol.cas; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import org.apache.http.HttpEntity; import org.jboss.logging.Logger; import org.keycloak.common.util.KeycloakUriBuilder; @@ -17,9 +20,6 @@ import org.keycloak.services.managers.ResourceAdminManager; import org.keycloak.sessions.AuthenticationSessionModel; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; import java.io.IOException; import java.net.URI; import java.util.UUID; @@ -140,8 +140,7 @@ sendSingleLogoutRequest(logoutUrl, serviceTicket); } ClientModel client = clientSession.getClient(); - new ResourceAdminManager(session).logoutClientSession(realm, client, clientSession); - return Response.ok().build(); + return new ResourceAdminManager(session).logoutClientSession(realm, client, clientSession); } private void sendSingleLogoutRequest(String logoutUrl, String serviceTicket) { -- Gitblit v1.9.1