nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TSK-1756: additional user ldap attributes are now optional.

This commit is contained in:
holgerhagen 2021-11-03 13:58:32 +01:00 committed by holgerhagen
parent a6e5ffae74
commit 9d615c437a
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rest/taskana-rest-spring/src/main/java/pro/taskana/common/rest/ldap/LdapClient.java
View File

@ -558,6 +558,13 @@ public class LdapClient {
// optional settings
.filter(p -> !p.equals(LdapSettings.TASKANA_LDAP_MAX_NUMBER_OF_RETURNED_ACCESS_IDS))
.filter(p -> !p.equals(LdapSettings.TASKANA_LDAP_MIN_SEARCH_FOR_LENGTH))
.filter(p -> !p.equals(LdapSettings.TASKANA_LDAP_USER_EMAIL_ATTRIBUTE))
.filter(p -> !p.equals(LdapSettings.TASKANA_LDAP_USER_PHONE_ATTRIBUTE))
.filter(p -> !p.equals(LdapSettings.TASKANA_LDAP_USER_MOBILE_PHONE_ATTRIBUTE))
.filter(p -> !p.equals(LdapSettings.TASKANA_LDAP_USER_ORG_LEVEL_1_ATTRIBUTE))
.filter(p -> !p.equals(LdapSettings.TASKANA_LDAP_USER_ORG_LEVEL_2_ATTRIBUTE))
.filter(p -> !p.equals(LdapSettings.TASKANA_LDAP_USER_ORG_LEVEL_3_ATTRIBUTE))
.filter(p -> !p.equals(LdapSettings.TASKANA_LDAP_USER_ORG_LEVEL_4_ATTRIBUTE))
.filter(p -> p.getValueFromEnv(env) == null)
.collect(Collectors.toList());
}

6
rest/taskana-rest-spring/src/test/java/pro/taskana/common/rest/ldap/LdapClientTest.java
View File

@ -146,8 +146,10 @@ class LdapClientTest {
@Test
void testLdap_checkForMissingConfigurations() {
// optional config fields: minSearchForLength, maxNumberOfReturnedAccessIds
assertThat(cut.checkForMissingConfigurations()).hasSize(LdapSettings.values().length - 2);
// optional config fields: minSearchForLength, maxNumberOfReturnedAccessIds, userPhoneAttribute,
// userMobilePhoneAttribute, userEmailAttribute, userOrglevel1Attribute, userOrglevel2Attribute,
// userOrglevel3Attribute, userOrglevel4Attribute
assertThat(cut.checkForMissingConfigurations()).hasSize(LdapSettings.values().length - 9);
}
@Test