From 89e3d757b9f6893d16e5c3e49fc407aa1a003931 Mon Sep 17 00:00:00 2001
From: Matthias Piepkorn <mpiepk@gmail.com>
Date: Fri, 16 Nov 2018 19:55:52 +0000
Subject: [PATCH] update for KEYCLOAK-6884 KEYCLOAK-3454 KEYCLOAK-8298
---
src/main/java/org/keycloak/protocol/cas/mappers/UserAttributeMapper.java | 54 ++++++++++++++++++++++++++----------------------------
1 files changed, 26 insertions(+), 28 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..1ec125d 100644
--- a/src/main/java/org/keycloak/protocol/cas/mappers/UserAttributeMapper.java
+++ b/src/main/java/org/keycloak/protocol/cas/mappers/UserAttributeMapper.java
@@ -1,21 +1,15 @@
package org.keycloak.protocol.cas.mappers;
-import org.keycloak.models.ProtocolMapperModel;
-import org.keycloak.models.UserModel;
-import org.keycloak.models.UserSessionModel;
+import org.keycloak.models.*;
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.Collection;
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>();
@@ -38,6 +32,12 @@
property.setType(ProviderConfigProperty.BOOLEAN_TYPE);
configProperties.add(property);
+ property = new ProviderConfigProperty();
+ property.setName(ProtocolMapperUtils.AGGREGATE_ATTRS);
+ property.setLabel(ProtocolMapperUtils.AGGREGATE_ATTRS_LABEL);
+ property.setHelpText(ProtocolMapperUtils.AGGREGATE_ATTRS_HELP_TEXT);
+ property.setType(ProviderConfigProperty.BOOLEAN_TYPE);
+ configProperties.add(property);
}
public static final String PROVIDER_ID = "cas-usermodel-attribute-mapper";
@@ -64,35 +64,33 @@
}
@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 clientSessionCt) {
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));
+ boolean aggregateAttrs = Boolean.valueOf(mappingModel.getConfig().get(ProtocolMapperUtils.AGGREGATE_ATTRS));
+ Collection<String> attributeValue = KeycloakModelUtils.resolveAttribute(user, attributeName, aggregateAttrs);
+ 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);
+ boolean multivalued) {
+ return create(name, userAttribute, tokenClaimName, claimType, multivalued, false);
+ }
+
+ public static ProtocolMapperModel create(String name, String userAttribute,
+ String tokenClaimName, String claimType,
+ boolean multivalued, boolean aggregateAttrs) {
+ ProtocolMapperModel mapper = CASAttributeMapperHelper.createClaimMapper(name, tokenClaimName,
+ claimType, PROVIDER_ID);
+ mapper.getConfig().put(ProtocolMapperUtils.USER_ATTRIBUTE, userAttribute);
if (multivalued) {
mapper.getConfig().put(ProtocolMapperUtils.MULTIVALUED, "true");
}
- mapper.setConfig(config);
+ if (aggregateAttrs) {
+ mapper.getConfig().put(ProtocolMapperUtils.AGGREGATE_ATTRS, "true");
+ }
return mapper;
}
}
--
Gitblit v1.9.1