diff --git a/json-logs/samples/api/admin.conversations.createForObjects.json b/json-logs/samples/api/admin.conversations.createForObjects.json new file mode 100644 index 000000000..dcfa8d169 --- /dev/null +++ b/json-logs/samples/api/admin.conversations.createForObjects.json @@ -0,0 +1,13 @@ +{ + "ok": false, + "channel_id": "C00000000", + "error": "", + "needed": "", + "provided": "", + "response_metadata": { + "messages": [ + "" + ] + }, + "warning": "" +} \ No newline at end of file diff --git a/metadata/web-api/rate_limit_tiers.json b/metadata/web-api/rate_limit_tiers.json index 20c67b75e..04fec27d8 100644 --- a/metadata/web-api/rate_limit_tiers.json +++ b/metadata/web-api/rate_limit_tiers.json @@ -28,6 +28,7 @@ "admin.conversations.convertToPrivate": "Tier2", "admin.conversations.convertToPublic": "Tier2", "admin.conversations.create": "Tier2", + "admin.conversations.createForObjects": "Tier2", "admin.conversations.delete": "Tier2", "admin.conversations.disconnectShared": "Tier2", "admin.conversations.ekm.listOriginalConnectedChannelInfo": "Tier2", diff --git a/slack-api-client/src/main/java/com/slack/api/methods/AsyncMethodsClient.java b/slack-api-client/src/main/java/com/slack/api/methods/AsyncMethodsClient.java index 2d8d708f2..04970e501 100644 --- a/slack-api-client/src/main/java/com/slack/api/methods/AsyncMethodsClient.java +++ b/slack-api-client/src/main/java/com/slack/api/methods/AsyncMethodsClient.java @@ -504,6 +504,10 @@ CompletableFuture adminConve CompletableFuture adminConversationsCreate(RequestConfigurator req); + CompletableFuture adminConversationsCreateForObjects(AdminConversationsCreateForObjectsRequest req); + + CompletableFuture adminConversationsCreateForObjects(RequestConfigurator req); + CompletableFuture adminConversationsDelete(AdminConversationsDeleteRequest req); CompletableFuture adminConversationsDelete(RequestConfigurator req); diff --git a/slack-api-client/src/main/java/com/slack/api/methods/Methods.java b/slack-api-client/src/main/java/com/slack/api/methods/Methods.java index fad62c6c4..b932ec559 100644 --- a/slack-api-client/src/main/java/com/slack/api/methods/Methods.java +++ b/slack-api-client/src/main/java/com/slack/api/methods/Methods.java @@ -66,6 +66,7 @@ private Methods() { public static final String ADMIN_CONVERSATIONS_ARCHIVE = "admin.conversations.archive"; public static final String ADMIN_CONVERSATIONS_CONVERT_TO_PRIVATE = "admin.conversations.convertToPrivate"; public static final String ADMIN_CONVERSATIONS_CREATE = "admin.conversations.create"; + public static final String ADMIN_CONVERSATIONS_CREATE_FOR_OBJECTS = "admin.conversations.createForObjects"; public static final String ADMIN_CONVERSATIONS_DELETE = "admin.conversations.delete"; public static final String ADMIN_CONVERSATIONS_DISCONNECT_SHARED = "admin.conversations.disconnectShared"; public static final String ADMIN_CONVERSATIONS_GET_CONVERSATION_PREFS = "admin.conversations.getConversationPrefs"; diff --git a/slack-api-client/src/main/java/com/slack/api/methods/MethodsClient.java b/slack-api-client/src/main/java/com/slack/api/methods/MethodsClient.java index 5b161bfd9..3cd162ae1 100644 --- a/slack-api-client/src/main/java/com/slack/api/methods/MethodsClient.java +++ b/slack-api-client/src/main/java/com/slack/api/methods/MethodsClient.java @@ -625,6 +625,13 @@ AdminConversationsCreateResponse adminConversationsCreate( RequestConfigurator req) throws IOException, SlackApiException; + AdminConversationsCreateForObjectsResponse adminConversationsCreateForObjects(AdminConversationsCreateForObjectsRequest req) + throws IOException, SlackApiException; + + AdminConversationsCreateForObjectsResponse adminConversationsCreateForObjects( + RequestConfigurator req) + throws IOException, SlackApiException; + AdminConversationsDeleteResponse adminConversationsDelete(AdminConversationsDeleteRequest req) throws IOException, SlackApiException; diff --git a/slack-api-client/src/main/java/com/slack/api/methods/MethodsRateLimits.java b/slack-api-client/src/main/java/com/slack/api/methods/MethodsRateLimits.java index 7f3e74e63..c8d32182d 100644 --- a/slack-api-client/src/main/java/com/slack/api/methods/MethodsRateLimits.java +++ b/slack-api-client/src/main/java/com/slack/api/methods/MethodsRateLimits.java @@ -92,6 +92,7 @@ public static void setRateLimitTier(String methodName, MethodsRateLimitTier tier ADMIN_CONVERSATIONS_ARCHIVE, ADMIN_CONVERSATIONS_CONVERT_TO_PRIVATE, ADMIN_CONVERSATIONS_CREATE, + ADMIN_CONVERSATIONS_CREATE_FOR_OBJECTS, ADMIN_CONVERSATIONS_DELETE, ADMIN_CONVERSATIONS_DISCONNECT_SHARED, ADMIN_CONVERSATIONS_GET_CONVERSATION_PREFS, diff --git a/slack-api-client/src/main/java/com/slack/api/methods/RequestFormBuilder.java b/slack-api-client/src/main/java/com/slack/api/methods/RequestFormBuilder.java index efb9d5494..7e7a1c7ee 100644 --- a/slack-api-client/src/main/java/com/slack/api/methods/RequestFormBuilder.java +++ b/slack-api-client/src/main/java/com/slack/api/methods/RequestFormBuilder.java @@ -516,6 +516,14 @@ public static FormBody.Builder toForm(AdminConversationsCreateRequest req) { return form; } + public static FormBody.Builder toForm(AdminConversationsCreateForObjectsRequest req) { + FormBody.Builder form = new FormBody.Builder(); + setIfNotNull("object_id", req.getObjectId(), form); + setIfNotNull("salesforce_org_id", req.getSalesforceOrgId(), form); + setIfNotNull("invite_object_team", req.getInviteObjectTeam(), form); + return form; + } + public static FormBody.Builder toForm(AdminConversationsDeleteRequest req) { FormBody.Builder form = new FormBody.Builder(); setIfNotNull("channel_id", req.getChannelId(), form); diff --git a/slack-api-client/src/main/java/com/slack/api/methods/impl/AsyncMethodsClientImpl.java b/slack-api-client/src/main/java/com/slack/api/methods/impl/AsyncMethodsClientImpl.java index 1963837d1..990a095ac 100644 --- a/slack-api-client/src/main/java/com/slack/api/methods/impl/AsyncMethodsClientImpl.java +++ b/slack-api-client/src/main/java/com/slack/api/methods/impl/AsyncMethodsClientImpl.java @@ -675,6 +675,16 @@ public CompletableFuture adminConversationsCre return adminConversationsCreate(req.configure(AdminConversationsCreateRequest.builder()).build()); } + @Override + public CompletableFuture adminConversationsCreateForObjects(AdminConversationsCreateForObjectsRequest req) { + return executor.execute(ADMIN_CONVERSATIONS_CREATE_FOR_OBJECTS, toMap(req), () -> methods.adminConversationsCreateForObjects(req)); + } + + @Override + public CompletableFuture adminConversationsCreateForObjects(RequestConfigurator req) { + return adminConversationsCreateForObjects(req.configure(AdminConversationsCreateForObjectsRequest.builder()).build()); + } + @Override public CompletableFuture adminConversationsDelete(AdminConversationsDeleteRequest req) { return executor.execute(ADMIN_CONVERSATIONS_DELETE, toMap(req), () -> methods.adminConversationsDelete(req)); diff --git a/slack-api-client/src/main/java/com/slack/api/methods/impl/MethodsClientImpl.java b/slack-api-client/src/main/java/com/slack/api/methods/impl/MethodsClientImpl.java index 33d598b7b..ad2b15d03 100644 --- a/slack-api-client/src/main/java/com/slack/api/methods/impl/MethodsClientImpl.java +++ b/slack-api-client/src/main/java/com/slack/api/methods/impl/MethodsClientImpl.java @@ -680,6 +680,16 @@ public AdminConversationsCreateResponse adminConversationsCreate(RequestConfigur return adminConversationsCreate(req.configure(AdminConversationsCreateRequest.builder()).build()); } + @Override + public AdminConversationsCreateForObjectsResponse adminConversationsCreateForObjects(AdminConversationsCreateForObjectsRequest req) throws IOException, SlackApiException { + return postFormWithTokenAndParseResponse(toForm(req), Methods.ADMIN_CONVERSATIONS_CREATE_FOR_OBJECTS, getToken(req), AdminConversationsCreateForObjectsResponse.class); + } + + @Override + public AdminConversationsCreateForObjectsResponse adminConversationsCreateForObjects(RequestConfigurator req) throws IOException, SlackApiException { + return adminConversationsCreateForObjects(req.configure(AdminConversationsCreateForObjectsRequest.builder()).build()); + } + @Override public AdminConversationsDeleteResponse adminConversationsDelete(AdminConversationsDeleteRequest req) throws IOException, SlackApiException { return postFormWithTokenAndParseResponse(toForm(req), Methods.ADMIN_CONVERSATIONS_DELETE, getToken(req), AdminConversationsDeleteResponse.class); diff --git a/slack-api-client/src/main/java/com/slack/api/methods/request/admin/conversations/AdminConversationsCreateForObjectsRequest.java b/slack-api-client/src/main/java/com/slack/api/methods/request/admin/conversations/AdminConversationsCreateForObjectsRequest.java new file mode 100644 index 000000000..f6b0bcf78 --- /dev/null +++ b/slack-api-client/src/main/java/com/slack/api/methods/request/admin/conversations/AdminConversationsCreateForObjectsRequest.java @@ -0,0 +1,34 @@ +package com.slack.api.methods.request.admin.conversations; + +import com.slack.api.methods.SlackApiRequest; +import lombok.Builder; +import lombok.Data; + +/** + * https://docs.slack.dev/reference/methods/admin.conversations.createForObjects + */ +@Data +@Builder +public class AdminConversationsCreateForObjectsRequest implements SlackApiRequest { + + /** + * Authentication token bearing required scopes. Tokens should be passed as an HTTP Authorization header or alternatively, as a POST parameter. + */ + private String token; + + /** + * Object / Record ID (15 or 18 digit accepted). See [here](https://help.salesforce.com/s/articleView?id=000385008&type=1) for how to look up an ID. + */ + private String objectId; + + /** + * Salesforce org ID (15 or 18 digit accepted). See [here](https://help.salesforce.com/s/articleView?id=000385215&type=1) for how to look up Salesforce org ID. + */ + private String salesforceOrgId; + + /** + * Optional flag to add all team members related to the object to the newly created Salesforce channel. When true, adds a maximum of 100 team members to the channel. + */ + private Boolean inviteObjectTeam; + +} diff --git a/slack-api-client/src/main/java/com/slack/api/methods/response/admin/conversations/AdminConversationsCreateForObjectsResponse.java b/slack-api-client/src/main/java/com/slack/api/methods/response/admin/conversations/AdminConversationsCreateForObjectsResponse.java new file mode 100644 index 000000000..a7033e7cc --- /dev/null +++ b/slack-api-client/src/main/java/com/slack/api/methods/response/admin/conversations/AdminConversationsCreateForObjectsResponse.java @@ -0,0 +1,22 @@ +package com.slack.api.methods.response.admin.conversations; + +import com.slack.api.methods.SlackApiTextResponse; +import com.slack.api.model.ErrorResponseMetadata; +import lombok.Data; + +import java.util.List; +import java.util.Map; + +@Data +public class AdminConversationsCreateForObjectsResponse implements SlackApiTextResponse { + + private boolean ok; + private String warning; + private String error; + private String needed; + private String provided; + private transient Map> httpResponseHeaders; + + private String channelId; + private ErrorResponseMetadata responseMetadata; +} diff --git a/slack-api-client/src/test/java/test_locally/api/MethodsTest.java b/slack-api-client/src/test/java/test_locally/api/MethodsTest.java index ce0d15d0b..4d12637ed 100644 --- a/slack-api-client/src/test/java/test_locally/api/MethodsTest.java +++ b/slack-api-client/src/test/java/test_locally/api/MethodsTest.java @@ -39,7 +39,6 @@ public void verifyTheCoverage() { // Salesforce channel related APIs "admin.conversations.linkObjects", "admin.conversations.unlinkObjects", - "admin.conversations.createForObjects", // These next-generation platform related APIs work only on the automation platform. // Thus, we don't have short-term plans to add them to this Java SDK. "apps.auth.external.delete", diff --git a/slack-api-client/src/test/java/test_locally/api/methods_admin_api/AdminApiAsyncTest.java b/slack-api-client/src/test/java/test_locally/api/methods_admin_api/AdminApiAsyncTest.java index 3eb919741..14f2df016 100644 --- a/slack-api-client/src/test/java/test_locally/api/methods_admin_api/AdminApiAsyncTest.java +++ b/slack-api-client/src/test/java/test_locally/api/methods_admin_api/AdminApiAsyncTest.java @@ -143,6 +143,17 @@ public void adminConversations() throws Exception { assertThat(methods.adminConversationsBulkArchive(r -> r).get().isOk(), is(true)); } + @Test + public void adminConversationsObjects() throws Exception { + AsyncMethodsClient methods = slack.methodsAsync(ValidToken); + + assertThat(methods.adminConversationsCreateForObjects(r -> r + .objectId("0019000000DmehKAAR") + .salesforceOrgId("00DGC00000024hsuWY") + .inviteObjectTeam(true)) + .get().isOk(), is(true)); + } + @Test public void adminConversationsWhitelist() throws Exception { AsyncMethodsClient methods = slack.methodsAsync(ValidToken); diff --git a/slack-api-client/src/test/java/test_locally/api/methods_admin_api/AdminApiTest.java b/slack-api-client/src/test/java/test_locally/api/methods_admin_api/AdminApiTest.java index d5a4bd978..63f718ff8 100644 --- a/slack-api-client/src/test/java/test_locally/api/methods_admin_api/AdminApiTest.java +++ b/slack-api-client/src/test/java/test_locally/api/methods_admin_api/AdminApiTest.java @@ -239,6 +239,16 @@ public void adminConversations() throws Exception { assertThat(methods.adminConversationsLookup(r -> r).isOk(), is(true)); } + @Test + public void adminConversationsObjects() throws Exception { + MethodsClient methods = slack.methods(ValidToken); + + assertThat(methods.adminConversationsCreateForObjects(r -> r + .objectId("0019000000DmehKAAR") + .salesforceOrgId("00DGC00000024hsuWY") + .inviteObjectTeam(true)).isOk(), is(true)); + } + @Test public void adminConversationsWhitelist() throws Exception { MethodsClient methods = slack.methods(ValidToken); diff --git a/slack-api-client/src/test/java/test_with_remote_apis/methods_admin_api/AdminApi_conversations_Test.java b/slack-api-client/src/test/java/test_with_remote_apis/methods_admin_api/AdminApi_conversations_Test.java index 228b39cee..47d9c4f41 100644 --- a/slack-api-client/src/test/java/test_with_remote_apis/methods_admin_api/AdminApi_conversations_Test.java +++ b/slack-api-client/src/test/java/test_with_remote_apis/methods_admin_api/AdminApi_conversations_Test.java @@ -470,6 +470,19 @@ public void adminConversationsBulkDelete() throws Exception { } } + @Test + public void createForObjects() throws Exception { + if (orgAdminUserToken != null) { + AsyncMethodsClient orgAdminClient = slack.methodsAsync(orgAdminUserToken); + // The object and org IDs are the examples from the docs, so no record is found + AdminConversationsCreateForObjectsResponse creation = orgAdminClient.adminConversationsCreateForObjects(r -> r + .objectId("0019000000DmehKAAR") + .salesforceOrgId("00DGC00000024hsuWY") + ).get(); + assertThat(creation.getError(), is("record_not_found")); + } + } + private String findUserId(List idsToSkip) throws Exception { String userId = null; UsersListResponse usersListResponse = slack.methodsAsync(teamAdminUserToken).usersList(req -> req).get();