diff --git a/src/main/java/org/nrg/xapi/rest/users/UsersApi.java b/src/main/java/org/nrg/xapi/rest/users/UsersApi.java index abcc0abddfda64b782196478e97e0723d1a12081..371cea8dc02ed466c83e2189f1c26cd037f6e207 100644 --- a/src/main/java/org/nrg/xapi/rest/users/UsersApi.java +++ b/src/main/java/org/nrg/xapi/rest/users/UsersApi.java @@ -632,7 +632,7 @@ public class UsersApi extends AbstractXapiRestController { return new ResponseEntity<>(HttpStatus.NOT_FOUND); } try { - Groups.removeUserFromGroup(user, group, null); + Groups.removeUserFromGroup(user, getSessionUser(), group, null); return new ResponseEntity<>(HttpStatus.OK); } catch (Exception e) { _log.error("Error occurred removing user " + user.getLogin() + " from group " + group + "."); diff --git a/src/main/java/org/nrg/xnat/turbine/modules/actions/ProcessAccessRequest.java b/src/main/java/org/nrg/xnat/turbine/modules/actions/ProcessAccessRequest.java index b4847ca0c4f76128d17c77eafc96bbb879c0d5de..9791f5189febf7bbe565e3aed85817650b834fa0 100644 --- a/src/main/java/org/nrg/xnat/turbine/modules/actions/ProcessAccessRequest.java +++ b/src/main/java/org/nrg/xnat/turbine/modules/actions/ProcessAccessRequest.java @@ -72,7 +72,7 @@ public class ProcessAccessRequest extends SecureAction { for (Map.Entry<String, UserGroupI> entry:Groups.getGroupsForUser(other).entrySet()){ if (entry.getValue().getTag().equals(project.getId())){ - Groups.removeUserFromGroup(other, entry.getValue().getId(), c); + Groups.removeUserFromGroup(other, user, entry.getValue().getId(), c); } } @@ -153,7 +153,7 @@ public class ProcessAccessRequest extends SecureAction { try { for (Map.Entry<String, UserGroupI> entry:Groups.getGroupsForUser(user).entrySet()){ if (entry.getValue()!=null && entry.getValue().getTag()!=null && entry.getValue().getTag().equals(project.getId())){ - Groups.removeUserFromGroup(other, entry.getValue().getId(), c); + Groups.removeUserFromGroup(other, user, entry.getValue().getId(), c); } } diff --git a/src/main/java/org/nrg/xnat/turbine/utils/ProjectAccessRequest.java b/src/main/java/org/nrg/xnat/turbine/utils/ProjectAccessRequest.java index 6c967ab5c25e1c2b38fea7e890207cc87a695654..f296e3cd0e8aa2067e1f5ba10db098c044b1b141 100644 --- a/src/main/java/org/nrg/xnat/turbine/utils/ProjectAccessRequest.java +++ b/src/main/java/org/nrg/xnat/turbine/utils/ProjectAccessRequest.java @@ -525,7 +525,7 @@ public class ProjectAccessRequest { for (Map.Entry<String, UserGroupI> entry : Groups.getGroupsForUser(user).entrySet()) { if (StringUtils.equals(entry.getValue().getTag(),_projectId)) { if(!UserHelper.getUserHelperService(user).isOwner(_projectId)){ - Groups.removeUserFromGroup(user, entry.getValue().getId(), eventInfo); + Groups.removeUserFromGroup(user, user, entry.getValue().getId(), eventInfo); } } }