Run all the integration tests - 2023-10-20 PT

Author: seratch

json-logs/raw/audit/v1/actions.json

@@ -166,7 +166,10 @@
       "apps_analytics_export_started",
       "apps_analytics_export_prepared",
       "pref.canvas_retention_changed",
-      "audit_logs_export_json_started"
+      "audit_logs_export_json_started",
+      "pref.atlas_profiles_access_changed",
+      "pref.atlas_org_charts_access_changed",
+      "pref.mobile_session_duration_changed"
     ],
     "user": [
       "custom_tos_accepted",

json-logs/samples/api/admin.apps.activities.list.json

@@ -32,15 +32,17 @@
           "type": "",
           "config": {
             "name": "",
-            "description": ""
+            "description": "",
+            "schema": {}
           },
           "trip_information": {
             "user_id": "W00000000",
             "channel_id": "C00000000"
           }
         },
         "channel_id": "C00000000",
-        "bot_user_id": "U00000000"
+        "bot_user_id": "U00000000",
+        "inputs": {}
       },
       "created": 12345,
       "trace_id": ""

json-logs/samples/api/admin.users.list.json

@@ -10,7 +10,11 @@
       "is_restricted": false,
       "is_ultra_restricted": false,
       "is_bot": false,
-      "expiration_ts": 12345
+      "expiration_ts": 12345,
+      "username": "",
+      "full_name": "",
+      "is_active": false,
+      "date_created": 12345
     }
   ],
   "response_metadata": {

json-logs/samples/api/conversations.list.json

@@ -62,7 +62,8 @@
             ""
           ],
           "user": [
-            "W00000000"
+            "W00000000",
+            "U00000000"
           ]
         },
         "threads_restricted_to": {

json-logs/samples/api/users.conversations.json

@@ -62,6 +62,9 @@
         "posting_restricted_to": {
           "type": [
             ""
+          ],
+          "user": [
+            "U00000000"
           ]
         },
         "huddles_restricted": false,

slack-api-client/src/main/java/com/slack/api/audit/Actions.java

@@ -127,6 +127,9 @@ private WorkspaceOrOrg() {
         public static final String pref_platform_beta_external_triggers_enabled = "pref.platform_beta_external_triggers_enabled";
         public static final String pref_two_factor_prevent_sms_changed = "pref.two_factor_prevent_sms_changed";
         public static final String pref_canvas_retention_changed = "pref.canvas_retention_changed";
+        public static final String pref_atlas_profiles_access_changed = "pref.atlas_profiles_access_changed";
+        public static final String pref_atlas_org_charts_access_changed = "pref.atlas_org_charts_access_changed";
+        public static final String pref_mobile_session_duration_changed = "pref.mobile_session_duration_changed";
         public static final String manual_export_downloaded = "manual_export_downloaded";
         public static final String manual_export_deleted = "manual_export_deleted";
         public static final String scheduled_export_downloaded = "scheduled_export_downloaded";

slack-api-client/src/main/java/com/slack/api/methods/response/admin/users/AdminUsersListResponse.java

@@ -25,6 +25,7 @@ public class AdminUsersListResponse implements SlackApiTextResponse {
     public static class User {
         private String id;
         private String email;
+        private String username;
         @SerializedName("is_admin")
         private boolean admin;
         @SerializedName("is_owner")

slack-api-client/src/test/java/util/sample_json_generation/JsonDataRecorder.java

@@ -464,7 +464,7 @@ private void scanToNormalizeValues(String path, JsonElement parent, String name,
                     }
                 }
             }
-        } else if (element.isJsonObject()) {
+        } else if (element != null && element.isJsonObject()) {
             if (name != null && name.equals("file")) {
                 if (path.startsWith("/audit/v1/schemas") || path.startsWith("/audit/v1/actions")) {
                     return;
@@ -493,6 +493,20 @@ private void scanToNormalizeValues(String path, JsonElement parent, String name,
                 }
                 return;
             }
+            if (name != null && name.equals("inputs") && path.equals("/api/admin.apps.activities.list")) {
+                JsonObject permissions = element.getAsJsonObject();
+                try {
+                    // To avoid concurrent modification of the underlying objects
+                    List<String> oldKeys = new ArrayList<>();
+                    permissions.keySet().iterator().forEachRemaining(oldKeys::add);
+                    for (String key : oldKeys) {
+                        permissions.remove(key);
+                    }
+
+                } catch (Exception e) {
+                    log.error(e.getMessage(), e);
+                }
+            }
             if (name != null && name.equals("bookmark")) {
                 if (path.startsWith("/audit/v1/schemas") || path.startsWith("/audit/v1/actions")) {
                     return;
@@ -724,7 +738,7 @@ private void scanToNormalizeValues(String path, JsonElement parent, String name,
                     e.printStackTrace();
                 }
             }
-        } else if (element.isJsonNull()) {
+        } else if (element == null || element.isJsonNull()) {
             return;
         } else if (!parent.isJsonArray() && element.isJsonPrimitive()) {
             JsonPrimitive prim = element.getAsJsonPrimitive();

slack-api-model/src/main/java/com/slack/api/model/admin/AppActivity.java

@@ -3,6 +3,7 @@
 import lombok.Data;
 
 import java.util.List;
+import java.util.Map;
 
 // See https://api.slack.com/methods/admin.apps.activities.list
 @Data
@@ -39,6 +40,8 @@ public static class Payload {
         private List<String> billingReason; // "uses_custom_function" etc.
         private Boolean isBillingExcluded;
         private Trigger trigger;
+        // TODO: complete typing for the value
+        private Map<String, Object> inputs;
     }
 
     @Data
@@ -53,6 +56,7 @@ public static class Trigger {
     public static class TriggerConfig {
         private String name;
         private String description;
+        private Object schema; // TODO: typing
     }
 
     @Data