diff --git a/json-logs/raw/audit/v1/actions.json b/json-logs/raw/audit/v1/actions.json index 44c06f74f..af988b4b8 100644 --- a/json-logs/raw/audit/v1/actions.json +++ b/json-logs/raw/audit/v1/actions.json @@ -265,7 +265,20 @@ "pref.public_record_channel_retention_changed", "pref.public_record_channel_redaction_duration_changed", "pref.enterprise_search_connectors_config_changed", - "search_query_audit_logs_max_rows_failure" + "search_query_audit_logs_max_rows_failure", + "slack_ai_message_explanation_generated", + "mcp_slack_read_canvas_tool_called", + "mcp_slack_create_canvas_tool_called", + "mcp_slack_update_canvas_tool_called", + "mcp_slack_read_channel_tool_called", + "mcp_slack_read_thread_tool_called", + "mcp_slack_search_public_tool_called", + "mcp_slack_search_channels_tool_called", + "mcp_slack_search_public_and_private_tool_called", + "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" ], "user": [ "custom_tos_accepted", @@ -528,7 +541,8 @@ "usergroup_update_enqueued", "usergroup_section_updated", "user_add_to_usergroup_failed", - "usergroup_anomaly_event_response_allowlist_changed" + "usergroup_anomaly_event_response_allowlist_changed", + "user_bulk_upload_to_usergroup_started" ], "role": [ "role_assigned", @@ -659,6 +673,16 @@ "list_restricted_sharing_disabled", "list_rows_undeleted", "list_default_view_updated" + ], + "slack_first_crm": [ + "contacts_import_initiated", + "contacts_import_completed", + "contacts_import_failed", + "field_created", + "field_updated", + "field_visibility_updated", + "license_assigned", + "license_removed" ] } } \ No newline at end of file diff --git a/json-logs/samples/api/admin.conversations.search.json b/json-logs/samples/api/admin.conversations.search.json index 462f62417..9bcba5a86 100644 --- a/json-logs/samples/api/admin.conversations.search.json +++ b/json-logs/samples/api/admin.conversations.search.json @@ -105,6 +105,11 @@ "shared_ts": "0000000000.000000" }, "is_disabled": false + }, + { + "type": "", + "label": "", + "id": "" } ], "tabz": [ @@ -117,6 +122,9 @@ "shared_ts": "0000000000.000000" }, "is_disabled": false + }, + { + "type": "" } ], "meeting_notes": { diff --git a/json-logs/samples/api/auth.test.json b/json-logs/samples/api/auth.test.json index 78b8c9c0c..1461d6eee 100644 --- a/json-logs/samples/api/auth.test.json +++ b/json-logs/samples/api/auth.test.json @@ -13,5 +13,6 @@ "error": "", "needed": "", "provided": "", - "expires_in": 12345 + "expires_in": 12345, + "context": "" } \ No newline at end of file diff --git a/json-logs/samples/api/chat.postMessage.json b/json-logs/samples/api/chat.postMessage.json index 1f3603c56..43d9ea093 100644 --- a/json-logs/samples/api/chat.postMessage.json +++ b/json-logs/samples/api/chat.postMessage.json @@ -20,7 +20,8 @@ "image_48": "https://www.example.com/", "image_72": "https://www.example.com/" }, - "team_id": "T00000000" + "team_id": "T00000000", + "user_id": "U00000000" }, "thread_ts": "0000000000.000000", "parent_user_id": "U00000000", diff --git a/json-logs/samples/api/conversations.info.json b/json-logs/samples/api/conversations.info.json index 8ce92eb53..7e90d92a2 100644 --- a/json-logs/samples/api/conversations.info.json +++ b/json-logs/samples/api/conversations.info.json @@ -64,7 +64,19 @@ "context_team_id": "T00000000", "updated": 12345, "properties": { - "is_dormant": false + "is_dormant": false, + "tabs": [ + { + "type": "", + "label": "", + "id": "" + } + ], + "tabz": [ + { + "type": "" + } + ] } }, "error": "", diff --git a/json-logs/samples/api/conversations.list.json b/json-logs/samples/api/conversations.list.json index 3d9aea9f8..a536d2fde 100644 --- a/json-logs/samples/api/conversations.list.json +++ b/json-logs/samples/api/conversations.list.json @@ -86,7 +86,8 @@ "type": "", "data": { "file_id": "F00000000", - "shared_ts": "0000000000.000000" + "shared_ts": "0000000000.000000", + "folder_bookmark_id": "" }, "is_disabled": false } @@ -98,7 +99,8 @@ "type": "", "data": { "file_id": "F00000000", - "shared_ts": "0000000000.000000" + "shared_ts": "0000000000.000000", + "folder_bookmark_id": "" }, "is_disabled": false } @@ -106,7 +108,14 @@ "meeting_notes": { "file_id": "F00000000" }, - "is_dormant": false + "is_dormant": false, + "use_case": "", + "channel_workflows": [ + { + "workflow_trigger_id": "", + "title": "" + } + ] } } ], @@ -115,5 +124,6 @@ }, "error": "", "needed": "", - "provided": "" + "provided": "", + "arg": "" } \ No newline at end of file diff --git a/json-logs/samples/api/files.completeUploadExternal.json b/json-logs/samples/api/files.completeUploadExternal.json index a9c55bec9..e548f0155 100644 --- a/json-logs/samples/api/files.completeUploadExternal.json +++ b/json-logs/samples/api/files.completeUploadExternal.json @@ -50,6 +50,19 @@ "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": [ @@ -67,6 +80,19 @@ "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 } ] } diff --git a/json-logs/samples/api/rtm.connect.json b/json-logs/samples/api/rtm.connect.json index bd7e213de..6a0a5be3e 100644 --- a/json-logs/samples/api/rtm.connect.json +++ b/json-logs/samples/api/rtm.connect.json @@ -12,5 +12,6 @@ }, "error": "", "needed": "", - "provided": "" + "provided": "", + "context": "" } \ No newline at end of file diff --git a/json-logs/samples/api/team.info.json b/json-logs/samples/api/team.info.json index ad45373fd..be08c81ef 100644 --- a/json-logs/samples/api/team.info.json +++ b/json-logs/samples/api/team.info.json @@ -24,7 +24,14 @@ "discoverable": "", "avatar_base_url": "https://www.example.com/", "lob_sales_home_enabled": false, - "is_sfdc_auto_slack": false + "is_sfdc_auto_slack": false, + "sso_provider": { + "type": "", + "name": "", + "label": "" + }, + "pay_prod_cur": "", + "locale": "" }, "error": "", "needed": "", diff --git a/json-logs/samples/api/usergroups.list.json b/json-logs/samples/api/usergroups.list.json index 6a9b892ff..382c2aa20 100644 --- a/json-logs/samples/api/usergroups.list.json +++ b/json-logs/samples/api/usergroups.list.json @@ -19,8 +19,7 @@ "updated_by": "U00000000", "prefs": { "channels": [ - "", - "C00000000" + "" ], "groups": [ "" @@ -37,7 +36,8 @@ "is_visible": false, "is_editing_restricted": false, "is_membership_locked": false, - "is_org_level": false + "is_org_level": false, + "deleted_by": "U00000000" } ], "error": "", diff --git a/json-logs/samples/api/users.conversations.json b/json-logs/samples/api/users.conversations.json index a5214d43e..f2edfcf47 100644 --- a/json-logs/samples/api/users.conversations.json +++ b/json-logs/samples/api/users.conversations.json @@ -89,6 +89,15 @@ "shared_ts": "0000000000.000000" }, "is_disabled": false + }, + { + "id": "", + "type": "", + "data": { + "file_id": "F00000000", + "shared_ts": "0000000000.000000" + }, + "label": "" } ], "tabz": [ @@ -101,6 +110,14 @@ "shared_ts": "0000000000.000000" }, "is_disabled": false + }, + { + "id": "", + "type": "", + "data": { + "file_id": "F00000000", + "shared_ts": "0000000000.000000" + } } ], "meeting_notes": { @@ -115,5 +132,6 @@ }, "error": "", "needed": "", - "provided": "" + "provided": "", + "arg": "" } \ No newline at end of file diff --git a/json-logs/samples/api/users.info.json b/json-logs/samples/api/users.info.json index ffbe4b438..71001e1c6 100644 --- a/json-logs/samples/api/users.info.json +++ b/json-logs/samples/api/users.info.json @@ -51,7 +51,8 @@ "display_url": "", "unicode": "" } - ] + ], + "start_date": "" }, "is_admin": false, "is_owner": false, diff --git a/json-logs/samples/api/users.list.json b/json-logs/samples/api/users.list.json index 68123e3d4..db873ad6e 100644 --- a/json-logs/samples/api/users.list.json +++ b/json-logs/samples/api/users.list.json @@ -53,7 +53,8 @@ "display_url": "", "unicode": "" } - ] + ], + "start_date": "" }, "is_admin": false, "is_owner": false, diff --git a/json-logs/samples/api/users.profile.get.json b/json-logs/samples/api/users.profile.get.json index 808d95f59..b2802cc56 100644 --- a/json-logs/samples/api/users.profile.get.json +++ b/json-logs/samples/api/users.profile.get.json @@ -48,7 +48,8 @@ "display_url": "", "unicode": "" } - ] + ], + "start_date": "" }, "error": "", "needed": "", diff --git a/json-logs/samples/audit/v1/actions.json b/json-logs/samples/audit/v1/actions.json index 54a9200ba..fd2e7b380 100644 --- a/json-logs/samples/audit/v1/actions.json +++ b/json-logs/samples/audit/v1/actions.json @@ -65,6 +65,9 @@ ], "list": [ "" + ], + "slack_first_crm": [ + "" ] }, "ok": false, diff --git a/json-logs/samples/scim/v1/Groups.json b/json-logs/samples/scim/v1/Groups.json index 6e89efa2e..68b893832 100644 --- a/json-logs/samples/scim/v1/Groups.json +++ b/json-logs/samples/scim/v1/Groups.json @@ -14,7 +14,7 @@ "displayName": "", "members": [ { - "value": "W00000000", + "value": "U00000000", "display": "" }, { diff --git a/json-logs/samples/scim/v1/Users.json b/json-logs/samples/scim/v1/Users.json index b57e1c88e..4faa134f0 100644 --- a/json-logs/samples/scim/v1/Users.json +++ b/json-logs/samples/scim/v1/Users.json @@ -39,6 +39,10 @@ } ], "photos": [ + { + "value": "https://www.example.com/", + "type": "" + }, { "value": "", "type": "" @@ -91,7 +95,13 @@ }, "urn:scim:schemas:extension:slack:guest:1.0": { "type": "", - "expiration": "" + "expiration": "", + "channels": [ + { + "value": "C00000000", + "display": "" + } + ] } } ], diff --git a/json-logs/samples/scim/v2/Groups.json b/json-logs/samples/scim/v2/Groups.json index cbbf5345a..8579d3d65 100644 --- a/json-logs/samples/scim/v2/Groups.json +++ b/json-logs/samples/scim/v2/Groups.json @@ -15,7 +15,7 @@ "displayName": "", "members": [ { - "value": "W00000000", + "value": "U00000000", "display": "" }, { diff --git a/json-logs/samples/scim/v2/Users.json b/json-logs/samples/scim/v2/Users.json index 59ecc9cd3..6f8bccaf4 100644 --- a/json-logs/samples/scim/v2/Users.json +++ b/json-logs/samples/scim/v2/Users.json @@ -81,10 +81,6 @@ "manager": {} }, "groups": [ - { - "value": "S00000000", - "display": "" - }, { "value": "", "display": "" @@ -92,7 +88,13 @@ ], "urn:ietf:params:scim:schemas:extension:slack:guest:2.0:User": { "type": "", - "expiration": "" + "expiration": "", + "channels": [ + { + "value": "C00000000", + "display": "" + } + ] } } ], diff --git a/slack-api-client/src/main/java/com/slack/api/methods/response/auth/AuthTestResponse.java b/slack-api-client/src/main/java/com/slack/api/methods/response/auth/AuthTestResponse.java index ec358cd82..02d6738e9 100644 --- a/slack-api-client/src/main/java/com/slack/api/methods/response/auth/AuthTestResponse.java +++ b/slack-api-client/src/main/java/com/slack/api/methods/response/auth/AuthTestResponse.java @@ -12,6 +12,7 @@ public class AuthTestResponse implements SlackApiTextResponse { private boolean ok; private String warning; private String error; + private String context; private String needed; private String provided; private transient Map> httpResponseHeaders; @@ -27,4 +28,4 @@ public class AuthTestResponse implements SlackApiTextResponse { private String appName; // only for app-level tokens private boolean isEnterpriseInstall; private Integer expiresIn; // only for tooling tokens -} \ No newline at end of file +} diff --git a/slack-api-client/src/main/java/com/slack/api/methods/response/rtm/RTMConnectResponse.java b/slack-api-client/src/main/java/com/slack/api/methods/response/rtm/RTMConnectResponse.java index d6e6e58f5..49fcced62 100644 --- a/slack-api-client/src/main/java/com/slack/api/methods/response/rtm/RTMConnectResponse.java +++ b/slack-api-client/src/main/java/com/slack/api/methods/response/rtm/RTMConnectResponse.java @@ -17,6 +17,7 @@ public class RTMConnectResponse implements SlackApiTextResponse { private boolean ok; private String warning; private String error; + private String context; private String needed; private String provided; private transient Map> httpResponseHeaders; diff --git a/slack-api-client/src/main/java/com/slack/api/scim/model/User.java b/slack-api-client/src/main/java/com/slack/api/scim/model/User.java index d5549e90d..6d6676bb3 100644 --- a/slack-api-client/src/main/java/com/slack/api/scim/model/User.java +++ b/slack-api-client/src/main/java/com/slack/api/scim/model/User.java @@ -169,6 +169,17 @@ private Types() { * possible values: ISO 8601 date time string (e.g., "2020-11-30T23:59:59Z") */ private String expiration; + + private List channels; + + @Data + @Builder + @NoArgsConstructor + @AllArgsConstructor + public static class Channel { + private String value; + private String display; + } } } diff --git a/slack-api-client/src/test/java/test_with_remote_apis/methods/usergroups_Test.java b/slack-api-client/src/test/java/test_with_remote_apis/methods/usergroups_Test.java index b6743b2f6..ef861178d 100644 --- a/slack-api-client/src/test/java/test_with_remote_apis/methods/usergroups_Test.java +++ b/slack-api-client/src/test/java/test_with_remote_apis/methods/usergroups_Test.java @@ -121,7 +121,9 @@ public void usergroups() throws Exception { .limit(3)); List userIds = new ArrayList<>(); for (User member : usersListResponse.getMembers()) { - userIds.add(member.getId()); + if (!member.isDeleted()) { + userIds.add(member.getId()); + } } UsergroupsUsersUpdateResponse response = slack.methods().usergroupsUsersUpdate(r -> r .token(userToken) diff --git a/slack-api-model/src/main/java/com/slack/api/model/ConversationProperties.java b/slack-api-model/src/main/java/com/slack/api/model/ConversationProperties.java index 990621d3d..a43d55152 100644 --- a/slack-api-model/src/main/java/com/slack/api/model/ConversationProperties.java +++ b/slack-api-model/src/main/java/com/slack/api/model/ConversationProperties.java @@ -22,6 +22,8 @@ public class ConversationProperties { private List tabs; private List tabz; private MeetingNotes meetingNotes; + private String useCase; + private List channelWorkflows; private Boolean isDormant; @Data @@ -103,4 +105,13 @@ public static class TabData { private String appId; private Boolean muteEditUpdates; } + + @Data + @Builder + @NoArgsConstructor + @AllArgsConstructor + public static class ChannelWorkflow { + private String workflowTriggerId; + private String title; + } } diff --git a/slack-api-model/src/main/java/com/slack/api/model/User.java b/slack-api-model/src/main/java/com/slack/api/model/User.java index 5e655368a..2d33d96a9 100644 --- a/slack-api-model/src/main/java/com/slack/api/model/User.java +++ b/slack-api-model/src/main/java/com/slack/api/model/User.java @@ -137,6 +137,8 @@ public static class Field { private String huddleState; // "default_unset" etc. private Long huddleStateExpirationTs; + private String startDate; + @Deprecated private String firstName; @Deprecated