diff --git a/src/main/java/io/kamax/mxisd/as/AppServiceHandler.java b/src/main/java/io/kamax/mxisd/as/AppServiceHandler.java index 3bcabbc..3a791a2 100644 --- a/src/main/java/io/kamax/mxisd/as/AppServiceHandler.java +++ b/src/main/java/io/kamax/mxisd/as/AppServiceHandler.java @@ -79,7 +79,12 @@ public class AppServiceHandler { log.info("Got invite for {}", id); boolean wasSent = false; - for (_ThreePid tpid : profiler.getThreepids(mxid)) { + List<_ThreePid> tpids = profiler.getThreepids(mxid); + if (tpids.isEmpty()) { + log.info("No email found in identity stores for {}", id); + } + + for (_ThreePid tpid : tpids) { if (!StringUtils.equals("email", tpid.getMedium())) { continue; } diff --git a/src/main/java/io/kamax/mxisd/backend/ldap/LdapProfileProvider.java b/src/main/java/io/kamax/mxisd/backend/ldap/LdapProfileProvider.java index 73e4b86..531cfbb 100644 --- a/src/main/java/io/kamax/mxisd/backend/ldap/LdapProfileProvider.java +++ b/src/main/java/io/kamax/mxisd/backend/ldap/LdapProfileProvider.java @@ -62,10 +62,13 @@ public class LdapProfileProvider extends LdapBackend implements ProfileProvider @Override public Optional getDisplayName(_MatrixID userId) { + String uid = buildUidFromMatrixId(userId); + log.info("Searching for display name of {}:", uid); + try (LdapConnection conn = getConn()) { bind(conn); - String searchQuery = buildOrQueryWithFilter(getCfg().getProfile().getFilter(), buildUidFromMatrixId(userId), getUidAtt()); + String searchQuery = buildOrQueryWithFilter(getCfg().getProfile().getFilter(), uid, getUidAtt()); log.debug("Base DN: {}", getBaseDn()); log.debug("Query: {}", searchQuery); @@ -74,7 +77,7 @@ public class LdapProfileProvider extends LdapBackend implements ProfileProvider while (cursor.next()) { Entry entry = cursor.get(); log.info("Found possible match, DN: {}", entry.getDn().getName()); - Optional v = getAttribute(entry, getAt().getName()).flatMap(uid -> { + Optional v = getAttribute(entry, getAt().getName()).flatMap(id -> { log.info("DN {} is a valid match", entry.getDn().getName()); try { return getAttribute(entry, getAt().getName()); @@ -102,7 +105,7 @@ public class LdapProfileProvider extends LdapBackend implements ProfileProvider @Override public List<_ThreePid> getThreepids(_MatrixID userId) { String uid = buildUidFromMatrixId(userId); - log.info("Looking for display name of {}", uid); + log.info("Searching for 3PIDs of {}:", uid); List<_ThreePid> threePids = new ArrayList<>(); try (LdapConnection conn = getConn()) { diff --git a/src/main/java/io/kamax/mxisd/backend/ldap/netiq/NetIqLdapProfileProvider.java b/src/main/java/io/kamax/mxisd/backend/ldap/netiq/NetIqLdapProfileProvider.java index cea941a..f1a4e7b 100644 --- a/src/main/java/io/kamax/mxisd/backend/ldap/netiq/NetIqLdapProfileProvider.java +++ b/src/main/java/io/kamax/mxisd/backend/ldap/netiq/NetIqLdapProfileProvider.java @@ -23,7 +23,7 @@ package io.kamax.mxisd.backend.ldap.netiq; import io.kamax.matrix._MatrixID; import io.kamax.mxisd.backend.ldap.LdapProfileProvider; import io.kamax.mxisd.config.MatrixConfig; -import io.kamax.mxisd.config.ldap.LdapConfig; +import io.kamax.mxisd.config.ldap.netiq.NetIqLdapConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -31,7 +31,7 @@ import org.springframework.stereotype.Component; public class NetIqLdapProfileProvider extends LdapProfileProvider { @Autowired - public NetIqLdapProfileProvider(LdapConfig cfg, MatrixConfig mxCfg) { + public NetIqLdapProfileProvider(NetIqLdapConfig cfg, MatrixConfig mxCfg) { super(cfg, mxCfg); } diff --git a/src/main/java/io/kamax/mxisd/profile/ProfileManager.java b/src/main/java/io/kamax/mxisd/profile/ProfileManager.java index 76c0abb..4ff143b 100644 --- a/src/main/java/io/kamax/mxisd/profile/ProfileManager.java +++ b/src/main/java/io/kamax/mxisd/profile/ProfileManager.java @@ -48,12 +48,13 @@ public class ProfileManager { @PostConstruct public void build() { - providers = providers.stream() - .filter(ProfileProvider::isEnabled) - .collect(Collectors.toList()); - log.info("--- Profile providers ---"); - this.providers.forEach(pp -> log.info("\t- {}", pp.getClass().getSimpleName())); + providers = providers.stream() + .filter(pp -> { + log.info("\t- {} - Is enabled? {}", pp.getClass().getSimpleName(), pp.isEnabled()); + return pp.isEnabled(); + }) + .collect(Collectors.toList()); } public List getList(Function> function) {