From ebda00dc4c821441653684a687aab4160a127d00 Mon Sep 17 00:00:00 2001 From: Updater Bot <updater@travis-ci.org> Date: Fri, 16 Nov 2018 19:55:52 +0000 Subject: [PATCH] Update to Keycloak 4.6.0.Final --- src/main/java/org/keycloak/protocol/cas/mappers/FullNameMapper.java | 25 ++++--------------------- 1 files changed, 4 insertions(+), 21 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 e66da7d..3d889be 100644 --- a/src/main/java/org/keycloak/protocol/cas/mappers/FullNameMapper.java +++ b/src/main/java/org/keycloak/protocol/cas/mappers/FullNameMapper.java @@ -3,16 +3,12 @@ import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.UserModel; import org.keycloak.models.UserSessionModel; -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.TOKEN_CLAIM_NAME; public class FullNameMapper extends AbstractCASProtocolMapper { private static final List<ProviderConfigProperty> configProperties = new ArrayList<ProviderConfigProperty>(); @@ -47,26 +43,13 @@ @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 first = user.getFirstName() == null ? "" : user.getFirstName() + " "; String last = user.getLastName() == null ? "" : user.getLastName(); - attributes.put(protocolClaim, first + last); + 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; + public static ProtocolMapperModel create(String name, String tokenClaimName) { + return CASAttributeMapperHelper.createClaimMapper(name, tokenClaimName, + "String", PROVIDER_ID); } } -- Gitblit v1.9.1