Skip to content

fix: Empty user list for updating usergroup users sets usergroup as having no members #1574

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
vegeris merged 3 commits into from
Mar 31, 2026
+56 −1
Merged

fix: Empty user list for updating usergroup users sets usergroup as having no members #1574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
952be9b
Send `[]` when an empty user list is provided for a `usergroups.users…
rozza-sb Mar 30, 2026
0a4265c
Update relevant Java test classes.
rozza-sb Mar 30, 2026
69a6dba
Merge branch 'main' into fix/empty_user_list_for_updating_usergroup_u…
rozza-sb Mar 31, 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
7 changes: 6 additions & 1 deletion slack-api-client/src/main/java/com/slack/api/methods/RequestFormBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3086,7 +3086,12 @@ public static FormBody.Builder toForm(UsergroupsUsersUpdateRequest req) {
FormBody.Builder form = new FormBody.Builder();
setIfNotNull("usergroup", req.getUsergroup(), form);
if (req.getUsers() != null) {
setIfNotNull("users", req.getUsers().stream().collect(joining(",")), form);
if (!req.getUsers().isEmpty()) {
setIfNotNull("users", req.getUsers().stream().collect(joining(",")), form);
}
else {
setIfNotNull("users", "[]", form);
}
}
setIfNotNull("include_count", req.isIncludeCount(), form);
setIfNotNull("team_id", req.getTeamId(), form);
Expand Down
11 changes: 11 additions & 0 deletions slack-api-client/src/test/java/test_locally/api/methods/UsergroupsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
import org.junit.Test;
import util.MockSlackApiServer;

import java.util.stream.Collectors;
import java.util.stream.Stream;

import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static util.MockSlackApi.ValidToken;
Expand Down Expand Up @@ -44,6 +47,10 @@ public void test() throws Exception {
.isOk(), is(true));
assertThat(slack.methods(ValidToken).usergroupsUsersUpdate(r -> r.usergroup("xxx"))
.isOk(), is(true));
assertThat(slack.methods(ValidToken).usergroupsUsersUpdate(r -> r.usergroup("xxx").users(Stream.<String>of().collect(Collectors.toList())))
.isOk(), is(true));
assertThat(slack.methods(ValidToken).usergroupsUsersUpdate(r -> r.usergroup("xxx").users(Stream.of("user").collect(Collectors.toList())))
.isOk(), is(true));
}

@Test
Expand All @@ -62,6 +69,10 @@ public void test_async() throws Exception {
.get().isOk(), is(true));
assertThat(slack.methodsAsync(ValidToken).usergroupsUsersUpdate(r -> r.usergroup("xxx"))
.get().isOk(), is(true));
assertThat(slack.methodsAsync(ValidToken).usergroupsUsersUpdate(r -> r.usergroup("xxx").users(Stream.<String>of().collect(Collectors.toList())))
.get().isOk(), is(true));
assertThat(slack.methodsAsync(ValidToken).usergroupsUsersUpdate(r -> r.usergroup("xxx").users(Stream.of("user").collect(Collectors.toList())))
.get().isOk(), is(true));
}

}
39 changes: 39 additions & 0 deletions slack-api-client/src/test/java/test_with_remote_apis/methods/usergroups_Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.slack.api.Slack;
import com.slack.api.methods.request.usergroups.users.UsergroupsUsersListRequest;
import com.slack.api.methods.request.usergroups.users.UsergroupsUsersUpdateRequest;
import com.slack.api.methods.response.usergroups.*;
import com.slack.api.methods.response.usergroups.users.UsergroupsUsersListResponse;
import com.slack.api.methods.response.usergroups.users.UsergroupsUsersUpdateResponse;
Expand All @@ -17,6 +18,8 @@

import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;

import static org.hamcrest.CoreMatchers.*;
import static org.hamcrest.MatcherAssert.assertThat;
Expand Down Expand Up @@ -147,4 +150,40 @@ public void users_failure() throws Exception {
assertThat(response.getError(), is("no_such_subteam"));
}

@Test
public void usergroups_users_update_null_property() throws Exception {
UsergroupsCreateResponse creation = slack.methods().usergroupsCreate(r -> r
.token(userToken)
.name("usergroup-" + System.currentTimeMillis())
.description("Something wrong"));
assertThat(creation.getError(), is(nullValue()));
final Usergroup usergroup = creation.getUsergroup();

UsergroupsUsersUpdateResponse response = slack.methods().usergroupsUsersUpdate(
UsergroupsUsersUpdateRequest.builder()
.token(userToken)
.usergroup(usergroup.getId())
.build());
assertThat(response.isOk(), is(false));
assertThat(response.getError(), is("missing_required_argument"));
}

@Test
public void usergroups_users_update_empty_list() throws Exception {
UsergroupsCreateResponse creation = slack.methods().usergroupsCreate(r -> r
.token(userToken)
.name("usergroup-" + System.currentTimeMillis())
.description("Should have 0 members"));
assertThat(creation.getError(), is(nullValue()));
final Usergroup usergroup = creation.getUsergroup();

UsergroupsUsersUpdateResponse response = slack.methods().usergroupsUsersUpdate(
UsergroupsUsersUpdateRequest.builder()
.token(userToken)
.usergroup(usergroup.getId())
.users(Stream.<String>of().collect(Collectors.toList()))
.build());
assertThat(response.getError(), is(nullValue()));
}

}
Loading