From 191d29b47c134d4243eac31909484eb6312195f7 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 02 Mar 2023 08:48:41 +0000
Subject: [PATCH] Update to Keycloak 21.0.1
---
src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java b/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java
index 38d32f3..8f4cf5e 100644
--- a/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java
+++ b/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java
@@ -4,6 +4,7 @@
import org.jboss.logging.Logger;
import org.keycloak.common.util.KeycloakUriBuilder;
import org.keycloak.common.util.Time;
+import org.keycloak.events.Details;
import org.keycloak.events.EventBuilder;
import org.keycloak.events.EventType;
import org.keycloak.forms.login.LoginFormsProvider;
@@ -97,7 +98,7 @@
String service = authSession.getRedirectUri();
//TODO validate service
- OAuth2Code codeData = new OAuth2Code(UUID.randomUUID(),
+ OAuth2Code codeData = new OAuth2Code(UUID.randomUUID().toString(),
Time.currentTime() + userSession.getRealm().getAccessCodeLifespan(),
null, null, authSession.getRedirectUri(), null, null);
String code = OAuth2CodeParser.persistCode(session, clientSession, codeData);
@@ -143,8 +144,8 @@
}
private void sendSingleLogoutRequest(String logoutUrl, String serviceTicket) {
- HttpEntity requestEntity = LogoutHelper.buildSingleLogoutRequest(serviceTicket);
try {
+ HttpEntity requestEntity = LogoutHelper.buildSingleLogoutRequest(serviceTicket);
LogoutHelper.postWithRedirect(session, logoutUrl, requestEntity);
logger.debug("Sent CAS single logout for service " + logoutUrl);
} catch (IOException e) {
@@ -162,16 +163,22 @@
public Response finishBrowserLogout(UserSessionModel userSession, AuthenticationSessionModel logoutSession) {
String redirectUri = userSession.getNote(CASLoginProtocol.LOGOUT_REDIRECT_URI);
- event.event(EventType.LOGOUT);
- event.user(userSession.getUser()).session(userSession).success();
+ event.event(EventType.LOGOUT)
+ .user(userSession.getUser())
+ .session(userSession)
+ .detail(Details.USERNAME, userSession.getUser().getUsername());
if (redirectUri != null) {
+ event.detail(Details.REDIRECT_URI, redirectUri);
+ event.success();
return Response.status(302).location(URI.create(redirectUri)).build();
- } else {
- LoginFormsProvider infoPage = session.getProvider(LoginFormsProvider.class).setSuccess("Logout successful");
- infoPage.setAttribute("skipLink", true);
- return infoPage.createInfoPage();
}
+
+ event.success();
+
+ LoginFormsProvider infoPage = session.getProvider(LoginFormsProvider.class).setSuccess("Logout successful");
+ infoPage.setAttribute("skipLink", true);
+ return infoPage.createInfoPage();
}
@Override
--
Gitblit v1.9.1