gCubeSystem
/
register-vre-users
15
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bug fix for Bug #6237, Users added to VRE when loggedin could not enter the VRE unless they logout first 

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/admin/register-vre-users@141694 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Massimiliano Assante 2017-01-22 11:11:03 +00:00
parent fd22725f3d
commit 2b5bd8e3bc
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
distro/changelog.xml
View File

@ -1,4 +1,8 @@
<ReleaseNotes> <ReleaseNotes>
<Changeset component="org.gcube.portlets-admin.register-vre-users.2-2-1"
date="2017-01-22">
<Change>Bug fix for Bug #6237, Users added to VRE when loggedin could not enter the VRE unless they logout first</Change>
</Changeset>
<Changeset component="org.gcube.portlets-admin.register-vre-users.2-2-0" <Changeset component="org.gcube.portlets-admin.register-vre-users.2-2-0"
date="2016-12-02"> date="2016-12-02">
<Change>Removed ASL Session</Change> <Change>Removed ASL Session</Change>

2
pom.xml
View File

@ -12,7 +12,7 @@
<groupId>org.gcube.portlets.admin</groupId> <groupId>org.gcube.portlets.admin</groupId>
<artifactId>register-vre-users</artifactId> <artifactId>register-vre-users</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<version>2.2.0-SNAPSHOT</version> <version>2.2.1-SNAPSHOT</version>
<name>Register VRE Users</name> <name>Register VRE Users</name>
<description> <description>
Register VRE Users Portlet allow to select a user from the portal and add her to the VRE. Register VRE Users Portlet allow to select a user from the portal and add her to the VRE.

16
src/main/java/org/gcube/portlets/admin/manageusers/server/ManageUsersServiceImpl.java
View File

@ -1,6 +1,7 @@
package org.gcube.portlets.admin.manageusers.server; package org.gcube.portlets.admin.manageusers.server;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@ -139,7 +140,7 @@ public class ManageUsersServiceImpl extends RemoteServiceServlet implements Mana
long currSiteGroupId = getSiteFromServletRequest(getThreadLocalRequest()).getGroupId(); long currSiteGroupId = getSiteFromServletRequest(getThreadLocalRequest()).getGroupId();
UserManager userM = new LiferayUserManager(); UserManager userM = new LiferayUserManager();
List<GCubeUser> nonBelongingUsers = userM.listUsersByGroup(currSiteGroupId, false); //the users of i-marine or services etc List<GCubeUser> nonBelongingUsers = userM.listUsersByGroup(currSiteGroupId, false); //the users of i-marine or services etc
nonBelongingUsers.removeAll(userM.listUsersByGroup(pContext.getCurrentGroupId(getThreadLocalRequest()))); nonBelongingUsers.removeAll(userM.listUsersByGroup(pContext.getCurrentGroupId(getThreadLocalRequest()), false));
for (GCubeUser u : nonBelongingUsers) { for (GCubeUser u : nonBelongingUsers) {
String id = u.getUsername(); String id = u.getUsername();
@ -179,6 +180,7 @@ public class ManageUsersServiceImpl extends RemoteServiceServlet implements Mana
} }
/** /**
* register the user to the VRE and in the HL Group, plus send notifications to the users * register the user to the VRE and in the HL Group, plus send notifications to the users
* it is needed to issue a fake membership request otherwise if the user is loggedIn it is not able to access the VRE unless she logout and login
*/ */
@Override @Override
public boolean registerUsers(List<PortalUserDTO> users2Register) { public boolean registerUsers(List<PortalUserDTO> users2Register) {
@ -186,8 +188,18 @@ public class ManageUsersServiceImpl extends RemoteServiceServlet implements Mana
UserManager userM = new LiferayUserManager(); UserManager userM = new LiferayUserManager();
for (PortalUserDTO user : users2Register) { for (PortalUserDTO user : users2Register) {
try { try {
GCubeUser currUser = userM.getUserByUsername(user.getId());
_log.debug("registerUser " + currUser.getUsername() + " to groupId: "+ vreGroupId);
userM.requestMembership(currUser.getUserId(), vreGroupId, "Automatic Request at " + new Date());
_log.debug("fakeRequest sent");
String replierUsername = LiferayUserManager.getAdmin().getScreenName();
_log.trace("Sleep 1 second ...");
Thread.sleep(1000);
userM.acceptMembershipRequest(currUser.getUserId(), vreGroupId, true, replierUsername, "Automatic acceptance request at " + new Date());
_log.info("fakeRequest accepted");
//add the user to the VRE //add the user to the VRE
userM.assignUserToGroup(vreGroupId, userM.getUserId(user.getId())); userM.assignUserToGroup(vreGroupId, currUser.getUserId());
//send notification //send notification
sendNotificationToUser(vreGroupId, user); sendNotificationToUser(vreGroupId, user);
} }