From 47a71316d7947f5e06c94e2af7386ae835dd2034 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 17 Jun 2022 08:51:51 +0000 Subject: [PATCH] Update to Keycloak 18.0.1 --- src/main/java/org/keycloak/protocol/cas/mappers/FullNameMapper.java | 32 +++++++++++++------------------- 1 files changed, 13 insertions(+), 19 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..baf8257 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,12 @@ 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.*; 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 +38,17 @@ return "Maps the user's first and last name to the OpenID Connect 'name' claim. Format is <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; + @Override + public void setAttribute(Map<String, Object> attributes, ProtocolMapperModel mappingModel, UserSessionModel userSession, + KeycloakSession session, ClientSessionContext clientSessionCt) { + 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) { + return CASAttributeMapperHelper.createClaimMapper(name, tokenClaimName, + "String", PROVIDER_ID); } } -- Gitblit v1.9.1