keycloak-aplcache
Changes
broker/oidc/src/main/resources/META-INF/services/org.keycloak.broker.provider.IdentityProviderMapper 3(+2 -1)
Details
diff --git a/broker/oidc/src/main/java/org/keycloak/broker/oidc/mappers/AbstractClaimMapper.java b/broker/oidc/src/main/java/org/keycloak/broker/oidc/mappers/AbstractClaimMapper.java
new file mode 100755
index 0000000..f7ebf94
--- /dev/null
+++ b/broker/oidc/src/main/java/org/keycloak/broker/oidc/mappers/AbstractClaimMapper.java
@@ -0,0 +1,93 @@
+package org.keycloak.broker.oidc.mappers;
+
+import org.keycloak.broker.oidc.KeycloakOIDCIdentityProvider;
+import org.keycloak.broker.provider.AbstractIdentityProviderMapper;
+import org.keycloak.broker.provider.BrokeredIdentityContext;
+import org.keycloak.models.IdentityProviderMapperModel;
+import org.keycloak.provider.ProviderConfigProperty;
+import org.keycloak.representations.JsonWebToken;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+ * @version $Revision: 1 $
+ */
+public abstract class AbstractClaimMapper extends AbstractIdentityProviderMapper {
+ public static final String CLAIM = "claim";
+ public static final String CLAIM_VALUE = "claim.value";
+
+ public static Object getClaimValue(JsonWebToken token, String claim) {
+ String[] split = claim.split("\\.");
+ Map<String, Object> jsonObject = token.getOtherClaims();
+ for (int i = 0; i < split.length; i++) {
+ if (i == split.length - 1) {
+ return jsonObject.get(split[i]);
+ } else {
+ Object val = jsonObject.get(split[i]);
+ if (!(val instanceof Map)) return null;
+ jsonObject = (Map<String, Object>)val;
+ }
+ }
+ return null;
+ }
+
+ protected Object getClaimValue(IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
+ String claim = mapperModel.getConfig().get(CLAIM);
+ { // search access token
+ JsonWebToken token = (JsonWebToken)context.getContextData().get(KeycloakOIDCIdentityProvider.VALIDATED_ACCESS_TOKEN);
+ if (token != null) {
+ Object value = getClaimValue(token, claim);
+ if (value != null) return value;
+ }
+
+ }
+ { // search ID Token
+ JsonWebToken token = (JsonWebToken)context.getContextData().get(KeycloakOIDCIdentityProvider.VALIDATED_ID_TOKEN);
+ if (token != null) {
+ Object value = getClaimValue(token, claim);
+ if (value != null) return value;
+ }
+
+ }
+ return null;
+ }
+
+
+ protected boolean hasClaimValue(IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
+ Object value = getClaimValue(mapperModel, context);
+ String desiredValue = mapperModel.getConfig().get(CLAIM_VALUE);
+ return valueEquals(desiredValue, value);
+ }
+
+ public boolean valueEquals(String desiredValue, Object value) {
+ if (value instanceof String) {
+ if (desiredValue.equals(value)) return true;
+ } else if (value instanceof Double) {
+ try {
+ if (Double.valueOf(desiredValue).equals(value)) return true;
+ } catch (Exception e) {
+
+ }
+ } else if (value instanceof Integer) {
+ try {
+ if (Integer.valueOf(desiredValue).equals(value)) return true;
+ } catch (Exception e) {
+
+ }
+ } else if (value instanceof Boolean) {
+ try {
+ if (Boolean.valueOf(desiredValue).equals(value)) return true;
+ } catch (Exception e) {
+
+ }
+ } else if (value instanceof List) {
+ List list = (List)value;
+ for (Object val : list) {
+ return valueEquals(desiredValue, val);
+ }
+ }
+ return false;
+ }
+}
diff --git a/broker/oidc/src/main/java/org/keycloak/broker/oidc/mappers/RoleMapper.java b/broker/oidc/src/main/java/org/keycloak/broker/oidc/mappers/RoleMapper.java
index ff30b2f..7f47590 100755
--- a/broker/oidc/src/main/java/org/keycloak/broker/oidc/mappers/RoleMapper.java
+++ b/broker/oidc/src/main/java/org/keycloak/broker/oidc/mappers/RoleMapper.java
@@ -1,9 +1,7 @@
package org.keycloak.broker.oidc.mappers;
-import org.keycloak.broker.oidc.KeycloakOIDCIdentityProvider;
import org.keycloak.broker.oidc.KeycloakOIDCIdentityProviderFactory;
import org.keycloak.broker.oidc.OIDCIdentityProviderFactory;
-import org.keycloak.broker.provider.AbstractIdentityProviderMapper;
import org.keycloak.broker.provider.BrokeredIdentityContext;
import org.keycloak.broker.provider.IdentityBrokerException;
import org.keycloak.models.ClientModel;
@@ -13,59 +11,37 @@ import org.keycloak.models.RealmModel;
import org.keycloak.models.RoleModel;
import org.keycloak.models.UserModel;
import org.keycloak.provider.ProviderConfigProperty;
-import org.keycloak.representations.JsonWebToken;
import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
/**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
* @version $Revision: 1 $
*/
-public class RoleMapper extends AbstractIdentityProviderMapper {
+public class RoleMapper extends AbstractClaimMapper {
public static final String[] COMPATIBLE_PROVIDERS = {KeycloakOIDCIdentityProviderFactory.PROVIDER_ID, OIDCIdentityProviderFactory.PROVIDER_ID};
private static final List<ProviderConfigProperty> configProperties = new ArrayList<ProviderConfigProperty>();
public static final String ROLE = "role";
- public static final String CLAIM = "claim";
-
- public static final String ID_TOKEN_CLAIM = "id.token.claim";
-
- public static final String ACCESS_TOKEN_CLAIM = "access.token.claim";
-
- public static final String CLAIM_VALUE = "claim.value";
static {
ProviderConfigProperty property;
- property = new ProviderConfigProperty();
- property.setName(CLAIM);
- property.setLabel("Claim");
- property.setHelpText("Name of claim to search for in token. You can reference nested claims using a '.', i.e. 'address.locality'.");
- property.setType(ProviderConfigProperty.STRING_TYPE);
- configProperties.add(property);
- property = new ProviderConfigProperty();
- property.setName(CLAIM_VALUE);
- property.setLabel("Claim Value");
- property.setHelpText("Value the claim must have. If the claim is an array, then the value must be contained in the array.");
- property.setType(ProviderConfigProperty.STRING_TYPE);
- configProperties.add(property);
- property = new ProviderConfigProperty();
- property.setName(ID_TOKEN_CLAIM);
- property.setLabel("ID Token Claim");
- property.setType(ProviderConfigProperty.BOOLEAN_TYPE);
- property.setDefaultValue("true");
- property.setHelpText("If this claim is in ID Token, apply role.");
- configProperties.add(property);
- property = new ProviderConfigProperty();
- property.setName(ACCESS_TOKEN_CLAIM);
- property.setLabel("Access Token Claim");
- property.setType(ProviderConfigProperty.BOOLEAN_TYPE);
- property.setDefaultValue("true");
- property.setHelpText("If this claim is in Access Token, apply role.");
- configProperties.add(property);
+ ProviderConfigProperty property1;
+ property1 = new ProviderConfigProperty();
+ property1.setName(CLAIM);
+ property1.setLabel("Claim");
+ property1.setHelpText("Name of claim to search for in token. You can reference nested claims using a '.', i.e. 'address.locality'.");
+ property1.setType(ProviderConfigProperty.STRING_TYPE);
+ configProperties.add(property1);
+ property1 = new ProviderConfigProperty();
+ property1.setName(CLAIM_VALUE);
+ property1.setLabel("Claim Value");
+ property1.setHelpText("Value the claim must have. If the claim is an array, then the value must be contained in the array.");
+ property1.setType(ProviderConfigProperty.STRING_TYPE);
+ configProperties.add(property1);
property = new ProviderConfigProperty();
property.setName(ROLE);
property.setLabel("Role");
@@ -90,24 +66,6 @@ public class RoleMapper extends AbstractIdentityProviderMapper {
}
}
- public static Object getClaimValue(JsonWebToken token, String claim) {
- String[] split = claim.split("\\.");
- Map<String, Object> jsonObject = token.getOtherClaims();
- for (int i = 0; i < split.length; i++) {
- if (i == split.length - 1) {
- return jsonObject.get(split[i]);
- } else {
- Object val = jsonObject.get(split[i]);
- if (!(val instanceof Map)) return null;
- jsonObject = (Map<String, Object>)val;
- }
- }
- return null;
- }
-
-
-
-
@Override
public List<ProviderConfigProperty> getConfigProperties() {
@@ -126,18 +84,18 @@ public class RoleMapper extends AbstractIdentityProviderMapper {
@Override
public String getDisplayCategory() {
- return "Role Mapper";
+ return "Role Importer";
}
@Override
public String getDisplayType() {
- return "Role Mapper";
+ return "Role Importer";
}
@Override
public void importNewUser(KeycloakSession session, RealmModel realm, UserModel user, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
String roleName = mapperModel.getConfig().get(ROLE);
- if (isClaimPresent(mapperModel, context)) {
+ if (hasClaimValue(mapperModel, context)) {
RoleModel role = getRoleFromString(realm, roleName);
if (role == null) throw new IdentityBrokerException("Unable to find role: " + roleName);
user.grantRole(role);
@@ -156,65 +114,10 @@ public class RoleMapper extends AbstractIdentityProviderMapper {
return role;
}
- protected boolean isClaimPresent(IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
- boolean searchAccess = Boolean.valueOf(mapperModel.getConfig().get(ACCESS_TOKEN_CLAIM));
- boolean searchId = Boolean.valueOf(mapperModel.getConfig().get(ID_TOKEN_CLAIM));
- String claim = mapperModel.getConfig().get(CLAIM);
- String desiredValue = mapperModel.getConfig().get(CLAIM_VALUE);
-
- if (searchAccess) {
- JsonWebToken token = (JsonWebToken)context.getContextData().get(KeycloakOIDCIdentityProvider.VALIDATED_ACCESS_TOKEN);
- if (token != null) {
- Object value = getClaimValue(token, claim);
- if (valueEquals(desiredValue, value)) return true;
- }
-
- }
- if (searchId) {
- JsonWebToken token = (JsonWebToken)context.getContextData().get(KeycloakOIDCIdentityProvider.VALIDATED_ID_TOKEN);
- if (token != null) {
- Object value = getClaimValue(token, claim);
- if (valueEquals(desiredValue, value)) return true;
- }
-
- }
- return false;
- }
-
- public boolean valueEquals(String desiredValue, Object value) {
- if (value instanceof String) {
- if (desiredValue.equals(value)) return true;
- } else if (value instanceof Double) {
- try {
- if (Double.valueOf(desiredValue).equals(value)) return true;
- } catch (Exception e) {
-
- }
- } else if (value instanceof Integer) {
- try {
- if (Integer.valueOf(desiredValue).equals(value)) return true;
- } catch (Exception e) {
-
- }
- } else if (value instanceof Boolean) {
- try {
- if (Boolean.valueOf(desiredValue).equals(value)) return true;
- } catch (Exception e) {
-
- }
- } else if (value instanceof List) {
- List list = (List)value;
- for (Object val : list) {
- return valueEquals(desiredValue, val);
- }
- }
- return false;
- }
-
@Override
public void updateBrokeredUser(KeycloakSession session, RealmModel realm, UserModel user, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
String roleName = mapperModel.getConfig().get(ROLE);
- if (!isClaimPresent(mapperModel, context)) {
+ if (!hasClaimValue(mapperModel, context)) {
RoleModel role = getRoleFromString(realm, roleName);
if (role == null) throw new IdentityBrokerException("Unable to find role: " + roleName);
user.deleteRoleMapping(role);
diff --git a/broker/oidc/src/main/java/org/keycloak/broker/oidc/mappers/UserAttributeMapper.java b/broker/oidc/src/main/java/org/keycloak/broker/oidc/mappers/UserAttributeMapper.java
new file mode 100755
index 0000000..72177ad
--- /dev/null
+++ b/broker/oidc/src/main/java/org/keycloak/broker/oidc/mappers/UserAttributeMapper.java
@@ -0,0 +1,100 @@
+package org.keycloak.broker.oidc.mappers;
+
+import org.keycloak.broker.oidc.KeycloakOIDCIdentityProviderFactory;
+import org.keycloak.broker.oidc.OIDCIdentityProviderFactory;
+import org.keycloak.broker.provider.BrokeredIdentityContext;
+import org.keycloak.broker.provider.IdentityBrokerException;
+import org.keycloak.models.ClientModel;
+import org.keycloak.models.IdentityProviderMapperModel;
+import org.keycloak.models.KeycloakSession;
+import org.keycloak.models.RealmModel;
+import org.keycloak.models.RoleModel;
+import org.keycloak.models.UserModel;
+import org.keycloak.provider.ProviderConfigProperty;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+ * @version $Revision: 1 $
+ */
+public class UserAttributeMapper extends AbstractClaimMapper {
+
+ public static final String[] COMPATIBLE_PROVIDERS = {KeycloakOIDCIdentityProviderFactory.PROVIDER_ID, OIDCIdentityProviderFactory.PROVIDER_ID};
+
+ private static final List<ProviderConfigProperty> configProperties = new ArrayList<ProviderConfigProperty>();
+
+ public static final String USER_ATTRIBUTE = "user.attribute.name";
+
+ static {
+ ProviderConfigProperty property;
+ ProviderConfigProperty property1;
+ property1 = new ProviderConfigProperty();
+ property1.setName(CLAIM);
+ property1.setLabel("Claim");
+ property1.setHelpText("Name of claim to search for in token. You can reference nested claims using a '.', i.e. 'address.locality'.");
+ property1.setType(ProviderConfigProperty.STRING_TYPE);
+ configProperties.add(property1);
+ property = new ProviderConfigProperty();
+ property.setName(USER_ATTRIBUTE);
+ property.setLabel("User Attribute Name");
+ property.setHelpText("User attribute name to store claim.");
+ property.setType(ProviderConfigProperty.STRING_TYPE);
+ configProperties.add(property);
+ }
+
+ public static final String PROVIDER_ID = "oidc-user-attribute-idp-mapper";
+
+ @Override
+ public List<ProviderConfigProperty> getConfigProperties() {
+ return configProperties;
+ }
+
+ @Override
+ public String getId() {
+ return PROVIDER_ID;
+ }
+
+ @Override
+ public String[] getCompatibleProviders() {
+ return COMPATIBLE_PROVIDERS;
+ }
+
+ @Override
+ public String getDisplayCategory() {
+ return "Attribute Importer";
+ }
+
+ @Override
+ public String getDisplayType() {
+ return "Attribute Importer";
+ }
+
+ @Override
+ public void importNewUser(KeycloakSession session, RealmModel realm, UserModel user, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
+ String attribute = mapperModel.getConfig().get(USER_ATTRIBUTE);
+ Object value = getClaimValue(mapperModel, context);
+ if (value != null) {
+ user.setAttribute(attribute, value.toString());
+ }
+ }
+
+ @Override
+ public void updateBrokeredUser(KeycloakSession session, RealmModel realm, UserModel user, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
+ String attribute = mapperModel.getConfig().get(USER_ATTRIBUTE);
+ Object value = getClaimValue(mapperModel, context);
+ String current = user.getAttribute(attribute);
+ if (value != null && !value.equals(current)) {
+ user.setAttribute(attribute, value.toString());
+ } else if (value == null) {
+ user.removeAttribute(attribute);
+ }
+ }
+
+ @Override
+ public String getHelpText() {
+ return "Import declared claim if it exists in ID or access token into the specified user attribute.";
+ }
+
+}
diff --git a/broker/oidc/src/main/resources/META-INF/services/org.keycloak.broker.provider.IdentityProviderMapper b/broker/oidc/src/main/resources/META-INF/services/org.keycloak.broker.provider.IdentityProviderMapper
index 98ce5f7..c2245b6 100755
--- a/broker/oidc/src/main/resources/META-INF/services/org.keycloak.broker.provider.IdentityProviderMapper
+++ b/broker/oidc/src/main/resources/META-INF/services/org.keycloak.broker.provider.IdentityProviderMapper
@@ -1 +1,2 @@
-org.keycloak.broker.oidc.mappers.RoleMapper
\ No newline at end of file
+org.keycloak.broker.oidc.mappers.RoleMapper
+org.keycloak.broker.oidc.mappers.UserAttributeMapper
\ No newline at end of file
diff --git a/broker/saml/src/main/java/org/keycloak/broker/saml/mappers/RoleMapper.java b/broker/saml/src/main/java/org/keycloak/broker/saml/mappers/RoleMapper.java
index 3c6d655..7181dfe 100755
--- a/broker/saml/src/main/java/org/keycloak/broker/saml/mappers/RoleMapper.java
+++ b/broker/saml/src/main/java/org/keycloak/broker/saml/mappers/RoleMapper.java
@@ -46,7 +46,7 @@ public class RoleMapper extends AbstractIdentityProviderMapper {
configProperties.add(property);
property = new ProviderConfigProperty();
property.setName(ATTRIBUTE_FRIENDLY_NAME);
- property.setLabel("Attribute Name");
+ property.setLabel("Friendly Name");
property.setHelpText("Friendly name of attribute to search for in assertion. You can leave this blank and specify a name instead.");
property.setType(ProviderConfigProperty.STRING_TYPE);
configProperties.add(property);
@@ -147,7 +147,6 @@ public class RoleMapper extends AbstractIdentityProviderMapper {
return false;
}
-
@Override
public void updateBrokeredUser(KeycloakSession session, RealmModel realm, UserModel user, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
String roleName = mapperModel.getConfig().get(ROLE);
diff --git a/broker/saml/src/main/java/org/keycloak/broker/saml/mappers/UserAttributeMapper.java b/broker/saml/src/main/java/org/keycloak/broker/saml/mappers/UserAttributeMapper.java
new file mode 100755
index 0000000..e4d14b6
--- /dev/null
+++ b/broker/saml/src/main/java/org/keycloak/broker/saml/mappers/UserAttributeMapper.java
@@ -0,0 +1,129 @@
+package org.keycloak.broker.saml.mappers;
+
+import org.keycloak.broker.provider.AbstractIdentityProviderMapper;
+import org.keycloak.broker.provider.BrokeredIdentityContext;
+import org.keycloak.broker.provider.IdentityBrokerException;
+import org.keycloak.broker.saml.SAMLEndpoint;
+import org.keycloak.broker.saml.SAMLIdentityProviderFactory;
+import org.keycloak.dom.saml.v2.assertion.AssertionType;
+import org.keycloak.dom.saml.v2.assertion.AttributeStatementType;
+import org.keycloak.dom.saml.v2.assertion.AttributeType;
+import org.keycloak.models.ClientModel;
+import org.keycloak.models.IdentityProviderMapperModel;
+import org.keycloak.models.KeycloakSession;
+import org.keycloak.models.RealmModel;
+import org.keycloak.models.RoleModel;
+import org.keycloak.models.UserModel;
+import org.keycloak.provider.ProviderConfigProperty;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+ * @version $Revision: 1 $
+ */
+public class UserAttributeMapper extends AbstractIdentityProviderMapper {
+
+ public static final String[] COMPATIBLE_PROVIDERS = {SAMLIdentityProviderFactory.PROVIDER_ID};
+
+ private static final List<ProviderConfigProperty> configProperties = new ArrayList<ProviderConfigProperty>();
+
+ public static final String ATTRIBUTE_NAME = "attribute.name";
+ public static final String ATTRIBUTE_FRIENDLY_NAME = "attribute.friendly.name";
+ public static final String USER_ATTRIBUTE = "user.attribute.name";
+
+ static {
+ ProviderConfigProperty property;
+ property = new ProviderConfigProperty();
+ property.setName(ATTRIBUTE_NAME);
+ property.setLabel("Attribute Name");
+ property.setHelpText("Name of attribute to search for in assertion. You can leave this blank and specify a friendly name instead.");
+ property.setType(ProviderConfigProperty.STRING_TYPE);
+ configProperties.add(property);
+ property = new ProviderConfigProperty();
+ property.setName(ATTRIBUTE_FRIENDLY_NAME);
+ property.setLabel("Friendly Name");
+ property.setHelpText("Friendly name of attribute to search for in assertion. You can leave this blank and specify a name instead.");
+ property.setType(ProviderConfigProperty.STRING_TYPE);
+ configProperties.add(property);
+ property = new ProviderConfigProperty();
+ property.setName(USER_ATTRIBUTE);
+ property.setLabel("User Attribute Name");
+ property.setHelpText("User attribute name to store saml attribute.");
+ property.setType(ProviderConfigProperty.STRING_TYPE);
+ configProperties.add(property);
+ }
+
+ public static final String PROVIDER_ID = "saml-user-attribute-idp-mapper";
+
+ @Override
+ public List<ProviderConfigProperty> getConfigProperties() {
+ return configProperties;
+ }
+
+ @Override
+ public String getId() {
+ return PROVIDER_ID;
+ }
+
+ @Override
+ public String[] getCompatibleProviders() {
+ return COMPATIBLE_PROVIDERS;
+ }
+
+ @Override
+ public String getDisplayCategory() {
+ return "Attribute Importer";
+ }
+
+ @Override
+ public String getDisplayType() {
+ return "Attribute Importer";
+ }
+
+ @Override
+ public void importNewUser(KeycloakSession session, RealmModel realm, UserModel user, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
+ String attribute = mapperModel.getConfig().get(USER_ATTRIBUTE);
+ Object value = getAttribute(mapperModel, context);
+ if (value != null) {
+ user.setAttribute(attribute, value.toString());
+ }
+ }
+
+ protected String getAttribute(IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
+ String name = mapperModel.getConfig().get(ATTRIBUTE_NAME);
+ if (name != null && name.trim().equals("")) name = null;
+ String friendly = mapperModel.getConfig().get(ATTRIBUTE_FRIENDLY_NAME);
+ if (friendly != null && friendly.trim().equals("")) friendly = null;
+ AssertionType assertion = (AssertionType)context.getContextData().get(SAMLEndpoint.SAML_ASSERTION);
+ for (AttributeStatementType statement : assertion.getAttributeStatements()) {
+ for (AttributeStatementType.ASTChoiceType choice : statement.getAttributes()) {
+ AttributeType attr = choice.getAttribute();
+ if (name != null && !name.equals(attr.getName())) continue;
+ if (friendly != null && !name.equals(attr.getFriendlyName())) continue;
+ return attr.getAttributeValue().get(0).toString();
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public void updateBrokeredUser(KeycloakSession session, RealmModel realm, UserModel user, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
+ String attribute = mapperModel.getConfig().get(USER_ATTRIBUTE);
+ Object value = getAttribute(mapperModel, context);
+ String current = user.getAttribute(attribute);
+ if (value != null && !value.equals(current)) {
+ user.setAttribute(attribute, value.toString());
+ } else if (value == null) {
+ user.removeAttribute(attribute);
+ }
+
+ }
+
+ @Override
+ public String getHelpText() {
+ return "Import declared saml attribute if it exists in assertion into the specified user attribute.";
+ }
+
+}
diff --git a/broker/saml/src/main/resources/META-INF/services/org.keycloak.broker.provider.IdentityProviderMapper b/broker/saml/src/main/resources/META-INF/services/org.keycloak.broker.provider.IdentityProviderMapper
index af14a9c..5051d1d 100755
--- a/broker/saml/src/main/resources/META-INF/services/org.keycloak.broker.provider.IdentityProviderMapper
+++ b/broker/saml/src/main/resources/META-INF/services/org.keycloak.broker.provider.IdentityProviderMapper
@@ -1 +1,2 @@
-org.keycloak.broker.saml.mappers.RoleMapper
\ No newline at end of file
+org.keycloak.broker.saml.mappers.RoleMapper
+org.keycloak.broker.saml.mappers.UserAttributeMapper
\ No newline at end of file
diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/realm.js b/forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/realm.js
index c5479e0..35a959c 100755
--- a/forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/realm.js
+++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/realm.js
@@ -1436,7 +1436,7 @@ module.controller('IdentityProviderMapperCtrl', function($scope, realm, identit
$scope.save = function() {
IdentityProviderMapper.update({
realm : realm.realm,
- client: client.id,
+ alias: identityProvider.alias,
mapperId : mapper.id
}, $scope.mapper, function() {
$scope.changed = false;
diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/js/services.js b/forms/common-themes/src/main/resources/theme/base/admin/resources/js/services.js
index 6703973..ce209a6 100755
--- a/forms/common-themes/src/main/resources/theme/base/admin/resources/js/services.js
+++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/js/services.js
@@ -1025,6 +1025,10 @@ module.factory('IdentityProviderMapper', function($resource) {
realm : '@realm',
alias : '@alias',
mapperId: '@mapperId'
+ }, {
+ update: {
+ method : 'PUT'
+ }
});
});
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/account/AccountTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/account/AccountTest.java
index 1d99e1f..af202b3 100755
--- a/testsuite/integration/src/test/java/org/keycloak/testsuite/account/AccountTest.java
+++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/account/AccountTest.java
@@ -157,7 +157,7 @@ public class AccountTest {
});
}
- //@Test
+ @Test
public void ideTesting() throws Exception {
Thread.sleep(100000000);
}