From 67a13c292b95e985e4d2bc3531d56ad8599682f3 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 25 Jun 2022 08:50:22 +0000
Subject: [PATCH] Update to Keycloak 18.0.2
---
src/main/java/org/keycloak/protocol/cas/mappers/UserPropertyMapper.java | 33 ++++++++++++++-------------------
1 files changed, 14 insertions(+), 19 deletions(-)
diff --git a/src/main/java/org/keycloak/protocol/cas/mappers/UserPropertyMapper.java b/src/main/java/org/keycloak/protocol/cas/mappers/UserPropertyMapper.java
index 21cdeb6..24c9af8 100644
--- a/src/main/java/org/keycloak/protocol/cas/mappers/UserPropertyMapper.java
+++ b/src/main/java/org/keycloak/protocol/cas/mappers/UserPropertyMapper.java
@@ -1,18 +1,13 @@
package org.keycloak.protocol.cas.mappers;
-import org.keycloak.models.ProtocolMapperModel;
+import org.keycloak.models.*;
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 UserPropertyMapper extends AbstractCASProtocolMapper {
private static final List<ProviderConfigProperty> configProperties = new ArrayList<ProviderConfigProperty>();
@@ -52,20 +47,20 @@
return "Map a built in user property (email, firstName, lastName) to a token claim.";
}
+ @Override
+ public void setAttribute(Map<String, Object> attributes, ProtocolMapperModel mappingModel, UserSessionModel userSession,
+ KeycloakSession session, ClientSessionContext clientSessionCt) {
+ UserModel user = userSession.getUser();
+ String propertyName = mappingModel.getConfig().get(ProtocolMapperUtils.USER_ATTRIBUTE);
+ String propertyValue = ProtocolMapperUtils.getUserModelValue(user, propertyName);
+ setMappedAttribute(attributes, mappingModel, propertyValue);
+ }
+
public static ProtocolMapperModel create(String name, String userAttribute,
- String tokenClaimName, String claimType,
- 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(ProtocolMapperUtils.USER_ATTRIBUTE, userAttribute);
- config.put(TOKEN_CLAIM_NAME, tokenClaimName);
- config.put(JSON_TYPE, claimType);
- mapper.setConfig(config);
+ String tokenClaimName, String claimType) {
+ ProtocolMapperModel mapper = CASAttributeMapperHelper.createClaimMapper(name, tokenClaimName,
+ claimType, PROVIDER_ID);
+ mapper.getConfig().put(ProtocolMapperUtils.USER_ATTRIBUTE, userAttribute);
return mapper;
}
}
--
Gitblit v1.9.1