diff --git a/json-logs/samples/api/admin.conversations.linkObjects.json b/json-logs/samples/api/admin.conversations.linkObjects.json new file mode 100644 index 000000000..c5e53b5a3 --- /dev/null +++ b/json-logs/samples/api/admin.conversations.linkObjects.json @@ -0,0 +1,12 @@ +{ + "ok": false, + "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 04fec27d8..6c611e67c 100644 --- a/metadata/web-api/rate_limit_tiers.json +++ b/metadata/web-api/rate_limit_tiers.json @@ -36,6 +36,7 @@ "admin.conversations.getCustomRetention": "Tier2", "admin.conversations.getTeams": "Tier2", "admin.conversations.invite": "Tier2", + "admin.conversations.linkObjects": "Tier2", "admin.conversations.lookup": "Tier2", "admin.conversations.removeCustomRetention": "Tier2", "admin.conversations.rename": "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 04970e501..1b60dfc99 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 @@ -528,6 +528,10 @@ CompletableFuture adminConve CompletableFuture adminConversationsInvite(RequestConfigurator req); + CompletableFuture adminConversationsLinkObjects(AdminConversationsLinkObjectsRequest req); + + CompletableFuture adminConversationsLinkObjects(RequestConfigurator req); + CompletableFuture adminConversationsRename(AdminConversationsRenameRequest req); CompletableFuture adminConversationsRename(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 b932ec559..d84fbb61a 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 @@ -72,6 +72,7 @@ private Methods() { public static final String ADMIN_CONVERSATIONS_GET_CONVERSATION_PREFS = "admin.conversations.getConversationPrefs"; public static final String ADMIN_CONVERSATIONS_GET_TEAMS = "admin.conversations.getTeams"; public static final String ADMIN_CONVERSATIONS_INVITE = "admin.conversations.invite"; + public static final String ADMIN_CONVERSATIONS_LINK_OBJECTS = "admin.conversations.linkObjects"; public static final String ADMIN_CONVERSATIONS_RENAME = "admin.conversations.rename"; public static final String ADMIN_CONVERSATIONS_SEARCH = "admin.conversations.search"; public static final String ADMIN_CONVERSATIONS_SET_CONVERSATION_PREFS = "admin.conversations.setConversationPrefs"; 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 3cd162ae1..ce8594d6f 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 @@ -667,6 +667,13 @@ AdminConversationsInviteResponse adminConversationsInvite( RequestConfigurator req) throws IOException, SlackApiException; + AdminConversationsLinkObjectsResponse adminConversationsLinkObjects(AdminConversationsLinkObjectsRequest req) + throws IOException, SlackApiException; + + AdminConversationsLinkObjectsResponse adminConversationsLinkObjects( + RequestConfigurator req) + throws IOException, SlackApiException; + AdminConversationsRenameResponse adminConversationsRename(AdminConversationsRenameRequest 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 c8d32182d..ce0a0f6d6 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 @@ -98,6 +98,7 @@ public static void setRateLimitTier(String methodName, MethodsRateLimitTier tier ADMIN_CONVERSATIONS_GET_CONVERSATION_PREFS, ADMIN_CONVERSATIONS_GET_TEAMS, ADMIN_CONVERSATIONS_INVITE, + ADMIN_CONVERSATIONS_LINK_OBJECTS, ADMIN_CONVERSATIONS_RENAME, ADMIN_CONVERSATIONS_SEARCH, ADMIN_CONVERSATIONS_SET_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 7e7a1c7ee..3b770259d 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 @@ -562,6 +562,14 @@ public static FormBody.Builder toForm(AdminConversationsInviteRequest req) { return form; } + public static FormBody.Builder toForm(AdminConversationsLinkObjectsRequest req) { + FormBody.Builder form = new FormBody.Builder(); + setIfNotNull("channel", req.getChannel(), form); + setIfNotNull("record_id", req.getRecordId(), form); + setIfNotNull("salesforce_org_id", req.getSalesforceOrgId(), form); + return form; + } + public static FormBody.Builder toForm(AdminConversationsRenameRequest 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 990a095ac..d95b8175d 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 @@ -735,6 +735,16 @@ public CompletableFuture adminConversationsInv return adminConversationsInvite(req.configure(AdminConversationsInviteRequest.builder()).build()); } + @Override + public CompletableFuture adminConversationsLinkObjects(AdminConversationsLinkObjectsRequest req) { + return executor.execute(ADMIN_CONVERSATIONS_LINK_OBJECTS, toMap(req), () -> methods.adminConversationsLinkObjects(req)); + } + + @Override + public CompletableFuture adminConversationsLinkObjects(RequestConfigurator req) { + return adminConversationsLinkObjects(req.configure(AdminConversationsLinkObjectsRequest.builder()).build()); + } + @Override public CompletableFuture adminConversationsRename(AdminConversationsRenameRequest req) { return executor.execute(ADMIN_CONVERSATIONS_RENAME, toMap(req), () -> methods.adminConversationsRename(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 ad2b15d03..fe880189b 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 @@ -740,6 +740,16 @@ public AdminConversationsInviteResponse adminConversationsInvite(RequestConfigur return adminConversationsInvite(req.configure(AdminConversationsInviteRequest.builder()).build()); } + @Override + public AdminConversationsLinkObjectsResponse adminConversationsLinkObjects(AdminConversationsLinkObjectsRequest req) throws IOException, SlackApiException { + return postFormWithTokenAndParseResponse(toForm(req), Methods.ADMIN_CONVERSATIONS_LINK_OBJECTS, getToken(req), AdminConversationsLinkObjectsResponse.class); + } + + @Override + public AdminConversationsLinkObjectsResponse adminConversationsLinkObjects(RequestConfigurator req) throws IOException, SlackApiException { + return adminConversationsLinkObjects(req.configure(AdminConversationsLinkObjectsRequest.builder()).build()); + } + @Override public AdminConversationsRenameResponse adminConversationsRename(AdminConversationsRenameRequest req) throws IOException, SlackApiException { return postFormWithTokenAndParseResponse(toForm(req), Methods.ADMIN_CONVERSATIONS_RENAME, getToken(req), AdminConversationsRenameResponse.class); diff --git a/slack-api-client/src/main/java/com/slack/api/methods/request/admin/conversations/AdminConversationsLinkObjectsRequest.java b/slack-api-client/src/main/java/com/slack/api/methods/request/admin/conversations/AdminConversationsLinkObjectsRequest.java new file mode 100644 index 000000000..c53249555 --- /dev/null +++ b/slack-api-client/src/main/java/com/slack/api/methods/request/admin/conversations/AdminConversationsLinkObjectsRequest.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.linkObjects + */ +@Data +@Builder +public class AdminConversationsLinkObjectsRequest 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; + + /** + * Channel ID for Slack channel that will be linked to a Salesforce record. + */ + private String channel; + + /** + * Salesforce record ID (15 or 18 digit accepted). See [here](https://help.salesforce.com/s/articleView?id=000385008&type=1) for how to look up record ID. + */ + private String recordId; + + /** + * 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; + +} diff --git a/slack-api-client/src/main/java/com/slack/api/methods/response/admin/conversations/AdminConversationsLinkObjectsResponse.java b/slack-api-client/src/main/java/com/slack/api/methods/response/admin/conversations/AdminConversationsLinkObjectsResponse.java new file mode 100644 index 000000000..bd27680f6 --- /dev/null +++ b/slack-api-client/src/main/java/com/slack/api/methods/response/admin/conversations/AdminConversationsLinkObjectsResponse.java @@ -0,0 +1,21 @@ +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 AdminConversationsLinkObjectsResponse implements SlackApiTextResponse { + + private boolean ok; + private String warning; + private String error; + private String needed; + private String provided; + private transient Map> httpResponseHeaders; + + 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 4d12637ed..d04cef3d1 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 @@ -37,7 +37,6 @@ public void verifyTheCoverage() { String[] allMethodNames = methods.split(","); List excludedMethodNames = Arrays.asList( // Salesforce channel related APIs - "admin.conversations.linkObjects", "admin.conversations.unlinkObjects", // 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. 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 14f2df016..18365aaaa 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 @@ -152,6 +152,11 @@ public void adminConversationsObjects() throws Exception { .salesforceOrgId("00DGC00000024hsuWY") .inviteObjectTeam(true)) .get().isOk(), is(true)); + assertThat(methods.adminConversationsLinkObjects(r -> r + .channel("C123") + .recordId("0019000000DmehKAAR") + .salesforceOrgId("00DGC00000024hsuWY")) + .get().isOk(), is(true)); } @Test 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 63f718ff8..2d22514ed 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 @@ -247,6 +247,10 @@ public void adminConversationsObjects() throws Exception { .objectId("0019000000DmehKAAR") .salesforceOrgId("00DGC00000024hsuWY") .inviteObjectTeam(true)).isOk(), is(true)); + assertThat(methods.adminConversationsLinkObjects(r -> r + .channel("C123") + .recordId("0019000000DmehKAAR") + .salesforceOrgId("00DGC00000024hsuWY")).isOk(), is(true)); } @Test 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 47d9c4f41..4790eeccf 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 @@ -483,6 +483,33 @@ public void createForObjects() throws Exception { } } + @Test + public void linkObjects() throws Exception { + if (orgAdminUserToken != null) { + AsyncMethodsClient orgAdminClient = slack.methodsAsync(orgAdminUserToken); + AdminConversationsCreateResponse creation = orgAdminClient.adminConversationsCreate(r -> r + .name("test-channel-" + System.currentTimeMillis()) + .teamId(teamId) + .isPrivate(false) + ).get(); + assertThat(creation.getError(), is(nullValue())); + try { + // The record and org IDs are the examples from the docs, so no record is found + AdminConversationsLinkObjectsResponse linking = orgAdminClient.adminConversationsLinkObjects(r -> r + .channel(creation.getChannelId()) + .recordId("0019000000DmehKAAR") + .salesforceOrgId("00DGC00000024hsuWY") + ).get(); + assertThat(linking.getError(), is("record_not_found")); + } finally { + AdminConversationsDeleteResponse deletion = orgAdminClient.adminConversationsDelete(r -> r + .channelId(creation.getChannelId()) + ).get(); + assertThat(deletion.getError(), is(nullValue())); + } + } + } + private String findUserId(List idsToSkip) throws Exception { String userId = null; UsersListResponse usersListResponse = slack.methodsAsync(teamAdminUserToken).usersList(req -> req).get();