From b4b7295b51c7b7f19349423f90a9a51d3bcca7e5 Mon Sep 17 00:00:00 2001
From: Felix Sidokhine <felix.sidokhine@randstad.ca>
Date: Mon, 11 May 2020 13:11:06 +0300
Subject: [PATCH] fixed iteration problem with LDAP
---
jams-server/src/main/java/net/jami/jams/server/Server.java | 2 +-
.../jami/jams/ldap/connector/service/UserProfileService.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/jams-server/src/main/java/net/jami/jams/server/Server.java b/jams-server/src/main/java/net/jami/jams/server/Server.java
index f6a36edf..efc6061e 100644
--- a/jams-server/src/main/java/net/jami/jams/server/Server.java
+++ b/jams-server/src/main/java/net/jami/jams/server/Server.java
@@ -61,7 +61,7 @@ public class Server {
userAuthenticationModule.attachLDAPAuthSource(new String(path.readAllBytes()));
UserProfile[] userProfile = userAuthenticationModule.getAuthenticationSources()
.get(new AuthModuleKey("savoirfairelinux", AuthenticationSourceType.LDAP))
- .getUserProfile("Félix","FULL_TEXT_NAME");
+ .getUserProfile("Béraud","FULL_TEXT_NAME");
System.out.println(userProfile[0]);
} catch (Exception e) {
log.error("Could not load and inject active directory connector with error: " + e.toString());
diff --git a/ldap-connector/src/main/java/net/jami/jams/ldap/connector/service/UserProfileService.java b/ldap-connector/src/main/java/net/jami/jams/ldap/connector/service/UserProfileService.java
index e0334e15..d2d4e3d1 100644
--- a/ldap-connector/src/main/java/net/jami/jams/ldap/connector/service/UserProfileService.java
+++ b/ldap-connector/src/main/java/net/jami/jams/ldap/connector/service/UserProfileService.java
@@ -44,7 +44,7 @@ public class UserProfileService {
SearchResponse res = search.execute(buildRequest(queryString,field));
if (res.getEntries().size() > 0) profiles = new UserProfile[res.getEntries().size()];
for(int i=0; i< profiles.length; i++){
- profiles[i] = profileFromResponse(res.getEntry());
+ profiles[i] = profileFromResponse(res.getEntries().iterator().next());
}
return profiles;
} catch (Exception e) {
--
GitLab