Skip to content

Use the project when removing members for a project group #3104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-jeckels merged 2 commits into from
Jul 14, 2026
+9 −9
Merged

Use the project when removing members for a project group #3104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
027ca7c
Use the project when removing members for a project group
labkey-jeckels Jul 14, 2026
2ab0e73
Use root for site groups
labkey-jeckels Jul 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/org/labkey/test/tests/UserPermissionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ public void testAuditLogForGroupUpdates()

log("Remove user from group and verify logs");
goToProjectHome();
permissionsHelper.removeUserFromGroup(GAMMA_SUBMITTER_GROUP_NAME, GAMMA_SUBMITTER_USER);
permissionsHelper.removeUserFromGroup(GAMMA_SUBMITTER_GROUP_NAME, GAMMA_SUBMITTER_USER, getProjectName());
verifyAuditLog("User: " + GAMMA_SUBMITTER_USER + " was deleted from Group: " + GAMMA_SUBMITTER_GROUP_NAME);
}

Expand Down
10 changes: 5 additions & 5 deletions src/org/labkey/test/util/ApiPermissionsHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,12 +658,12 @@ private List<String> getGroupNames(String project)
}

@Override
public void removeUserFromGroup(String groupName, String userName)
public void removeUserFromGroup(String groupName, String userName, String projectPath)
{
Integer groupId = getGroupId(groupName);
if (groupId == null)
throw new IllegalArgumentException("Attempting to remove members from non-existent site group: " + groupName);
removeMembersFromGroup(groupId, userName);
removeMembersFromGroup(groupId, projectPath, userName);
}

@Override
Expand All @@ -672,10 +672,10 @@ public void removeUserFromSiteGroup(String groupName, String userName)
Integer groupId = getSiteGroupId(groupName);
if (groupId == null)
throw new IllegalArgumentException("Attempting to remove members from non-existent group: " + groupName);
removeMembersFromGroup(groupId, userName);
removeMembersFromGroup(groupId, "/", userName);
}

private void removeMembersFromGroup(Integer groupId, String... members)
private void removeMembersFromGroup(Integer groupId, String projectPath, String... members)
{
BulkUpdateGroupCommand command = new BulkUpdateGroupCommand(groupId);
command.setCreateGroup(false);
Expand All @@ -685,7 +685,7 @@ private void removeMembersFromGroup(Integer groupId, String... members)
try
{
Connection connection = getConnection();
command.execute(connection, "/");
command.execute(connection, projectPath);
}
catch (IOException | CommandException e)
{
Expand Down
2 changes: 1 addition & 1 deletion src/org/labkey/test/util/PermissionsHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ public void deleteGroup(String groupName)
@LogMethod(quiet = true)
public abstract void deleteGroup(@LoggedParam String groupName, boolean failIfNotFound);

public abstract void removeUserFromGroup(String groupName, String userName);
public abstract void removeUserFromGroup(String groupName, String userName, String projectName);
public abstract void removeUserFromSiteGroup(String groupName, String userName);

public abstract boolean doesGroupExist(String groupName, String projectName);
Expand Down
4 changes: 2 additions & 2 deletions src/org/labkey/test/util/UIPermissionsHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,11 +316,11 @@ public void deleteGroup(@LoggedParam String groupName, boolean failIfNotFound)
@Override
public void removeUserFromSiteGroup(String groupName, String userEmail)
{
removeUserFromGroup(groupName, userEmail);
removeUserFromGroup(groupName, userEmail, "/");
}

@Override
public void removeUserFromGroup(String groupName, String userEmail)
public void removeUserFromGroup(String groupName, String userEmail, String projectPath)
{
if (!_driver.isTextPresent("Group " + groupName))
selectGroup(groupName);
Expand Down