Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions json-logs/samples/api/admin.conversations.linkObjects.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"ok": false,
"error": "",
"needed": "",
"provided": "",
"response_metadata": {
"messages": [
""
]
},
"warning": ""
}
1 change: 1 addition & 0 deletions metadata/web-api/rate_limit_tiers.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -528,6 +528,10 @@ CompletableFuture<AdminConversationsRestrictAccessListGroupsResponse> adminConve

CompletableFuture<AdminConversationsInviteResponse> adminConversationsInvite(RequestConfigurator<AdminConversationsInviteRequest.AdminConversationsInviteRequestBuilder> req);

CompletableFuture<AdminConversationsLinkObjectsResponse> adminConversationsLinkObjects(AdminConversationsLinkObjectsRequest req);

CompletableFuture<AdminConversationsLinkObjectsResponse> adminConversationsLinkObjects(RequestConfigurator<AdminConversationsLinkObjectsRequest.AdminConversationsLinkObjectsRequestBuilder> req);

CompletableFuture<AdminConversationsRenameResponse> adminConversationsRename(AdminConversationsRenameRequest req);

CompletableFuture<AdminConversationsRenameResponse> adminConversationsRename(RequestConfigurator<AdminConversationsRenameRequest.AdminConversationsRenameRequestBuilder> req);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -667,6 +667,13 @@ AdminConversationsInviteResponse adminConversationsInvite(
RequestConfigurator<AdminConversationsInviteRequest.AdminConversationsInviteRequestBuilder> req)
throws IOException, SlackApiException;

AdminConversationsLinkObjectsResponse adminConversationsLinkObjects(AdminConversationsLinkObjectsRequest req)
throws IOException, SlackApiException;

AdminConversationsLinkObjectsResponse adminConversationsLinkObjects(
RequestConfigurator<AdminConversationsLinkObjectsRequest.AdminConversationsLinkObjectsRequestBuilder> req)
throws IOException, SlackApiException;

AdminConversationsRenameResponse adminConversationsRename(AdminConversationsRenameRequest req)
throws IOException, SlackApiException;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -735,6 +735,16 @@ public CompletableFuture<AdminConversationsInviteResponse> adminConversationsInv
return adminConversationsInvite(req.configure(AdminConversationsInviteRequest.builder()).build());
}

@Override
public CompletableFuture<AdminConversationsLinkObjectsResponse> adminConversationsLinkObjects(AdminConversationsLinkObjectsRequest req) {
return executor.execute(ADMIN_CONVERSATIONS_LINK_OBJECTS, toMap(req), () -> methods.adminConversationsLinkObjects(req));
}

@Override
public CompletableFuture<AdminConversationsLinkObjectsResponse> adminConversationsLinkObjects(RequestConfigurator<AdminConversationsLinkObjectsRequest.AdminConversationsLinkObjectsRequestBuilder> req) {
return adminConversationsLinkObjects(req.configure(AdminConversationsLinkObjectsRequest.builder()).build());
}

@Override
public CompletableFuture<AdminConversationsRenameResponse> adminConversationsRename(AdminConversationsRenameRequest req) {
return executor.execute(ADMIN_CONVERSATIONS_RENAME, toMap(req), () -> methods.adminConversationsRename(req));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<AdminConversationsLinkObjectsRequest.AdminConversationsLinkObjectsRequestBuilder> 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);
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

}
Original file line number Diff line number Diff line change
@@ -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<String, List<String>> httpResponseHeaders;

private ErrorResponseMetadata responseMetadata;
}
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ public void verifyTheCoverage() {
String[] allMethodNames = methods.split(",");
List<String> 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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<String> idsToSkip) throws Exception {
String userId = null;
UsersListResponse usersListResponse = slack.methodsAsync(teamAdminUserToken).usersList(req -> req).get();
Expand Down
Loading