diff --git a/distro/changelog.xml b/distro/changelog.xml index 13fa9df..8145ce1 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -2,10 +2,12 @@ Fix for Bug #1857 typo when displaying loading popup + Anonymized usernames - Updated to use shared common library for notification messages + Updated to use shared common library for notification messages + diff --git a/src/main/java/org/gcube/portlets/admin/manageusers/server/ManageUsersServiceImpl.java b/src/main/java/org/gcube/portlets/admin/manageusers/server/ManageUsersServiceImpl.java index 2a139b2..af66233 100644 --- a/src/main/java/org/gcube/portlets/admin/manageusers/server/ManageUsersServiceImpl.java +++ b/src/main/java/org/gcube/portlets/admin/manageusers/server/ManageUsersServiceImpl.java @@ -9,6 +9,8 @@ import org.gcube.applicationsupportlayer.social.ApplicationNotificationsManager; import org.gcube.applicationsupportlayer.social.NotificationsManager; import org.gcube.common.homelibrary.home.HomeLibrary; import org.gcube.common.homelibrary.home.workspace.Workspace; +import org.gcube.common.scope.impl.ScopeBean; +import org.gcube.common.scope.impl.ScopeBean.Type; import org.gcube.portal.custom.communitymanager.OrganizationsUtil; import org.gcube.portal.custom.scopemanager.scopehelper.ScopeHelper; import org.gcube.portal.notifications.bean.GenericItemBean; @@ -118,9 +120,15 @@ public class ManageUsersServiceImpl extends RemoteServiceServlet implements Man String labs = (user.getExpandoBridge().getAttribute(LABS) != null) ? user.getExpandoBridge().getAttribute(LABS).toString() : ""; if ((u.getLastname() != null && u.getLastname().compareTo("") != 0)) { String firstLetter = u.getLastname().substring(0,1); - String email = ""; - email = "********"; - PortalUserDTO myUser = new PortalUserDTO(id, firstLetter, u.getFirstname(), u.getLastname(), email, position, labs); + String scope = getASLSession().getScope(); + ScopeBean validator = new ScopeBean(scope); + String email = u.getEmail(); + String username = id; + if (validator.is(Type.VRE)) { + email = "********@"+ email.split("@")[1]; + username = "********"; + } + PortalUserDTO myUser = new PortalUserDTO(username, firstLetter, u.getFirstname(), u.getLastname(), email, position, labs); unregisteredUsers.add(myUser); } }