From b88dc318a53c0d36b2738decd689033dac7a215e Mon Sep 17 00:00:00 2001
From: Andre Piantino <andre.piantino@tjsc.jus.br>
Date: Tue, 21 Feb 2023 09:12:13 +0000
Subject: [PATCH] Improved event log

---
 src/main/java/org/keycloak/protocol/cas/endpoints/ServiceValidateEndpoint.java |   20 +-------------------
 1 files changed, 1 insertions(+), 19 deletions(-)

diff --git a/src/main/java/org/keycloak/protocol/cas/endpoints/ServiceValidateEndpoint.java b/src/main/java/org/keycloak/protocol/cas/endpoints/ServiceValidateEndpoint.java
index f060435..10a86c4 100644
--- a/src/main/java/org/keycloak/protocol/cas/endpoints/ServiceValidateEndpoint.java
+++ b/src/main/java/org/keycloak/protocol/cas/endpoints/ServiceValidateEndpoint.java
@@ -2,19 +2,13 @@
 
 import org.keycloak.events.EventBuilder;
 import org.keycloak.models.*;
-import org.keycloak.protocol.ProtocolMapper;
-import org.keycloak.protocol.cas.mappers.CASAttributeMapper;
 import org.keycloak.protocol.cas.representations.CASServiceResponse;
 import org.keycloak.protocol.cas.utils.CASValidationException;
 import org.keycloak.protocol.cas.utils.ContentTypeHelper;
 import org.keycloak.protocol.cas.utils.ServiceResponseHelper;
-import org.keycloak.services.managers.ClientSessionCode;
-import org.keycloak.services.util.DefaultClientSessionContext;
 
 import javax.ws.rs.core.*;
-import java.util.HashMap;
 import java.util.Map;
-import java.util.Set;
 
 public class ServiceValidateEndpoint extends ValidateEndpoint {
     @Context
@@ -27,19 +21,7 @@
     @Override
     protected Response successResponse() {
         UserSessionModel userSession = clientSession.getUserSession();
-        // CAS protocol does not support scopes, so pass null scopeParam
-        ClientSessionContext clientSessionCtx = DefaultClientSessionContext.fromClientSessionAndScopeParameter(clientSession, null);
-
-        Set<ProtocolMapperModel> mappings = clientSessionCtx.getProtocolMappers();
-        KeycloakSessionFactory sessionFactory = session.getKeycloakSessionFactory();
-        Map<String, Object> attributes = new HashMap<>();
-        for (ProtocolMapperModel mapping : mappings) {
-            ProtocolMapper mapper = (ProtocolMapper) sessionFactory.getProviderFactory(ProtocolMapper.class, mapping.getProtocolMapper());
-            if (mapper instanceof CASAttributeMapper) {
-                ((CASAttributeMapper) mapper).setAttribute(attributes, mapping, userSession);
-            }
-        }
-
+        Map<String, Object> attributes = getUserAttributes();
         CASServiceResponse serviceResponse = ServiceResponseHelper.createSuccess(userSession.getUser().getUsername(), attributes);
         return prepare(Response.Status.OK, serviceResponse);
     }

--
Gitblit v1.9.1