|
|
|
@ -147,8 +147,12 @@ public class LiferayWSUserManager implements UserManager{
|
|
|
|
|
private GCubeUser mapLRUser(String json){
|
|
|
|
|
try{
|
|
|
|
|
if (json != null) {
|
|
|
|
|
logger.info("user json to be parsed: " + json);
|
|
|
|
|
JSONParser parser = new JSONParser();
|
|
|
|
|
JSONObject userJSON = (JSONObject)parser.parse(json);
|
|
|
|
|
if(userJSON!=null){
|
|
|
|
|
logger.info("parsed user json: " + userJSON.toString());
|
|
|
|
|
}
|
|
|
|
|
// TODO skip for now
|
|
|
|
|
List<Email> emails = new ArrayList<Email>();
|
|
|
|
|
// for (EmailAddress e : u.getEmailAddresses()) {
|
|
|
|
@ -161,15 +165,17 @@ public class LiferayWSUserManager implements UserManager{
|
|
|
|
|
} catch (Exception e1) {
|
|
|
|
|
logger.warn("Failed to retrieve property " + USER_LOCATION_INDUSTRY_KEY, e1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(userJSON!=null){
|
|
|
|
|
logger.info("parsed user json: " + userJSON.toString());
|
|
|
|
|
}
|
|
|
|
|
// retrieve the contact id information (it is into the user json)
|
|
|
|
|
long contactId = (long)userJSON.get("contactId");
|
|
|
|
|
|
|
|
|
|
// retrieve contact json obj from contactId
|
|
|
|
|
String jsonContact = getContactJson(contactId);
|
|
|
|
|
JSONObject contactJSON = (JSONObject)parser.parse(jsonContact);
|
|
|
|
|
|
|
|
|
|
return new GCubeUser(
|
|
|
|
|
String jsonContact;
|
|
|
|
|
JSONObject contactJSON;
|
|
|
|
|
try{
|
|
|
|
|
long contactId = (long)userJSON.get("contactId");
|
|
|
|
|
jsonContact = getContactJson(contactId);
|
|
|
|
|
contactJSON = (JSONObject)parser.parse(jsonContact);
|
|
|
|
|
return new GCubeUser(
|
|
|
|
|
(long)userJSON.get("userId"),
|
|
|
|
|
(String)userJSON.get("screenName"),
|
|
|
|
|
(String)userJSON.get("emailAddress"),
|
|
|
|
@ -183,6 +189,23 @@ public class LiferayWSUserManager implements UserManager{
|
|
|
|
|
(String)userJSON.get("jobTitle"),
|
|
|
|
|
locationIndustry,
|
|
|
|
|
emails);
|
|
|
|
|
}catch (Exception e) {
|
|
|
|
|
logger.warn("Failed to retrieve property " + "contactId", e);
|
|
|
|
|
return new GCubeUser(
|
|
|
|
|
(long)userJSON.get("userId"),
|
|
|
|
|
(String)userJSON.get("screenName"),
|
|
|
|
|
(String)userJSON.get("emailAddress"),
|
|
|
|
|
(String)userJSON.get("firstName"),
|
|
|
|
|
(String)userJSON.get("middleName"),
|
|
|
|
|
(String)userJSON.get("lastName"),
|
|
|
|
|
buildFullName(userJSON),
|
|
|
|
|
(long)userJSON.get("createDate"),
|
|
|
|
|
getUserAvatarAbsoluteURL((String)userJSON.get("uuid"), (long)userJSON.get("portraitId")), // skip for now TODO getUserAvatarAbsoluteURL(u)
|
|
|
|
|
false,
|
|
|
|
|
(String)userJSON.get("jobTitle"),
|
|
|
|
|
locationIndustry,
|
|
|
|
|
emails);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}catch(Exception e){
|
|
|
|
|
logger.error("Exception while mapping the json user object to the GCubeUser java object", e);
|
|
|
|
@ -287,10 +310,14 @@ public class LiferayWSUserManager implements UserManager{
|
|
|
|
|
@Override
|
|
|
|
|
public GCubeUser getUserByUsername(String username)
|
|
|
|
|
throws UserManagementSystemException, UserRetrievalFault {
|
|
|
|
|
|
|
|
|
|
logger.info("username: " + username);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
String jsonUser =
|
|
|
|
|
HttpUtils.executeHTTPGETRequest(API_BASE_URL + GET_USER_BY_USERNAME.replace("$COMPANY_ID", String.valueOf(companyId)).replace("$USER_ID", username),
|
|
|
|
|
credsProvider, localContext, target);
|
|
|
|
|
logger.info("jsonUser: " + jsonUser);
|
|
|
|
|
|
|
|
|
|
if(jsonUser != null){
|
|
|
|
|
logger.debug("Json user retrieved");
|
|
|
|
|