libre.sh/keycloak-scim
2
0
Fork 0
Code Issues 14 Pull requests Releases Packages Activity Actions 6

Merge pull request #860 from carljmosca/master

Browse source 
added support for Tivoli LDAP unique identifier
This commit is contained in:
Bill Burke 2014-11-17 10:52:50 -05:00
commit ca946d4b19
3 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
forms/common-themes/src/main/resources/theme/admin/base/resources/js/controllers/users.js
View file

@ -525,6 +525,7 @@ module.controller('LDAPCtrl', function($scope, $location, Notifications, Dialog,
$scope.ldapVendors = [
{ "id": "ad", "name": "Active Directory" },
{ "id": "rhds", "name": "Red Hat Directory Server" },
{ "id": "tivoli", "name": "Tivoli" },
{ "id": "other", "name": "Other" }
];

1
model/api/src/main/java/org/keycloak/models/LDAPConstants.java
View file

@ -9,6 +9,7 @@ public class LDAPConstants {
public static final String VENDOR_RHDS = "rhds";
public static final String VENDOR_ACTIVE_DIRECTORY = "ad";
public static final String VENDOR_OTHER = "other";
public static final String VENDOR_TIVOLI = "tivoli";
public static final String USERNAME_LDAP_ATTRIBUTE = "usernameLDAPAttribute";
public static final String USER_OBJECT_CLASSES = "userObjectClasses";

2
picketlink/keycloak-picketlink-ldap/src/main/java/org/keycloak/picketlink/ldap/PartitionManagerRegistry.java
View file

@ -105,6 +105,8 @@ public class PartitionManagerRegistry {
// RHDS is using "nsuniqueid" as unique identifier instead of "entryUUID"
if (vendor != null && vendor.equals(LDAPConstants.VENDOR_RHDS)) {
ldapStoreBuilder.uniqueIdentifierAttributeName("nsuniqueid");
} else if (LDAPConstants.VENDOR_TIVOLI.equals(vendor)) {
ldapStoreBuilder.uniqueIdentifierAttributeName("uniqueidentifier");
}
LDAPMappingConfigurationBuilder ldapUserMappingBuilder = ldapStoreBuilder