fixed AD setup

Change-Id: I116f627c7ad1d04fe7be8c921f087358947c7b96

ad-connector/src/main/java/net/jami/jams/ad/connector/ADConnector.java

@@ -43,18 +43,19 @@ public class ADConnector implements AuthenticationSource {
     private static final ConcurrentLinkedQueue<Endpoint> endpoints = new ConcurrentLinkedQueue<>();
     public static ActiveDirectorySettings settings;
     private final AuthenticationService authenticationService = new AuthenticationService();
-    private final UserProfileService userProfileService = new UserProfileService();
+    private final UserProfileService userProfileService;
 
     public ADConnector(String settings) {
         JsoniterRegistry.initCodecs();
         ADConnector.settings = JsonIterator.deserialize(settings,ActiveDirectorySettings.class);
         for(int i=0; i<10;i++){
             Endpoint endpoint = new Endpoint();
-            endpoint.setSecuredConnection(ADConnector.settings.getSsl());
+            endpoint.setSecuredConnection(ADConnector.settings.getIsSSL());
             endpoint.setPort(ADConnector.settings.getPort());
             endpoint.setHost(ADConnector.settings.getHost());
             endpoints.add(endpoint);
         }
+        userProfileService = new UserProfileService();
         log.info("Started Active Directory Connector!");
     }
 

ad-connector/src/main/java/net/jami/jams/ad/connector/service/AuthenticationService.java

@@ -30,7 +30,9 @@ import net.jami.jams.ad.connector.ADConnector;
 public class AuthenticationService {
 
     public boolean authenticateUser(String username, String password) {
-        Endpoint endpoint = ADConnector.getConnection(username, password);
+
+        String marked_username = username.substring(username.indexOf("cn=") + 3, username.indexOf(",")); //ADConnector.settings.getRealm() + "\\" + ADConnector.settings.getUsername();
+        Endpoint endpoint = ADConnector.getConnection(marked_username, password);
         try {
             ConnectionResponse connectionResponse = DirectoryConnectorService.authenticate(endpoint);
             return !connectionResponse.isError();

jams-common/src/main/java/net/jami/jams/common/authentication/activedirectory/ActiveDirectorySettings.java

@@ -31,7 +31,7 @@ import java.util.HashMap;
 @Setter
 public class ActiveDirectorySettings {
 
-    private Boolean ssl;
+    private Boolean isSSL;
     private int     port;
     private String  realm;
     private String  host;

jams-server/src/main/resources/webapp/js/identity-management.js

@@ -93,6 +93,18 @@ function setADParametersData(form) {
             settings[field.name] = field.value;
     });
 
+    settings['fieldMappings'] = {};
+    settings['fieldMappings']['givenName'] = "FirstName";
+    settings['fieldMappings']['sn'] = "LastName";
+    settings['fieldMappings']['jpegPhoto'] = "ProfilePicture";
+    settings['fieldMappings']['mail'] = "Email";
+    settings['fieldMappings']['telephoneNumber'] = "PhoneNumber";
+    settings['fieldMappings']['mobile'] = "MobileNumber";
+    settings['fieldMappings']['facsimileTelephoneNumber'] = "FaxNumber";
+    settings['fieldMappings']['extensionName'] = "PhoneNumberExtension";
+    settings['fieldMappings']['o'] = "Organization";
+    settings['fieldMappings']['uid'] = "Username";
+
     authSource['type'] = 'AD';
     authSource['activeDirectorySettings'] = settings;
     var data = authSource;