Skip to content

Commit 286d21e

Browse files
seratchseratch
authored
Merge pull request #507 from seratch/renaming-admin-conv-restrictAccess
Add admin.conversations.restrictAccess.* APIs
2 parents bbab40b + 6efb4a3 commit 286d21e

27 files changed

+463
-4
lines changed

‎json-logs/samples/api/admin.conversations.restrictAccess.addGroup.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.restrictAccess.listGroups.json‎

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

‎json-logs/samples/api/admin.conversations.restrictAccess.removeGroup.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: 34 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.restrict_access.AdminConversationsRestrictAccessAddGroupRequest;
7+
import com.slack.api.methods.request.admin.conversations.restrict_access.AdminConversationsRestrictAccessListGroupsRequest;
8+
import com.slack.api.methods.request.admin.conversations.restrict_access.AdminConversationsRestrictAccessRemoveGroupRequest;
69
import com.slack.api.methods.request.admin.conversations.whitelist.AdminConversationsWhitelistAddRequest;
710
import com.slack.api.methods.request.admin.conversations.whitelist.AdminConversationsWhitelistListGroupsLinkedToChannelRequest;
811
import com.slack.api.methods.request.admin.conversations.whitelist.AdminConversationsWhitelistRemoveRequest;
@@ -74,6 +77,9 @@
7477
import com.slack.api.methods.request.views.ViewsUpdateRequest;
7578
import com.slack.api.methods.response.admin.apps.*;
7679
import com.slack.api.methods.response.admin.conversations.AdminConversationsSetTeamsResponse;
80+
import com.slack.api.methods.response.admin.conversations.restrict_access.AdminConversationsRestrictAccessAddGroupResponse;
81+
import com.slack.api.methods.response.admin.conversations.restrict_access.AdminConversationsRestrictAccessListGroupsResponse;
82+
import com.slack.api.methods.response.admin.conversations.restrict_access.AdminConversationsRestrictAccessRemoveGroupResponse;
7783
import com.slack.api.methods.response.admin.conversations.whitelist.AdminConversationsWhitelistAddResponse;
7884
import com.slack.api.methods.response.admin.conversations.whitelist.AdminConversationsWhitelistListGroupsLinkedToChannelResponse;
7985
import com.slack.api.methods.response.admin.conversations.whitelist.AdminConversationsWhitelistRemoveResponse;
@@ -182,6 +188,28 @@ public interface AsyncMethodsClient {
182188

183189
CompletableFuture<AdminAppsRequestsListResponse> adminAppsRequestsList(RequestConfigurator<AdminAppsRequestsListRequest.AdminAppsRequestsListRequestBuilder> req);
184190

191+
// ------------------------------
192+
// admin.conversations.restrictAccess
193+
// ------------------------------
194+
195+
CompletableFuture<AdminConversationsRestrictAccessAddGroupResponse> adminConversationsRestrictAccessAddGroup(
196+
AdminConversationsRestrictAccessAddGroupRequest req);
197+
198+
CompletableFuture<AdminConversationsRestrictAccessAddGroupResponse> adminConversationsRestrictAccessAddGroup(
199+
RequestConfigurator<AdminConversationsRestrictAccessAddGroupRequest.AdminConversationsRestrictAccessAddGroupRequestBuilder> req);
200+
201+
CompletableFuture<AdminConversationsRestrictAccessRemoveGroupResponse> adminConversationsRestrictAccessRemoveGroup(
202+
AdminConversationsRestrictAccessRemoveGroupRequest req);
203+
204+
CompletableFuture<AdminConversationsRestrictAccessRemoveGroupResponse> adminConversationsRestrictAccessRemoveGroup(
205+
RequestConfigurator<AdminConversationsRestrictAccessRemoveGroupRequest.AdminConversationsRestrictAccessRemoveGroupRequestBuilder> req);
206+
207+
CompletableFuture<AdminConversationsRestrictAccessListGroupsResponse> adminConversationsRestrictAccessListGroups(
208+
AdminConversationsRestrictAccessListGroupsRequest req);
209+
210+
CompletableFuture<AdminConversationsRestrictAccessListGroupsResponse> adminConversationsRestrictAccessListGroups(
211+
RequestConfigurator<AdminConversationsRestrictAccessListGroupsRequest.AdminConversationsRestrictAccessListGroupsRequestBuilder> req);
212+
185213
// ------------------------------
186214
// admin.conversations
187215
// ------------------------------
@@ -194,21 +222,27 @@ public interface AsyncMethodsClient {
194222
// admin.conversations.whitelist
195223
// ------------------------------
196224

225+
@Deprecated
197226
CompletableFuture<AdminConversationsWhitelistAddResponse> adminConversationsWhitelistAdd(
198227
AdminConversationsWhitelistAddRequest req);
199228

229+
@Deprecated
200230
CompletableFuture<AdminConversationsWhitelistAddResponse> adminConversationsWhitelistAdd(
201231
RequestConfigurator<AdminConversationsWhitelistAddRequest.AdminConversationsWhitelistAddRequestBuilder> req);
202232

233+
@Deprecated
203234
CompletableFuture<AdminConversationsWhitelistRemoveResponse> adminConversationsWhitelistRemove(
204235
AdminConversationsWhitelistRemoveRequest req);
205236

237+
@Deprecated
206238
CompletableFuture<AdminConversationsWhitelistRemoveResponse> adminConversationsWhitelistRemove(
207239
RequestConfigurator<AdminConversationsWhitelistRemoveRequest.AdminConversationsWhitelistRemoveRequestBuilder> req);
208240

241+
@Deprecated
209242
CompletableFuture<AdminConversationsWhitelistListGroupsLinkedToChannelResponse> adminConversationsWhitelistListGroupsLinkedToChannel(
210243
AdminConversationsWhitelistListGroupsLinkedToChannelRequest req);
211244

245+
@Deprecated
212246
CompletableFuture<AdminConversationsWhitelistListGroupsLinkedToChannelResponse> adminConversationsWhitelistListGroupsLinkedToChannel(
213247
RequestConfigurator<AdminConversationsWhitelistListGroupsLinkedToChannelRequest.AdminConversationsWhitelistListGroupsLinkedToChannelRequestBuilder> req);
214248

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

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,23 @@ private Methods() {
2626

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

29+
// ------------------------------
30+
// admin.conversations.restrictAccess
31+
// ------------------------------
32+
33+
public static final String ADMIN_CONVERSATIONS_RESTRICT_ACCESS_ADD_GROUP = "admin.conversations.restrictAccess.addGroup";
34+
public static final String ADMIN_CONVERSATIONS_RESTRICT_ACCESS_LIST_GROUPS = "admin.conversations.restrictAccess.listGroups";
35+
public static final String ADMIN_CONVERSATIONS_RESTRICT_ACCESS_REMOVE_GROUP = "admin.conversations.restrictAccess.removeGroup";
36+
2937
// ------------------------------
3038
// admin.conversations.whitelist
3139
// ------------------------------
3240

41+
@Deprecated // use admin.conversations.restrictAccess.addGroups instead
3342
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";
43+
@Deprecated // use admin.conversations.restrictAccess.listGroups instead
44+
public static final String ADMIN_CONVERSATIONS_WHITELIST_LIST_GROUPS_LINKED_TO_CHANNEL = "admin.conversations.whitelist.listGroupsLinkedToChannel";
45+
@Deprecated // use admin.conversations.restrictAccess.removeGroup instead
3646
public static final String ADMIN_CONVERSATIONS_WHITELIST_REMOVE = "admin.conversations.whitelist.remove";
3747

3848
// ------------------------------

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

Lines changed: 37 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.restrict_access.AdminConversationsRestrictAccessAddGroupRequest;
7+
import com.slack.api.methods.request.admin.conversations.restrict_access.AdminConversationsRestrictAccessListGroupsRequest;
8+
import com.slack.api.methods.request.admin.conversations.restrict_access.AdminConversationsRestrictAccessRemoveGroupRequest;
69
import com.slack.api.methods.request.admin.conversations.whitelist.AdminConversationsWhitelistAddRequest;
710
import com.slack.api.methods.request.admin.conversations.whitelist.AdminConversationsWhitelistListGroupsLinkedToChannelRequest;
811
import com.slack.api.methods.request.admin.conversations.whitelist.AdminConversationsWhitelistRemoveRequest;
@@ -87,6 +90,9 @@
8790
import com.slack.api.methods.request.views.ViewsUpdateRequest;
8891
import com.slack.api.methods.response.admin.apps.*;
8992
import com.slack.api.methods.response.admin.conversations.AdminConversationsSetTeamsResponse;
93+
import com.slack.api.methods.response.admin.conversations.restrict_access.AdminConversationsRestrictAccessAddGroupResponse;
94+
import com.slack.api.methods.response.admin.conversations.restrict_access.AdminConversationsRestrictAccessListGroupsResponse;
95+
import com.slack.api.methods.response.admin.conversations.restrict_access.AdminConversationsRestrictAccessRemoveGroupResponse;
9096
import com.slack.api.methods.response.admin.conversations.whitelist.AdminConversationsWhitelistAddResponse;
9197
import com.slack.api.methods.response.admin.conversations.whitelist.AdminConversationsWhitelistListGroupsLinkedToChannelResponse;
9298
import com.slack.api.methods.response.admin.conversations.whitelist.AdminConversationsWhitelistRemoveResponse;
@@ -264,27 +270,58 @@ <T extends SlackApiResponse> T postFormWithAuthorizationHeaderAndParseResponse(
264270

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

273+
// ------------------------------
274+
// admin.conversations.restrictAccess
275+
// ------------------------------
276+
277+
AdminConversationsRestrictAccessAddGroupResponse adminConversationsRestrictAccessAddGroup(
278+
AdminConversationsRestrictAccessAddGroupRequest req) throws IOException, SlackApiException;
279+
280+
AdminConversationsRestrictAccessAddGroupResponse adminConversationsRestrictAccessAddGroup(
281+
RequestConfigurator<AdminConversationsRestrictAccessAddGroupRequest.AdminConversationsRestrictAccessAddGroupRequestBuilder> req)
282+
throws IOException, SlackApiException;
283+
284+
AdminConversationsRestrictAccessRemoveGroupResponse adminConversationsRestrictAccessRemoveGroup(
285+
AdminConversationsRestrictAccessRemoveGroupRequest req) throws IOException, SlackApiException;
286+
287+
AdminConversationsRestrictAccessRemoveGroupResponse adminConversationsRestrictAccessRemoveGroup(
288+
RequestConfigurator<AdminConversationsRestrictAccessRemoveGroupRequest.AdminConversationsRestrictAccessRemoveGroupRequestBuilder> req)
289+
throws IOException, SlackApiException;
290+
291+
AdminConversationsRestrictAccessListGroupsResponse adminConversationsRestrictAccessListGroups(
292+
AdminConversationsRestrictAccessListGroupsRequest req) throws IOException, SlackApiException;
293+
294+
AdminConversationsRestrictAccessListGroupsResponse adminConversationsRestrictAccessListGroups(
295+
RequestConfigurator<AdminConversationsRestrictAccessListGroupsRequest.AdminConversationsRestrictAccessListGroupsRequestBuilder> req)
296+
throws IOException, SlackApiException;
297+
267298
// ------------------------------
268299
// admin.conversations.whitelist
269300
// ------------------------------
270301

302+
@Deprecated
271303
AdminConversationsWhitelistAddResponse adminConversationsWhitelistAdd(
272304
AdminConversationsWhitelistAddRequest req) throws IOException, SlackApiException;
273305

306+
@Deprecated
274307
AdminConversationsWhitelistAddResponse adminConversationsWhitelistAdd(
275308
RequestConfigurator<AdminConversationsWhitelistAddRequest.AdminConversationsWhitelistAddRequestBuilder> req)
276309
throws IOException, SlackApiException;
277310

311+
@Deprecated
278312
AdminConversationsWhitelistRemoveResponse adminConversationsWhitelistRemove(
279313
AdminConversationsWhitelistRemoveRequest req) throws IOException, SlackApiException;
280314

315+
@Deprecated
281316
AdminConversationsWhitelistRemoveResponse adminConversationsWhitelistRemove(
282317
RequestConfigurator<AdminConversationsWhitelistRemoveRequest.AdminConversationsWhitelistRemoveRequestBuilder> req)
283318
throws IOException, SlackApiException;
284319

320+
@Deprecated
285321
AdminConversationsWhitelistListGroupsLinkedToChannelResponse adminConversationsWhitelistListGroupsLinkedToChannel(
286322
AdminConversationsWhitelistListGroupsLinkedToChannelRequest req) throws IOException, SlackApiException;
287323

324+
@Deprecated
288325
AdminConversationsWhitelistListGroupsLinkedToChannelResponse adminConversationsWhitelistListGroupsLinkedToChannel(
289326
RequestConfigurator<AdminConversationsWhitelistListGroupsLinkedToChannelRequest.AdminConversationsWhitelistListGroupsLinkedToChannelRequestBuilder> req)
290327
throws IOException, SlackApiException;

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

Lines changed: 3 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_RESTRICT_ACCESS_REMOVE_GROUP,
4344
ADMIN_CONVERSATIONS_WHITELIST_REMOVE,
4445
ADMIN_TEAMS_CREATE,
4546
ADMIN_USERGROUPS_ADD_CHANNELS
@@ -58,6 +59,8 @@ public static void setRateLimitTier(String methodName, MethodsRateLimitTier tier
5859

5960
ADMIN_CONVERSATIONS_SET_TEAMS,
6061

62+
ADMIN_CONVERSATIONS_RESTRICT_ACCESS_ADD_GROUP,
63+
ADMIN_CONVERSATIONS_RESTRICT_ACCESS_LIST_GROUPS,
6164
ADMIN_CONVERSATIONS_WHITELIST_ADD,
6265
ADMIN_CONVERSATIONS_WHITELIST_LIST_GROUPS_LINKED_TO_CHANNEL,
6366

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

Lines changed: 25 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.restrict_access.AdminConversationsRestrictAccessAddGroupRequest;
7+
import com.slack.api.methods.request.admin.conversations.restrict_access.AdminConversationsRestrictAccessListGroupsRequest;
8+
import com.slack.api.methods.request.admin.conversations.restrict_access.AdminConversationsRestrictAccessRemoveGroupRequest;
69
import com.slack.api.methods.request.admin.conversations.whitelist.AdminConversationsWhitelistAddRequest;
710
import com.slack.api.methods.request.admin.conversations.whitelist.AdminConversationsWhitelistListGroupsLinkedToChannelRequest;
811
import com.slack.api.methods.request.admin.conversations.whitelist.AdminConversationsWhitelistRemoveRequest;
@@ -166,6 +169,28 @@ public static FormBody.Builder toForm(AdminConversationsSetTeamsRequest req) {
166169
return form;
167170
}
168171

172+
public static FormBody.Builder toForm(AdminConversationsRestrictAccessAddGroupRequest req) {
173+
FormBody.Builder form = new FormBody.Builder();
174+
setIfNotNull("channel_id", req.getChannelId(), form);
175+
setIfNotNull("group_id", req.getGroupId(), form);
176+
setIfNotNull("team_id", req.getTeamId(), form);
177+
return form;
178+
}
179+
180+
public static FormBody.Builder toForm(AdminConversationsRestrictAccessRemoveGroupRequest req) {
181+
FormBody.Builder form = new FormBody.Builder();
182+
setIfNotNull("channel_id", req.getChannelId(), form);
183+
setIfNotNull("group_id", req.getGroupId(), form);
184+
setIfNotNull("team_id", req.getTeamId(), form);
185+
return form;
186+
}
187+
188+
public static FormBody.Builder toForm(AdminConversationsRestrictAccessListGroupsRequest req) {
189+
FormBody.Builder form = new FormBody.Builder();
190+
setIfNotNull("channel_id", req.getChannelId(), form);
191+
setIfNotNull("team_id", req.getTeamId(), form);
192+
return form;
193+
}
169194
public static FormBody.Builder toForm(AdminConversationsWhitelistAddRequest req) {
170195
FormBody.Builder form = new FormBody.Builder();
171196
setIfNotNull("channel_id", req.getChannelId(), form);

0 commit comments

Comments
 (0)