From 58cce9e3b5ed19e26c3748b66536c160a266e885 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 24 Feb 2023 16:55:59 +0000
Subject: [PATCH] Update to Keycloak 21.0.0
---
src/main/java/org/keycloak/protocol/cas/endpoints/LogoutEndpoint.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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 7bafe92..ac7d74c 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;
@@ -37,13 +40,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,7 +56,10 @@
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);
@@ -70,7 +74,7 @@
return;
}
- client = realm.getClients().stream()
+ 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