added fix so JamiID is ID

Change-Id: I960b1ea540e2efdc5bbfa225916e922c82c35588

jams-common/src/main/java/net/jami/jams/common/objects/user/UserProfile.java

@@ -75,7 +75,7 @@ public class UserProfile implements DatabaseObject {
     private String phoneNumberExtension;
     private String faxNumber;
     private String mobileNumber;
-    private String jamiId;
+    private String id;
     private List<String> groupMemberships;
 
     public UserProfile(ResultSet rs) throws Exception {
@@ -110,7 +110,7 @@ public class UserProfile implements DatabaseObject {
         if(this.getFaxNumber() != null) vCard.addTelephoneNumber(this.getFaxNumber(), TelephoneType.FAX);
         if(this.getEmail() != null) vCard.addEmail(this.getEmail(), EmailType.WORK);
         if(this.getOrganization() != null) vCard.setOrganization(this.getOrganization());
-        if(this.getJamiId() != null) vCard.setExtendedProperty("JamiID",this.jamiId);
+        if(this.getId() != null) vCard.setExtendedProperty("id",this.id);
 
         /*I think this is how Base64 will work in this case*/
         if(this.getProfilePicture() != null) {

jams-server/src/main/java/net/jami/jams/server/servlets/api/admin/directory/DirectoryEntryServlet.java

@@ -72,7 +72,7 @@ public class DirectoryEntryServlet extends HttpServlet {
         userProfile.setPhoneNumberExtension(obj.get("phoneNumberExtension").toString());
         userProfile.setFaxNumber(obj.get("faxNumber").toString());
         userProfile.setMobileNumber(obj.get("mobileNumber").toString());
-        userProfile.setJamiId(obj.get("jamiId").toString());
+        userProfile.setId(obj.get("jamiId").toString());
         userProfile.setGroupMemberships(new ArrayList<>());
 
         userAuthenticationModule.getAuthSources().get(new AuthModuleKey(realm, AuthenticationSourceType.LOCAL))

jams-server/src/main/java/net/jami/jams/server/servlets/api/auth/directory/SearchDirectoryServlet.java

@@ -79,7 +79,7 @@ public class SearchDirectoryServlet extends HttpServlet {
                         user.setAccessLevel(AccessLevel.USER);
                         userAuthenticationModule.createUser(user.getUserType(), user.getRealm(), nameServer, user);
                     } else {
-                        profile.setJamiId(results.get(0).getJamiId());
+                        profile.setId(results.get(0).getJamiId());
                     }
                 }
                 userProfiles.add(profile);