Skip to content
Merged
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
6 changes: 4 additions & 2 deletions json-logs/raw/audit/v1/actions.json
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,8 @@
"mcp_slack_search_users_tool_called",
"mcp_slack_send_message_tool_called",
"mcp_slack_read_user_profile_tool_called",
"pref.allow_cea_for_hippa_team_changed"
"pref.allow_cea_for_hippa_team_changed",
"custom_tos_link_clicked"
],
"user": [
"custom_tos_accepted",
Expand Down Expand Up @@ -336,7 +337,8 @@
"app_agentforce_execute_slack_action",
"user_anomaly_event_reponse_allowlist_changed",
"org_owner_created",
"slackbot_ai_shareable_prompt_created"
"slackbot_ai_shareable_prompt_created",
"user_anomaly_event_response_allowlist_changed"
],
"file": [
"file_downloaded",
Expand Down
8 changes: 7 additions & 1 deletion json-logs/samples/api/admin.apps.activities.list.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,13 @@
"action": "",
"team_id": "E00000000",
"user_id": "W00000000",
"bundle_size_kb": 12345
"bundle_size_kb": 12345,
"outputs": {
"channel_id": "C00000000",
"message_ts": "0000000000.000000"
},
"code": "",
"app_id": "A00000000"
},
"created": 12345,
"trace_id": "",
Expand Down
6 changes: 4 additions & 2 deletions json-logs/samples/api/admin.inviteRequests.list.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@
"email": "",
"date_created": 12345,
"requester_ids": [
"W00000000"
"W00000000",
"U00000000"
],
"channel_ids": [
""
"",
"C00000000"
],
"invite_type": "",
"request_reason": "",
Expand Down
3 changes: 2 additions & 1 deletion json-logs/samples/api/conversations.join.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@
],
"meeting_notes": {
"file_id": "F00000000"
}
},
"use_case": ""
}
},
"warning": "",
Expand Down
26 changes: 0 additions & 26 deletions json-logs/samples/api/files.completeUploadExternal.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,19 +50,6 @@
"latest_reply": "0000000000.000000",
"source": "",
"is_silent_share": false
},
{
"reply_users": [
""
],
"reply_users_count": 12345,
"reply_count": 12345,
"ts": "0000000000.000000",
"channel_name": "",
"team_id": "T00000000",
"share_user_id": "U00000000",
"source": "",
"is_silent_share": false
}
],
"C00000001": [
Expand All @@ -80,19 +67,6 @@
"latest_reply": "0000000000.000000",
"source": "",
"is_silent_share": false
},
{
"reply_users": [
""
],
"reply_users_count": 12345,
"reply_count": 12345,
"ts": "0000000000.000000",
"channel_name": "",
"team_id": "T00000000",
"share_user_id": "U00000000",
"source": "",
"is_silent_share": false
}
]
}
Expand Down
3 changes: 2 additions & 1 deletion json-logs/samples/api/oauth.v2.exchange.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
"response_metadata": {
"messages": [
""
]
],
"warnings": []
}
}
17 changes: 0 additions & 17 deletions json-logs/samples/api/users.conversations.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,15 +89,6 @@
"shared_ts": "0000000000.000000"
},
"is_disabled": false
},
{
"id": "",
"type": "",
"data": {
"file_id": "F00000000",
"shared_ts": "0000000000.000000"
},
"label": ""
}
],
"tabz": [
Expand All @@ -110,14 +101,6 @@
"shared_ts": "0000000000.000000"
},
"is_disabled": false
},
{
"id": "",
"type": "",
"data": {
"file_id": "F00000000",
"shared_ts": "0000000000.000000"
}
}
],
"meeting_notes": {
Expand Down
3 changes: 2 additions & 1 deletion json-logs/samples/api/users.profile.get.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@
"unicode": ""
}
],
"start_date": ""
"start_date": "",
"always_active": false
},
"error": "",
"needed": "",
Expand Down
3 changes: 2 additions & 1 deletion json-logs/samples/api/users.profile.set.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@
"display_url": "",
"unicode": ""
}
]
],
"start_date": ""
},
"ok": false,
"username": "",
Expand Down
3 changes: 3 additions & 0 deletions json-logs/samples/scim/v1/Users.json
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,9 @@
"display": ""
}
]
},
"urn:scim:schemas:extension:slack:profile:1.0": {
"startDate": ""
}
}
],
Expand Down
7 changes: 7 additions & 0 deletions json-logs/samples/scim/v2/Users.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,10 @@
"manager": {}
},
"groups": [
{
"value": "S00000000",
"display": ""
},
{
"value": "",
"display": ""
Expand All @@ -95,6 +99,9 @@
"display": ""
}
]
},
"urn:ietf:params:scim:schemas:extension:slack:profile:2.0:User": {
"startDate": ""
}
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,7 @@ private User() {
public static final String app_agentforce_session_created_from_prompt_link = "app_agentforce_session_created_from_prompt_link";
public static final String app_agentforce_execute_slack_action = "app_agentforce_execute_slack_action";
public static final String user_anomaly_event_reponse_allowlist_changed = "user_anomaly_event_reponse_allowlist_changed";
public static final String user_anomaly_event_response_allowlist_changed = "user_anomaly_event_response_allowlist_changed";
public static final String org_owner_created = "org_owner_created";
public static final String slackbot_ai_shareable_prompt_created = "slackbot_ai_shareable_prompt_created";
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ public static class Actions {
private List<String> canvas;
private List<String> function;
private List<String> salesElevate;
private List<String> slackFirstCrm;
private List<String> nativeDlp;
private List<String> template;
private List<String> list;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,7 @@ public static class Details {
private String viewId; // list_view_updated
private String user; // list_access_added
private String fileId;
private String triggerId; // workflow_trigger_permission_set, workflow_trigger_permission_added
}

@Data
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ public class UsersConversationsResponse implements SlackApiTextResponse {
private String provided;
private transient Map<String, List<String>> httpResponseHeaders;

private String arg;

private List<Conversation> channels;
private ResponseMetadata responseMetadata;
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ public class UsersListResponse implements SlackApiTextResponse {
private String provided;
private transient Map<String, List<String>> httpResponseHeaders;

private String arg;

private String offset; // user id
private List<User> members;
private String cacheTs;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ private Schemas() {
public static final String SCHEMA_CORE = "urn:scim:schemas:core:1.0";
public static final String SCHEMA_EXTENSION_ENTERPRISE = "urn:scim:schemas:extension:enterprise:1.0";
public static final String SCHEMA_EXTENSION_SLACK_GUEST = "urn:scim:schemas:extension:slack:guest:1.0";

public static final String SCHEMA_EXTENSION_SLACK_PROFILE = "urn:scim:schemas:extension:slack:profile:1.0";
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ public class User {
private List<String> schemas = Arrays.asList(
Schemas.SCHEMA_CORE,
Schemas.SCHEMA_EXTENSION_ENTERPRISE,
Schemas.SCHEMA_EXTENSION_SLACK_GUEST
Schemas.SCHEMA_EXTENSION_SLACK_GUEST,
Schemas.SCHEMA_EXTENSION_SLACK_PROFILE
);

private String id;
Expand Down Expand Up @@ -46,6 +47,8 @@ public class User {
private Extension extension;
@SerializedName(Schemas.SCHEMA_EXTENSION_SLACK_GUEST)
private SlackGuest slackGuest;
@SerializedName(Schemas.SCHEMA_EXTENSION_SLACK_PROFILE)
private SlackProfile slackProfile;

private List<Group> groups;

Expand Down Expand Up @@ -182,4 +185,15 @@ public static class Channel {
}
}

@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public static class SlackProfile {
/**
* Identifies date and time the user started within the organization. Used to create and display profile Celebrations.
* The accepted format is ISO 8601. (e.g., "2020-10-31T23:59:59Z")
*/
private String startDate;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ private Schemas() {
public static final String SCHEMA_CORE_USER = "urn:ietf:params:scim:schemas:core:2.0:User";
public static final String SCHEMA_EXTENSION_ENTERPRISE_USER = "urn:ietf:params:scim:schemas:extension:enterprise:2.0:User";
public static final String SCHEMA_EXTENSION_SLACK_GUEST_USER = "urn:ietf:params:scim:schemas:extension:slack:guest:2.0:User";
public static final String SCHEMA_EXTENSION_SLACK_PROFILE_USER = "urn:ietf:params:scim:schemas:extension:slack:profile:2.0:User";

public static final String SCHEMA_CORE_GROUP = "urn:ietf:params:scim:schemas:core:2.0:Group";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ public class User {
private List<String> schemas = Arrays.asList(
Schemas.SCHEMA_CORE_USER,
Schemas.SCHEMA_EXTENSION_ENTERPRISE_USER,
Schemas.SCHEMA_EXTENSION_SLACK_GUEST_USER
Schemas.SCHEMA_EXTENSION_SLACK_GUEST_USER,
Schemas.SCHEMA_EXTENSION_SLACK_PROFILE_USER
);

private String id;
Expand Down Expand Up @@ -46,6 +47,8 @@ public class User {
private Extension extension;
@SerializedName(Schemas.SCHEMA_EXTENSION_SLACK_GUEST_USER)
private SlackGuest slackGuest;
@SerializedName(Schemas.SCHEMA_EXTENSION_SLACK_PROFILE_USER)
private SlackProfile slackProfile;

private List<Group> groups;

Expand Down Expand Up @@ -171,4 +174,15 @@ private Types() {
private String expiration;
}

@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public static class SlackProfile {
/**
* Identifies date and time the user started within the organization. Used to create and display profile Celebrations.
* The accepted format is ISO 8601. (e.g., "2020-10-31T23:59:59Z")
*/
private String startDate;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,17 @@ public void extensions() {
.type("multi")
.expiration("2020-11-30T23:59:59Z")
.build());
user.setSlackProfile(User.SlackProfile.builder()
.startDate("2020-10-31T23:59:59Z")
.build());

assertNotNull(user);
assertNotNull(user.getExtension().getDivision());
assertNotNull(user.getSlackGuest().getType());
assertNotNull(user.getSlackProfile().getStartDate());

String json = GsonFactory.createCamelCase(SlackConfig.DEFAULT).toJson(user);
String expectedJson = "{\"schemas\":[\"urn:scim:schemas:core:1.0\",\"urn:scim:schemas:extension:enterprise:1.0\",\"urn:scim:schemas:extension:slack:guest:1.0\"],\"id\":\"W1234567890\",\"urn:scim:schemas:extension:enterprise:1.0\":{\"employeeNumber\":\"123-456\",\"organization\":\"PDE\",\"division\":\"Product\",\"department\":\"Product\"},\"urn:scim:schemas:extension:slack:guest:1.0\":{\"type\":\"multi\",\"expiration\":\"2020-11-30T23:59:59Z\"}}";
String expectedJson = "{\"schemas\":[\"urn:scim:schemas:core:1.0\",\"urn:scim:schemas:extension:enterprise:1.0\",\"urn:scim:schemas:extension:slack:guest:1.0\",\"urn:scim:schemas:extension:slack:profile:1.0\"],\"id\":\"W1234567890\",\"urn:scim:schemas:extension:enterprise:1.0\":{\"employeeNumber\":\"123-456\",\"organization\":\"PDE\",\"division\":\"Product\",\"department\":\"Product\"},\"urn:scim:schemas:extension:slack:guest:1.0\":{\"type\":\"multi\",\"expiration\":\"2020-11-30T23:59:59Z\"},\"urn:scim:schemas:extension:slack:profile:1.0\":{\"startDate\":\"2020-10-31T23:59:59Z\"}}";
assertEquals(expectedJson, json);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,17 @@ public void extensions() {
.type("multi")
.expiration("2020-11-30T23:59:59Z")
.build());
user.setSlackProfile(User.SlackProfile.builder()
.startDate("2020-10-31T23:59:59Z")
.build());

assertNotNull(user);
assertNotNull(user.getExtension().getDivision());
assertNotNull(user.getSlackGuest().getType());
assertNotNull(user.getSlackProfile().getStartDate());

String json = GsonFactory.createCamelCase(SlackConfig.DEFAULT).toJson(user);
String expectedJson = "{\"schemas\":[\"urn:ietf:params:scim:schemas:core:2.0:User\",\"urn:ietf:params:scim:schemas:extension:enterprise:2.0:User\",\"urn:ietf:params:scim:schemas:extension:slack:guest:2.0:User\"],\"id\":\"W1234567890\",\"urn:ietf:params:scim:schemas:extension:enterprise:2.0:User\":{\"employeeNumber\":\"123-456\",\"organization\":\"PDE\",\"division\":\"Product\",\"department\":\"Product\"},\"urn:ietf:params:scim:schemas:extension:slack:guest:2.0:User\":{\"type\":\"multi\",\"expiration\":\"2020-11-30T23:59:59Z\"}}";
String expectedJson = "{\"schemas\":[\"urn:ietf:params:scim:schemas:core:2.0:User\",\"urn:ietf:params:scim:schemas:extension:enterprise:2.0:User\",\"urn:ietf:params:scim:schemas:extension:slack:guest:2.0:User\",\"urn:ietf:params:scim:schemas:extension:slack:profile:2.0:User\"],\"id\":\"W1234567890\",\"urn:ietf:params:scim:schemas:extension:enterprise:2.0:User\":{\"employeeNumber\":\"123-456\",\"organization\":\"PDE\",\"division\":\"Product\",\"department\":\"Product\"},\"urn:ietf:params:scim:schemas:extension:slack:guest:2.0:User\":{\"type\":\"multi\",\"expiration\":\"2020-11-30T23:59:59Z\"},\"urn:ietf:params:scim:schemas:extension:slack:profile:2.0:User\":{\"startDate\":\"2020-10-31T23:59:59Z\"}}";
assertEquals(expectedJson, json);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import lombok.extern.slf4j.Slf4j;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;

import java.io.IOException;
Expand Down Expand Up @@ -1215,6 +1216,7 @@ public void post_messages_timepicker() throws Exception {
}

// https://github.com/slackapi/java-slack-sdk/issues/647
@Ignore // "method_deprecated" 2025-11-12 https://docs.slack.dev/changelog/2025/03/17/files-upload-extension/
@Test
public void share_message_with_files_issue_647() throws Exception {
loadRandomChannelId();
Expand Down
Loading