From ae2b488fa48f4c500206c1aee44b98b0d0ffcff6 Mon Sep 17 00:00:00 2001
From: Updater Bot <updater@travis-ci.org>
Date: Wed, 06 May 2020 01:13:26 +0000
Subject: [PATCH] Update to Keycloak 9.0.3
---
src/main/java/org/keycloak/protocol/cas/mappers/GroupMembershipMapper.java | 45 ++++++++++++++++++++++++++-------------------
1 files changed, 26 insertions(+), 19 deletions(-)
diff --git a/src/main/java/org/keycloak/protocol/cas/mappers/GroupMembershipMapper.java b/src/main/java/org/keycloak/protocol/cas/mappers/GroupMembershipMapper.java
index 665a6e8..e5a9a89 100644
--- a/src/main/java/org/keycloak/protocol/cas/mappers/GroupMembershipMapper.java
+++ b/src/main/java/org/keycloak/protocol/cas/mappers/GroupMembershipMapper.java
@@ -1,23 +1,24 @@
package org.keycloak.protocol.cas.mappers;
-import org.keycloak.models.ProtocolMapperModel;
-import org.keycloak.protocol.cas.CASLoginProtocol;
-import org.keycloak.protocol.oidc.OIDCLoginProtocol;
+import org.keycloak.models.*;
+import org.keycloak.models.utils.ModelToRepresentation;
import org.keycloak.protocol.oidc.mappers.OIDCAttributeMapperHelper;
import org.keycloak.provider.ProviderConfigProperty;
import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
public class GroupMembershipMapper extends AbstractCASProtocolMapper {
private static final List<ProviderConfigProperty> configProperties = new ArrayList<ProviderConfigProperty>();
+ private static final String FULL_PATH = "full.path";
+
static {
OIDCAttributeMapperHelper.addTokenClaimNameConfig(configProperties);
ProviderConfigProperty property1 = new ProviderConfigProperty();
- property1.setName("full.path");
+ property1.setName(FULL_PATH);
property1.setLabel("Full group path");
property1.setType(ProviderConfigProperty.BOOLEAN_TYPE);
property1.setDefaultValue("true");
@@ -48,23 +49,29 @@
return "Map user group membership";
}
- public static boolean useFullPath(ProtocolMapperModel mappingModel) {
- return "true".equals(mappingModel.getConfig().get("full.path"));
+ @Override
+ public void setAttribute(Map<String, Object> attributes, ProtocolMapperModel mappingModel, UserSessionModel userSession,
+ KeycloakSession session, ClientSessionContext clientSessionCt) {
+ List<String> membership = new LinkedList<>();
+ boolean fullPath = useFullPath(mappingModel);
+ for (GroupModel group : userSession.getUser().getGroups()) {
+ if (fullPath) {
+ membership.add(ModelToRepresentation.buildGroupPath(group));
+ } else {
+ membership.add(group.getName());
+ }
+ }
+ setPlainAttribute(attributes, mappingModel, membership);
}
- public static ProtocolMapperModel create(String name, String tokenClaimName,
- boolean consentRequired, String consentText, boolean fullPath) {
- 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(OIDCAttributeMapperHelper.TOKEN_CLAIM_NAME, tokenClaimName);
- config.put("full.path", Boolean.toString(fullPath));
- mapper.setConfig(config);
+ public static boolean useFullPath(ProtocolMapperModel mappingModel) {
+ return "true".equals(mappingModel.getConfig().get(FULL_PATH));
+ }
+ public static ProtocolMapperModel create(String name, String tokenClaimName, boolean fullPath) {
+ ProtocolMapperModel mapper = CASAttributeMapperHelper.createClaimMapper(name, tokenClaimName,
+ "String", PROVIDER_ID);
+ mapper.getConfig().put(FULL_PATH, Boolean.toString(fullPath));
return mapper;
}
}
--
Gitblit v1.9.1