XNAT-4519 Fixed cases where wrong user permissions were being checked,...

XNAT-4519 Fixed cases where wrong user permissions were being checked, preventing the admin from removing project access.

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 + ".");

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);
 				    }
 				}
 				

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);
 						}
 					}
 				}