Skip to content

Commit e50f8d6

Browse files
seratchseratch
authored
Merge pull request #487 from seratch/admin-conversations-whitelist
Add admin.conversations.whitelist.* API
2 parents 6bd91d6 + 414f4bc commit e50f8d6

21 files changed

+493
-6
lines changed

‎json-logs/samples/api/admin.conversations.whitelist.add.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"ok": false,
3+
"error": "",
4+
"response_metadata": {
5+
"messages": [
6+
""
7+
]
8+
},
9+
"needed": "",
10+
"provided": ""
11+
}

‎json-logs/samples/api/admin.conversations.whitelist.listGroupsLinkedToChannel.json‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"ok": false,
3+
"error": "",
4+
"group_ids": [
5+
""
6+
],
7+
"response_metadata": {
8+
"messages": [
9+
""
10+
]
11+
},
12+
"needed": "",
13+
"provided": ""
14+
}

‎json-logs/samples/api/admin.conversations.whitelist.remove.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"ok": false,
3+
"error": "",
4+
"response_metadata": {
5+
"messages": [
6+
""
7+
]
8+
},
9+
"needed": "",
10+
"provided": ""
11+
}

‎slack-api-client/src/main/java/com/slack/api/methods/AsyncMethodsClient.java‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
import com.slack.api.RequestConfigurator;
44
import com.slack.api.methods.request.admin.apps.*;
55
import com.slack.api.methods.request.admin.conversations.AdminConversationsSetTeamsRequest;
6+
import com.slack.api.methods.request.admin.conversations.whitelist.AdminConversationsWhitelistAddRequest;
7+
import com.slack.api.methods.request.admin.conversations.whitelist.AdminConversationsWhitelistListGroupsLinkedToChannelRequest;
8+
import com.slack.api.methods.request.admin.conversations.whitelist.AdminConversationsWhitelistRemoveRequest;
69
import com.slack.api.methods.request.admin.emoji.*;
710
import com.slack.api.methods.request.admin.invite_requests.*;
811
import com.slack.api.methods.request.admin.teams.AdminTeamsAdminsListRequest;
@@ -69,6 +72,9 @@
6972
import com.slack.api.methods.request.views.ViewsUpdateRequest;
7073
import com.slack.api.methods.response.admin.apps.*;
7174
import com.slack.api.methods.response.admin.conversations.AdminConversationsSetTeamsResponse;
75+
import com.slack.api.methods.response.admin.conversations.whitelist.AdminConversationsWhitelistAddResponse;
76+
import com.slack.api.methods.response.admin.conversations.whitelist.AdminConversationsWhitelistListGroupsLinkedToChannelResponse;
77+
import com.slack.api.methods.response.admin.conversations.whitelist.AdminConversationsWhitelistRemoveResponse;
7278
import com.slack.api.methods.response.admin.emoji.*;
7379
import com.slack.api.methods.response.admin.invite_requests.*;
7480
import com.slack.api.methods.response.admin.teams.AdminTeamsAdminsListResponse;
@@ -181,6 +187,28 @@ public interface AsyncMethodsClient {
181187

182188
CompletableFuture<AdminConversationsSetTeamsResponse> adminConversationsSetTeams(RequestConfigurator<AdminConversationsSetTeamsRequest.AdminConversationsSetTeamsRequestBuilder> req);
183189

190+
// ------------------------------
191+
// admin.conversations.whitelist
192+
// ------------------------------
193+
194+
CompletableFuture<AdminConversationsWhitelistAddResponse> adminConversationsWhitelistAdd(
195+
AdminConversationsWhitelistAddRequest req);
196+
197+
CompletableFuture<AdminConversationsWhitelistAddResponse> adminConversationsWhitelistAdd(
198+
RequestConfigurator<AdminConversationsWhitelistAddRequest.AdminConversationsWhitelistAddRequestBuilder> req);
199+
200+
CompletableFuture<AdminConversationsWhitelistRemoveResponse> adminConversationsWhitelistRemove(
201+
AdminConversationsWhitelistRemoveRequest req);
202+
203+
CompletableFuture<AdminConversationsWhitelistRemoveResponse> adminConversationsWhitelistRemove(
204+
RequestConfigurator<AdminConversationsWhitelistRemoveRequest.AdminConversationsWhitelistRemoveRequestBuilder> req);
205+
206+
CompletableFuture<AdminConversationsWhitelistListGroupsLinkedToChannelResponse> adminConversationsWhitelistListGroupsLinkedToChannel(
207+
AdminConversationsWhitelistListGroupsLinkedToChannelRequest req);
208+
209+
CompletableFuture<AdminConversationsWhitelistListGroupsLinkedToChannelResponse> adminConversationsWhitelistListGroupsLinkedToChannel(
210+
RequestConfigurator<AdminConversationsWhitelistListGroupsLinkedToChannelRequest.AdminConversationsWhitelistListGroupsLinkedToChannelRequestBuilder> req);
211+
184212
// ------------------------------
185213
// admin.emoji
186214
// ------------------------------

‎slack-api-client/src/main/java/com/slack/api/methods/Methods.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,15 @@ private Methods() {
2626

2727
public static final String ADMIN_CONVERSATIONS_SET_TEAMS = "admin.conversations.setTeams";
2828

29+
// ------------------------------
30+
// admin.conversations.whitelist
31+
// ------------------------------
32+
33+
public static final String ADMIN_CONVERSATIONS_WHITELIST_ADD = "admin.conversations.whitelist.add";
34+
public static final String ADMIN_CONVERSATIONS_WHITELIST_LIST_GROUPS_LINKED_TO_CHANNEL
35+
= "admin.conversations.whitelist.listGroupsLinkedToChannel";
36+
public static final String ADMIN_CONVERSATIONS_WHITELIST_REMOVE = "admin.conversations.whitelist.remove";
37+
2938
// ------------------------------
3039
// admin.emoji
3140
// ------------------------------

‎slack-api-client/src/main/java/com/slack/api/methods/MethodsClient.java‎

Lines changed: 40 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
import com.slack.api.RequestConfigurator;
44
import com.slack.api.methods.request.admin.apps.*;
55
import com.slack.api.methods.request.admin.conversations.AdminConversationsSetTeamsRequest;
6+
import com.slack.api.methods.request.admin.conversations.whitelist.AdminConversationsWhitelistAddRequest;
7+
import com.slack.api.methods.request.admin.conversations.whitelist.AdminConversationsWhitelistListGroupsLinkedToChannelRequest;
8+
import com.slack.api.methods.request.admin.conversations.whitelist.AdminConversationsWhitelistRemoveRequest;
69
import com.slack.api.methods.request.admin.emoji.*;
710
import com.slack.api.methods.request.admin.invite_requests.*;
811
import com.slack.api.methods.request.admin.teams.AdminTeamsAdminsListRequest;
@@ -82,6 +85,9 @@
8285
import com.slack.api.methods.request.views.ViewsUpdateRequest;
8386
import com.slack.api.methods.response.admin.apps.*;
8487
import com.slack.api.methods.response.admin.conversations.AdminConversationsSetTeamsResponse;
88+
import com.slack.api.methods.response.admin.conversations.whitelist.AdminConversationsWhitelistAddResponse;
89+
import com.slack.api.methods.response.admin.conversations.whitelist.AdminConversationsWhitelistListGroupsLinkedToChannelResponse;
90+
import com.slack.api.methods.response.admin.conversations.whitelist.AdminConversationsWhitelistRemoveResponse;
8591
import com.slack.api.methods.response.admin.emoji.*;
8692
import com.slack.api.methods.response.admin.invite_requests.*;
8793
import com.slack.api.methods.response.admin.teams.AdminTeamsAdminsListResponse;
@@ -253,6 +259,31 @@ <T extends SlackApiResponse> T postFormWithAuthorizationHeaderAndParseResponse(
253259

254260
AdminConversationsSetTeamsResponse adminConversationsSetTeams(RequestConfigurator<AdminConversationsSetTeamsRequest.AdminConversationsSetTeamsRequestBuilder> req) throws IOException, SlackApiException;
255261

262+
// ------------------------------
263+
// admin.conversations.whitelist
264+
// ------------------------------
265+
266+
AdminConversationsWhitelistAddResponse adminConversationsWhitelistAdd(
267+
AdminConversationsWhitelistAddRequest req) throws IOException, SlackApiException;
268+
269+
AdminConversationsWhitelistAddResponse adminConversationsWhitelistAdd(
270+
RequestConfigurator<AdminConversationsWhitelistAddRequest.AdminConversationsWhitelistAddRequestBuilder> req)
271+
throws IOException, SlackApiException;
272+
273+
AdminConversationsWhitelistRemoveResponse adminConversationsWhitelistRemove(
274+
AdminConversationsWhitelistRemoveRequest req) throws IOException, SlackApiException;
275+
276+
AdminConversationsWhitelistRemoveResponse adminConversationsWhitelistRemove(
277+
RequestConfigurator<AdminConversationsWhitelistRemoveRequest.AdminConversationsWhitelistRemoveRequestBuilder> req)
278+
throws IOException, SlackApiException;
279+
280+
AdminConversationsWhitelistListGroupsLinkedToChannelResponse adminConversationsWhitelistListGroupsLinkedToChannel(
281+
AdminConversationsWhitelistListGroupsLinkedToChannelRequest req) throws IOException, SlackApiException;
282+
283+
AdminConversationsWhitelistListGroupsLinkedToChannelResponse adminConversationsWhitelistListGroupsLinkedToChannel(
284+
RequestConfigurator<AdminConversationsWhitelistListGroupsLinkedToChannelRequest.AdminConversationsWhitelistListGroupsLinkedToChannelRequestBuilder> req)
285+
throws IOException, SlackApiException;
286+
256287
// ------------------------------
257288
// admin.emoji
258289
// ------------------------------
@@ -363,15 +394,21 @@ <T extends SlackApiResponse> T postFormWithAuthorizationHeaderAndParseResponse(
363394

364395
AdminUsergroupsAddChannelsResponse adminUsergroupsAddChannels(AdminUsergroupsAddChannelsRequest req) throws IOException, SlackApiException;
365396

366-
AdminUsergroupsAddChannelsResponse adminUsergroupsAddChannels(RequestConfigurator<AdminUsergroupsAddChannelsRequest.AdminUsergroupsAddChannelsRequestBuilder> req) throws IOException, SlackApiException;
397+
AdminUsergroupsAddChannelsResponse adminUsergroupsAddChannels(
398+
RequestConfigurator<AdminUsergroupsAddChannelsRequest.AdminUsergroupsAddChannelsRequestBuilder> req)
399+
throws IOException, SlackApiException;
367400

368401
AdminUsergroupsListChannelsResponse adminUsergroupsListChannels(AdminUsergroupsListChannelsRequest req) throws IOException, SlackApiException;
369402

370-
AdminUsergroupsListChannelsResponse adminUsergroupsListChannels(RequestConfigurator<AdminUsergroupsListChannelsRequest.AdminUsergroupsListChannelsRequestBuilder> req) throws IOException, SlackApiException;
403+
AdminUsergroupsListChannelsResponse adminUsergroupsListChannels(
404+
RequestConfigurator<AdminUsergroupsListChannelsRequest.AdminUsergroupsListChannelsRequestBuilder> req)
405+
throws IOException, SlackApiException;
371406

372407
AdminUsergroupsRemoveChannelsResponse adminUsergroupsRemoveChannels(AdminUsergroupsRemoveChannelsRequest req) throws IOException, SlackApiException;
373408

374-
AdminUsergroupsRemoveChannelsResponse adminUsergroupsRemoveChannels(RequestConfigurator<AdminUsergroupsRemoveChannelsRequest.AdminUsergroupsRemoveChannelsRequestBuilder> req) throws IOException, SlackApiException;
409+
AdminUsergroupsRemoveChannelsResponse adminUsergroupsRemoveChannels(
410+
RequestConfigurator<AdminUsergroupsRemoveChannelsRequest.AdminUsergroupsRemoveChannelsRequestBuilder> req)
411+
throws IOException, SlackApiException;
375412

376413
// ------------------------------
377414
// admin.users

‎slack-api-client/src/main/java/com/slack/api/methods/MethodsRateLimits.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ public static void setRateLimitTier(String methodName, MethodsRateLimitTier tier
4040

4141
// Tier1
4242
final List<String> adminApiMethods_Tier1 = Arrays.asList(
43+
ADMIN_CONVERSATIONS_WHITELIST_REMOVE,
4344
ADMIN_TEAMS_CREATE,
4445
ADMIN_USERGROUPS_ADD_CHANNELS
4546
);
@@ -57,6 +58,9 @@ public static void setRateLimitTier(String methodName, MethodsRateLimitTier tier
5758

5859
ADMIN_CONVERSATIONS_SET_TEAMS,
5960

61+
ADMIN_CONVERSATIONS_WHITELIST_ADD,
62+
ADMIN_CONVERSATIONS_WHITELIST_LIST_GROUPS_LINKED_TO_CHANNEL,
63+
6064
ADMIN_EMOJI_ADD,
6165
ADMIN_EMOJI_ADD_ALIAS,
6266
ADMIN_EMOJI_LIST,

‎slack-api-client/src/main/java/com/slack/api/methods/RequestFormBuilder.java‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
import com.google.gson.Gson;
44
import com.slack.api.methods.request.admin.apps.*;
55
import com.slack.api.methods.request.admin.conversations.AdminConversationsSetTeamsRequest;
6+
import com.slack.api.methods.request.admin.conversations.whitelist.AdminConversationsWhitelistAddRequest;
7+
import com.slack.api.methods.request.admin.conversations.whitelist.AdminConversationsWhitelistListGroupsLinkedToChannelRequest;
8+
import com.slack.api.methods.request.admin.conversations.whitelist.AdminConversationsWhitelistRemoveRequest;
69
import com.slack.api.methods.request.admin.emoji.*;
710
import com.slack.api.methods.request.admin.invite_requests.*;
811
import com.slack.api.methods.request.admin.teams.AdminTeamsAdminsListRequest;
@@ -161,6 +164,29 @@ public static FormBody.Builder toForm(AdminConversationsSetTeamsRequest req) {
161164
return form;
162165
}
163166

167+
public static FormBody.Builder toForm(AdminConversationsWhitelistAddRequest req) {
168+
FormBody.Builder form = new FormBody.Builder();
169+
setIfNotNull("channel_id", req.getChannelId(), form);
170+
setIfNotNull("group_id", req.getGroupId(), form);
171+
setIfNotNull("team_id", req.getTeamId(), form);
172+
return form;
173+
}
174+
175+
public static FormBody.Builder toForm(AdminConversationsWhitelistRemoveRequest req) {
176+
FormBody.Builder form = new FormBody.Builder();
177+
setIfNotNull("channel_id", req.getChannelId(), form);
178+
setIfNotNull("group_id", req.getGroupId(), form);
179+
setIfNotNull("team_id", req.getTeamId(), form);
180+
return form;
181+
}
182+
183+
public static FormBody.Builder toForm(AdminConversationsWhitelistListGroupsLinkedToChannelRequest req) {
184+
FormBody.Builder form = new FormBody.Builder();
185+
setIfNotNull("channel_id", req.getChannelId(), form);
186+
setIfNotNull("team_id", req.getTeamId(), form);
187+
return form;
188+
}
189+
164190
public static FormBody.Builder toForm(AdminEmojiAddRequest req) {
165191
FormBody.Builder form = new FormBody.Builder();
166192
setIfNotNull("name", req.getName(), form);

‎slack-api-client/src/main/java/com/slack/api/methods/impl/AsyncMethodsClientImpl.java‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
import com.slack.api.methods.SlackApiRequest;
88
import com.slack.api.methods.request.admin.apps.*;
99
import com.slack.api.methods.request.admin.conversations.AdminConversationsSetTeamsRequest;
10+
import com.slack.api.methods.request.admin.conversations.whitelist.AdminConversationsWhitelistAddRequest;
11+
import com.slack.api.methods.request.admin.conversations.whitelist.AdminConversationsWhitelistListGroupsLinkedToChannelRequest;
12+
import com.slack.api.methods.request.admin.conversations.whitelist.AdminConversationsWhitelistRemoveRequest;
1013
import com.slack.api.methods.request.admin.emoji.*;
1114
import com.slack.api.methods.request.admin.invite_requests.*;
1215
import com.slack.api.methods.request.admin.teams.AdminTeamsAdminsListRequest;
@@ -73,6 +76,9 @@
7376
import com.slack.api.methods.request.views.ViewsUpdateRequest;
7477
import com.slack.api.methods.response.admin.apps.*;
7578
import com.slack.api.methods.response.admin.conversations.AdminConversationsSetTeamsResponse;
79+
import com.slack.api.methods.response.admin.conversations.whitelist.AdminConversationsWhitelistAddResponse;
80+
import com.slack.api.methods.response.admin.conversations.whitelist.AdminConversationsWhitelistListGroupsLinkedToChannelResponse;
81+
import com.slack.api.methods.response.admin.conversations.whitelist.AdminConversationsWhitelistRemoveResponse;
7682
import com.slack.api.methods.response.admin.emoji.*;
7783
import com.slack.api.methods.response.admin.invite_requests.*;
7884
import com.slack.api.methods.response.admin.teams.AdminTeamsAdminsListResponse;
@@ -242,6 +248,36 @@ public CompletableFuture<AdminConversationsSetTeamsResponse> adminConversationsS
242248
return adminConversationsSetTeams(req.configure(AdminConversationsSetTeamsRequest.builder()).build());
243249
}
244250

251+
@Override
252+
public CompletableFuture<AdminConversationsWhitelistAddResponse> adminConversationsWhitelistAdd(AdminConversationsWhitelistAddRequest req) {
253+
return executor.execute(ADMIN_CONVERSATIONS_WHITELIST_ADD, toMap(req), () -> methods.adminConversationsWhitelistAdd(req));
254+
}
255+
256+
@Override
257+
public CompletableFuture<AdminConversationsWhitelistAddResponse> adminConversationsWhitelistAdd(RequestConfigurator<AdminConversationsWhitelistAddRequest.AdminConversationsWhitelistAddRequestBuilder> req) {
258+
return adminConversationsWhitelistAdd(req.configure(AdminConversationsWhitelistAddRequest.builder()).build());
259+
}
260+
261+
@Override
262+
public CompletableFuture<AdminConversationsWhitelistRemoveResponse> adminConversationsWhitelistRemove(AdminConversationsWhitelistRemoveRequest req) {
263+
return executor.execute(ADMIN_CONVERSATIONS_WHITELIST_REMOVE, toMap(req), () -> methods.adminConversationsWhitelistRemove(req));
264+
}
265+
266+
@Override
267+
public CompletableFuture<AdminConversationsWhitelistRemoveResponse> adminConversationsWhitelistRemove(RequestConfigurator<AdminConversationsWhitelistRemoveRequest.AdminConversationsWhitelistRemoveRequestBuilder> req) {
268+
return adminConversationsWhitelistRemove(req.configure(AdminConversationsWhitelistRemoveRequest.builder()).build());
269+
}
270+
271+
@Override
272+
public CompletableFuture<AdminConversationsWhitelistListGroupsLinkedToChannelResponse> adminConversationsWhitelistListGroupsLinkedToChannel(AdminConversationsWhitelistListGroupsLinkedToChannelRequest req) {
273+
return executor.execute(ADMIN_CONVERSATIONS_WHITELIST_LIST_GROUPS_LINKED_TO_CHANNEL, toMap(req), () -> methods.adminConversationsWhitelistListGroupsLinkedToChannel(req));
274+
}
275+
276+
@Override
277+
public CompletableFuture<AdminConversationsWhitelistListGroupsLinkedToChannelResponse> adminConversationsWhitelistListGroupsLinkedToChannel(RequestConfigurator<AdminConversationsWhitelistListGroupsLinkedToChannelRequest.AdminConversationsWhitelistListGroupsLinkedToChannelRequestBuilder> req) {
278+
return adminConversationsWhitelistListGroupsLinkedToChannel(req.configure(AdminConversationsWhitelistListGroupsLinkedToChannelRequest.builder()).build());
279+
}
280+
245281
@Override
246282
public CompletableFuture<AdminEmojiAddResponse> adminEmojiAdd(AdminEmojiAddRequest req) {
247283
return executor.execute(ADMIN_EMOJI_ADD, toMap(req), () -> methods.adminEmojiAdd(req));

0 commit comments

Comments
 (0)