fix(ldap): query groups by groupIdIn using LDAP Identity Provider

related to CAM-7143
cephdon · Aug 7, 2017 · 321521b · 321521b
1 parent fe5a99d
commit 321521b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/...ty-ldap/src/main/java/org/camunda/bpm/identity/impl/ldap/LdapIdentityProviderSession.java b/...ty-ldap/src/main/java/org/camunda/bpm/identity/impl/ldap/LdapIdentityProviderSession.java
@@ -442,6 +442,13 @@ protected String getGroupSearchFilter(LdapGroupQuery query) {
     if(query.getId() != null) {
       addFilter(ldapConfiguration.getGroupIdAttribute(), query.getId(), search);
     }
+    if(query.getIds() != null && query.getIds().length > 0) {
+      search.write("(|");
+      for (String id : query.getIds()) {
+        addFilter(ldapConfiguration.getGroupIdAttribute(), id, search);
+      }
+      search.write(")");
+    }
     if(query.getName() != null) {
       addFilter(ldapConfiguration.getGroupNameAttribute(), query.getName(), search);
     }

diff --git a/...ns/identity-ldap/src/test/java/org/camunda/bpm/identity/impl/ldap/LdapGroupQueryTest.java b/...ns/identity-ldap/src/test/java/org/camunda/bpm/identity/impl/ldap/LdapGroupQueryTest.java
@@ -52,7 +52,7 @@ public void testFilterByGroupId() {
     assertNull(group);
   }
 
-  public void FAILING_testFilterByGroupIdIn() {
+  public void testFilterByGroupIdIn() {
     List<Group> groups = identityService.createGroupQuery()
       .groupIdIn("external", "management")
       .list();

diff --git a/engine/src/main/java/org/camunda/bpm/engine/impl/GroupQueryImpl.java b/engine/src/main/java/org/camunda/bpm/engine/impl/GroupQueryImpl.java
@@ -124,5 +124,7 @@ public String getUserId() {
   public String getTenantId() {
     return tenantId;
   }
-
+  public String[] getIds() {
+    return ids;
+  }
 }