From 9d615c437a82b42e52e071fab330d185fab7093f Mon Sep 17 00:00:00 2001 From: holgerhagen Date: Wed, 3 Nov 2021 13:58:32 +0100 Subject: [PATCH] TSK-1756: additional user ldap attributes are now optional. --- .../main/java/pro/taskana/common/rest/ldap/LdapClient.java | 7 +++++++ .../java/pro/taskana/common/rest/ldap/LdapClientTest.java | 6 ++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/common/rest/ldap/LdapClient.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/common/rest/ldap/LdapClient.java index 040cd56dd..998fbb44a 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/common/rest/ldap/LdapClient.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/common/rest/ldap/LdapClient.java @@ -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()); } diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/common/rest/ldap/LdapClientTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/common/rest/ldap/LdapClientTest.java index 63c3de9f1..e38d91145 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/common/rest/ldap/LdapClientTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/common/rest/ldap/LdapClientTest.java @@ -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