From eda11afe10b463af8fc93991f8eb2dd77fbc2c21 Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Fri, 24 Nov 2023 11:13:43 +0000
Subject: [PATCH] Integration tests: make curl output verbose

---
 src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java |   32 ++++++++++++++++++++------------
 1 files changed, 20 insertions(+), 12 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..5c47e9d 100644
--- a/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java
+++ b/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java
@@ -1,9 +1,13 @@
 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;
 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;
@@ -16,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;
@@ -97,9 +98,10 @@
         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);
+                null, null, authSession.getRedirectUri(), null, null,
+                userSession.getId());
         String code = OAuth2CodeParser.persistCode(session, clientSession, codeData);
 
         KeycloakUriBuilder uriBuilder = KeycloakUriBuilder.fromUri(service);
@@ -143,8 +145,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 +164,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