From de7d254562ee04401894b82e3ee18f46d79ea357 Mon Sep 17 00:00:00 2001 From: Matthias Piepkorn <mpiepk@gmail.com> Date: Tue, 14 Feb 2017 10:32:07 +0000 Subject: [PATCH] Do not fail on invalid Accept header --- src/main/java/org/keycloak/protocol/cas/mappers/UserAttributeMapper.java | 26 ++++---------------------- 1 files changed, 4 insertions(+), 22 deletions(-) diff --git a/src/main/java/org/keycloak/protocol/cas/mappers/UserAttributeMapper.java b/src/main/java/org/keycloak/protocol/cas/mappers/UserAttributeMapper.java index 3637069..19173c2 100644 --- a/src/main/java/org/keycloak/protocol/cas/mappers/UserAttributeMapper.java +++ b/src/main/java/org/keycloak/protocol/cas/mappers/UserAttributeMapper.java @@ -5,17 +5,12 @@ import org.keycloak.models.UserSessionModel; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.protocol.ProtocolMapperUtils; -import org.keycloak.protocol.cas.CASLoginProtocol; import org.keycloak.protocol.oidc.mappers.OIDCAttributeMapperHelper; import org.keycloak.provider.ProviderConfigProperty; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; - -import static org.keycloak.protocol.oidc.mappers.OIDCAttributeMapperHelper.JSON_TYPE; -import static org.keycloak.protocol.oidc.mappers.OIDCAttributeMapperHelper.TOKEN_CLAIM_NAME; public class UserAttributeMapper extends AbstractCASProtocolMapper { private static final List<ProviderConfigProperty> configProperties = new ArrayList<ProviderConfigProperty>(); @@ -66,33 +61,20 @@ @Override public void setAttribute(Map<String, Object> attributes, ProtocolMapperModel mappingModel, UserSessionModel userSession) { UserModel user = userSession.getUser(); - String protocolClaim = mappingModel.getConfig().get(TOKEN_CLAIM_NAME); - if (protocolClaim == null) { - return; - } String attributeName = mappingModel.getConfig().get(ProtocolMapperUtils.USER_ATTRIBUTE); List<String> attributeValue = KeycloakModelUtils.resolveAttribute(user, attributeName); - if (attributeValue == null) return; - attributes.put(protocolClaim, OIDCAttributeMapperHelper.mapAttributeValue(mappingModel, attributeValue)); + setMappedAttribute(attributes, mappingModel, attributeValue); } public static ProtocolMapperModel create(String name, String userAttribute, String tokenClaimName, String claimType, boolean consentRequired, String consentText, boolean multivalued) { - ProtocolMapperModel mapper = new ProtocolMapperModel(); - mapper.setName(name); - mapper.setProtocolMapper(PROVIDER_ID); - mapper.setProtocol(CASLoginProtocol.LOGIN_PROTOCOL); - mapper.setConsentRequired(consentRequired); - mapper.setConsentText(consentText); - Map<String, String> config = new HashMap<String, String>(); - config.put(ProtocolMapperUtils.USER_ATTRIBUTE, userAttribute); - config.put(TOKEN_CLAIM_NAME, tokenClaimName); - config.put(JSON_TYPE, claimType); + ProtocolMapperModel mapper = CASAttributeMapperHelper.createClaimMapper(name, tokenClaimName, + claimType, consentRequired, consentText, PROVIDER_ID); + mapper.getConfig().put(ProtocolMapperUtils.USER_ATTRIBUTE, userAttribute); if (multivalued) { mapper.getConfig().put(ProtocolMapperUtils.MULTIVALUED, "true"); } - mapper.setConfig(config); return mapper; } } -- Gitblit v1.9.1