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/FullNameMapper.java | 28 ++++++++++++---------------- 1 files changed, 12 insertions(+), 16 deletions(-) diff --git a/src/main/java/org/keycloak/protocol/cas/mappers/FullNameMapper.java b/src/main/java/org/keycloak/protocol/cas/mappers/FullNameMapper.java index 59a9384..aef4b51 100644 --- a/src/main/java/org/keycloak/protocol/cas/mappers/FullNameMapper.java +++ b/src/main/java/org/keycloak/protocol/cas/mappers/FullNameMapper.java @@ -1,18 +1,14 @@ package org.keycloak.protocol.cas.mappers; import org.keycloak.models.ProtocolMapperModel; -import org.keycloak.protocol.ProtocolMapperUtils; -import org.keycloak.protocol.cas.CASLoginProtocol; +import org.keycloak.models.UserModel; +import org.keycloak.models.UserSessionModel; 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 FullNameMapper extends AbstractCASProtocolMapper { private static final List<ProviderConfigProperty> configProperties = new ArrayList<ProviderConfigProperty>(); @@ -44,17 +40,17 @@ return "Maps the user's first and last name to the OpenID Connect 'name' claim. Format is <first> + ' ' + <last>"; } + @Override + public void setAttribute(Map<String, Object> attributes, ProtocolMapperModel mappingModel, UserSessionModel userSession) { + UserModel user = userSession.getUser(); + String first = user.getFirstName() == null ? "" : user.getFirstName() + " "; + String last = user.getLastName() == null ? "" : user.getLastName(); + setMappedAttribute(attributes, mappingModel, first + last); + } + public static ProtocolMapperModel create(String name, String tokenClaimName, boolean consentRequired, String consentText) { - 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(TOKEN_CLAIM_NAME, tokenClaimName); - mapper.setConfig(config); - return mapper; + return CASAttributeMapperHelper.createClaimMapper(name, tokenClaimName, + "String", consentRequired, consentText, PROVIDER_ID); } } -- Gitblit v1.9.1