From e946bc468850202346cf67970b0f3bf07a0d60dc Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 29 Nov 2023 08:47:04 +0000
Subject: [PATCH] Update to Keycloak 23.0.1
---
src/main/java/org/keycloak/protocol/cas/endpoints/LogoutEndpoint.java | 22 ++++------------------
1 files changed, 4 insertions(+), 18 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 bd3a48a..48a7934 100644
--- a/src/main/java/org/keycloak/protocol/cas/endpoints/LogoutEndpoint.java
+++ b/src/main/java/org/keycloak/protocol/cas/endpoints/LogoutEndpoint.java
@@ -2,13 +2,9 @@
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.models.ClientModel;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.RealmModel;
@@ -24,23 +20,13 @@
public class LogoutEndpoint {
private static final Logger logger = Logger.getLogger(LogoutEndpoint.class);
- @Context
private KeycloakSession session;
- @Context
- private ClientConnection clientConnection;
-
- @Context
- private HttpRequest request;
-
- @Context
- private HttpHeaders headers;
-
private RealmModel realm;
- private ClientModel client;
private String redirectUri;
- public LogoutEndpoint(RealmModel realm) {
+ public LogoutEndpoint(KeycloakSession session, RealmModel realm) {
+ this.session = session;
this.realm = realm;
}
@@ -59,7 +45,7 @@
}
logger.debug("Initiating CAS browser logout");
- Response response = AuthenticationManager.browserLogout(session, realm, authResult.getSession(), session.getContext().getUri(), clientConnection, headers);
+ Response response = AuthenticationManager.browserLogout(session, realm, authResult.getSession(), session.getContext().getUri(), session.getContext().getConnection(), session.getContext().getRequestHeaders());
logger.debug("finishing CAS browser logout");
return response;
}
@@ -77,7 +63,7 @@
return;
}
- client = realm.getClientsStream()
+ ClientModel client = realm.getClientsStream()
.filter(c -> CASLoginProtocol.LOGIN_PROTOCOL.equals(c.getProtocol()))
.filter(c -> RedirectUtils.verifyRedirectUri(session, service, c) != null)
.findFirst().orElse(null);
--
Gitblit v1.9.1