From d0c31cb47f2676f3f9c2a451152c9c53b16f40bc Mon Sep 17 00:00:00 2001 From: Eden Zimbelman Date: Tue, 17 Nov 2026 21:25:45 -0800 Subject: [PATCH] feat: add admin.conversations.unlinkObjects method Co-Authored-By: Claude --- .../admin.conversations.unlinkObjects.json | 12 ++++++++ metadata/web-api/rate_limit_tiers.json | 1 + .../slack/api/methods/AsyncMethodsClient.java | 4 +++ .../java/com/slack/api/methods/Methods.java | 1 + .../com/slack/api/methods/MethodsClient.java | 7 +++++ .../slack/api/methods/MethodsRateLimits.java | 1 + .../slack/api/methods/RequestFormBuilder.java | 7 +++++ .../methods/impl/AsyncMethodsClientImpl.java | 10 +++++++ .../api/methods/impl/MethodsClientImpl.java | 10 +++++++ ...dminConversationsUnlinkObjectsRequest.java | 29 +++++++++++++++++++ ...minConversationsUnlinkObjectsResponse.java | 21 ++++++++++++++ .../java/test_locally/api/MethodsTest.java | 2 -- .../methods_admin_api/AdminApiAsyncTest.java | 4 +++ .../api/methods_admin_api/AdminApiTest.java | 3 ++ .../AdminApi_conversations_Test.java | 27 +++++++++++++++++ 15 files changed, 137 insertions(+), 2 deletions(-) create mode 100644 json-logs/samples/api/admin.conversations.unlinkObjects.json create mode 100644 slack-api-client/src/main/java/com/slack/api/methods/request/admin/conversations/AdminConversationsUnlinkObjectsRequest.java create mode 100644 slack-api-client/src/main/java/com/slack/api/methods/response/admin/conversations/AdminConversationsUnlinkObjectsResponse.java diff --git a/json-logs/samples/api/admin.conversations.unlinkObjects.json b/json-logs/samples/api/admin.conversations.unlinkObjects.json new file mode 100644 index 000000000..c5e53b5a3 --- /dev/null +++ b/json-logs/samples/api/admin.conversations.unlinkObjects.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 6c611e67c..526ef4a06 100644 --- a/metadata/web-api/rate_limit_tiers.json +++ b/metadata/web-api/rate_limit_tiers.json @@ -48,6 +48,7 @@ "admin.conversations.setCustomRetention": "Tier2", "admin.conversations.setTeams": "Tier2", "admin.conversations.unarchive": "Tier2", + "admin.conversations.unlinkObjects": "Tier2", "admin.conversations.whitelist.add": "Tier2", "admin.conversations.whitelist.listGroupsLinkedToChannel": "Tier2", "admin.conversations.whitelist.remove": "Tier1", 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 1b60dfc99..59d6ec967 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 @@ -548,6 +548,10 @@ CompletableFuture adminConve CompletableFuture adminConversationsUnarchive(RequestConfigurator req); + CompletableFuture adminConversationsUnlinkObjects(AdminConversationsUnlinkObjectsRequest req); + + CompletableFuture adminConversationsUnlinkObjects(RequestConfigurator req); + CompletableFuture adminConversationsGetCustomRetention(RequestConfigurator req); CompletableFuture adminConversationsGetCustomRetention(AdminConversationsGetCustomRetentionRequest 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 d84fbb61a..a3947c8f5 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 @@ -77,6 +77,7 @@ private Methods() { public static final String ADMIN_CONVERSATIONS_SEARCH = "admin.conversations.search"; public static final String ADMIN_CONVERSATIONS_SET_CONVERSATION_PREFS = "admin.conversations.setConversationPrefs"; public static final String ADMIN_CONVERSATIONS_UNARCHIVE = "admin.conversations.unarchive"; + public static final String ADMIN_CONVERSATIONS_UNLINK_OBJECTS = "admin.conversations.unlinkObjects"; public static final String ADMIN_CONVERSATIONS_GET_CUSTOM_RETENTION = "admin.conversations.getCustomRetention"; public static final String ADMIN_CONVERSATIONS_REMOVE_CUSTOM_RETENTION = "admin.conversations.removeCustomRetention"; public static final String ADMIN_CONVERSATIONS_SET_CUSTOM_RETENTION = "admin.conversations.setCustomRetention"; 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 ce8594d6f..343fe4c14 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 @@ -702,6 +702,13 @@ AdminConversationsUnarchiveResponse adminConversationsUnarchive( RequestConfigurator req) throws IOException, SlackApiException; + AdminConversationsUnlinkObjectsResponse adminConversationsUnlinkObjects(AdminConversationsUnlinkObjectsRequest req) + throws IOException, SlackApiException; + + AdminConversationsUnlinkObjectsResponse adminConversationsUnlinkObjects( + RequestConfigurator req) + throws IOException, SlackApiException; + AdminConversationsGetCustomRetentionResponse adminConversationsGetCustomRetention( RequestConfigurator 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 ce0a0f6d6..93b4c004f 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 @@ -104,6 +104,7 @@ public static void setRateLimitTier(String methodName, MethodsRateLimitTier tier ADMIN_CONVERSATIONS_SET_CONVERSATION_PREFS, ADMIN_CONVERSATIONS_SET_TEAMS, ADMIN_CONVERSATIONS_UNARCHIVE, + ADMIN_CONVERSATIONS_UNLINK_OBJECTS, ADMIN_CONVERSATIONS_EKM_LIST_ORIGINAL_CONNECTED_CHANNEL_INFO, ADMIN_CONVERSATIONS_GET_CUSTOM_RETENTION, ADMIN_CONVERSATIONS_REMOVE_CUSTOM_RETENTION, 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 3b770259d..c100ea7f0 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 @@ -610,6 +610,13 @@ public static FormBody.Builder toForm(AdminConversationsUnarchiveRequest req) { return form; } + public static FormBody.Builder toForm(AdminConversationsUnlinkObjectsRequest req) { + FormBody.Builder form = new FormBody.Builder(); + setIfNotNull("channel", req.getChannel(), form); + setIfNotNull("new_name", req.getNewName(), form); + return form; + } + public static FormBody.Builder toForm(AdminConversationsBulkArchiveRequest req) { FormBody.Builder form = new FormBody.Builder(); if (req.getChannelIds() != null) { 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 d95b8175d..802d534b3 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 @@ -785,6 +785,16 @@ public CompletableFuture adminConversations return adminConversationsUnarchive(req.configure(AdminConversationsUnarchiveRequest.builder()).build()); } + @Override + public CompletableFuture adminConversationsUnlinkObjects(AdminConversationsUnlinkObjectsRequest req) { + return executor.execute(ADMIN_CONVERSATIONS_UNLINK_OBJECTS, toMap(req), () -> methods.adminConversationsUnlinkObjects(req)); + } + + @Override + public CompletableFuture adminConversationsUnlinkObjects(RequestConfigurator req) { + return adminConversationsUnlinkObjects(req.configure(AdminConversationsUnlinkObjectsRequest.builder()).build()); + } + @Override public CompletableFuture adminConversationsGetCustomRetention(RequestConfigurator req) { return adminConversationsGetCustomRetention(req.configure(AdminConversationsGetCustomRetentionRequest.builder()).build()); 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 fe880189b..bc52603b5 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 @@ -790,6 +790,16 @@ public AdminConversationsUnarchiveResponse adminConversationsUnarchive(RequestCo return adminConversationsUnarchive(req.configure(AdminConversationsUnarchiveRequest.builder()).build()); } + @Override + public AdminConversationsUnlinkObjectsResponse adminConversationsUnlinkObjects(AdminConversationsUnlinkObjectsRequest req) throws IOException, SlackApiException { + return postFormWithTokenAndParseResponse(toForm(req), Methods.ADMIN_CONVERSATIONS_UNLINK_OBJECTS, getToken(req), AdminConversationsUnlinkObjectsResponse.class); + } + + @Override + public AdminConversationsUnlinkObjectsResponse adminConversationsUnlinkObjects(RequestConfigurator req) throws IOException, SlackApiException { + return adminConversationsUnlinkObjects(req.configure(AdminConversationsUnlinkObjectsRequest.builder()).build()); + } + @Override public AdminConversationsGetCustomRetentionResponse adminConversationsGetCustomRetention(RequestConfigurator req) throws IOException, SlackApiException { return adminConversationsGetCustomRetention(req.configure(AdminConversationsGetCustomRetentionRequest.builder()).build()); diff --git a/slack-api-client/src/main/java/com/slack/api/methods/request/admin/conversations/AdminConversationsUnlinkObjectsRequest.java b/slack-api-client/src/main/java/com/slack/api/methods/request/admin/conversations/AdminConversationsUnlinkObjectsRequest.java new file mode 100644 index 000000000..e6f3edb21 --- /dev/null +++ b/slack-api-client/src/main/java/com/slack/api/methods/request/admin/conversations/AdminConversationsUnlinkObjectsRequest.java @@ -0,0 +1,29 @@ +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.unlinkObjects + */ +@Data +@Builder +public class AdminConversationsUnlinkObjectsRequest 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 unlinked from the Salesforce record. + */ + private String channel; + + /** + * Channel name you would like to give to the channel that is being unlinked from the Salesforce record. + */ + private String newName; + +} diff --git a/slack-api-client/src/main/java/com/slack/api/methods/response/admin/conversations/AdminConversationsUnlinkObjectsResponse.java b/slack-api-client/src/main/java/com/slack/api/methods/response/admin/conversations/AdminConversationsUnlinkObjectsResponse.java new file mode 100644 index 000000000..59fbe836a --- /dev/null +++ b/slack-api-client/src/main/java/com/slack/api/methods/response/admin/conversations/AdminConversationsUnlinkObjectsResponse.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 AdminConversationsUnlinkObjectsResponse 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 d04cef3d1..7dbb8a45a 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 @@ -36,8 +36,6 @@ public void verifyTheCoverage() { String[] allMethodNames = methods.split(","); List excludedMethodNames = Arrays.asList( - // Salesforce channel related APIs - "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. "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 18365aaaa..ecabe25c2 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 @@ -157,6 +157,10 @@ public void adminConversationsObjects() throws Exception { .recordId("0019000000DmehKAAR") .salesforceOrgId("00DGC00000024hsuWY")) .get().isOk(), is(true)); + assertThat(methods.adminConversationsUnlinkObjects(r -> r + .channel("C123") + .newName("example-unlinked")) + .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 2d22514ed..2709d56d3 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 @@ -251,6 +251,9 @@ public void adminConversationsObjects() throws Exception { .channel("C123") .recordId("0019000000DmehKAAR") .salesforceOrgId("00DGC00000024hsuWY")).isOk(), is(true)); + assertThat(methods.adminConversationsUnlinkObjects(r -> r + .channel("C123") + .newName("example-unlinked")).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 4790eeccf..29a5d6ff1 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 @@ -510,6 +510,33 @@ public void linkObjects() throws Exception { } } + @Test + public void unlinkObjects() throws Exception { + if (orgAdminUserToken != null) { + AsyncMethodsClient orgAdminClient = slack.methodsAsync(orgAdminUserToken); + String channelName = "test-channel-" + System.currentTimeMillis(); + AdminConversationsCreateResponse creation = orgAdminClient.adminConversationsCreate(r -> r + .name(channelName) + .teamId(teamId) + .isPrivate(false) + ).get(); + assertThat(creation.getError(), is(nullValue())); + try { + // The channel is not linked to a Salesforce record, so it cannot be unlinked + AdminConversationsUnlinkObjectsResponse unlinking = orgAdminClient.adminConversationsUnlinkObjects(r -> r + .channel(creation.getChannelId()) + .newName(channelName + "-unlinked") + ).get(); + assertThat(unlinking.getError(), is("restricted_action")); + } 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();