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/mappers/UserRealmRoleMappingMapper.java | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/keycloak/protocol/cas/mappers/UserRealmRoleMappingMapper.java b/src/main/java/org/keycloak/protocol/cas/mappers/UserRealmRoleMappingMapper.java index 41a6a78..1c3094f 100644 --- a/src/main/java/org/keycloak/protocol/cas/mappers/UserRealmRoleMappingMapper.java +++ b/src/main/java/org/keycloak/protocol/cas/mappers/UserRealmRoleMappingMapper.java @@ -1,10 +1,14 @@ package org.keycloak.protocol.cas.mappers; +import org.keycloak.models.ClientSessionContext; +import org.keycloak.models.KeycloakSession; import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.UserSessionModel; import org.keycloak.protocol.ProtocolMapperUtils; import org.keycloak.protocol.oidc.mappers.OIDCAttributeMapperHelper; import org.keycloak.provider.ProviderConfigProperty; +import org.keycloak.representations.AccessToken; +import org.keycloak.utils.RoleResolveUtil; import java.util.ArrayList; import java.util.List; @@ -53,9 +57,16 @@ } @Override - public void setAttribute(Map<String, Object> attributes, ProtocolMapperModel mappingModel, UserSessionModel userSession) { + public void setAttribute(Map<String, Object> attributes, ProtocolMapperModel mappingModel, UserSessionModel userSession, + KeycloakSession session, ClientSessionContext clientSessionCtx) { String rolePrefix = mappingModel.getConfig().get(ProtocolMapperUtils.USER_MODEL_REALM_ROLE_MAPPING_ROLE_PREFIX); - setAttribute(attributes, mappingModel, userSession, role -> ! role.isClientRole(), rolePrefix); + + AccessToken.Access access = RoleResolveUtil.getResolvedRealmRoles(session, clientSessionCtx, false); + if (access == null) { + return; + } + + setAttribute(attributes, mappingModel, access.getRoles(), rolePrefix); } public static ProtocolMapperModel create(String realmRolePrefix, String name, String tokenClaimName) { -- Gitblit v1.9.1