Fix slackapi#1373 LogsResponse in AuditClient returns "ok: false" whe…

…n request was a success

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

@@ -323,7 +323,9 @@
       "external_shared_channel_invite_request_approved",
       "external_shared_channel_invite_request_denied",
       "channel_tab_added",
-      "channel_tab_removed"
+      "channel_tab_removed",
+      "external_shared_channel_host_transferred",
+      "channel_template_provisioned"
     ],
     "app": [
       "app_installed",
@@ -502,6 +504,11 @@
       "native_dlp_rule_reactivated",
       "native_dlp_rule_edited",
       "native_dlp_rule_action_applied"
+    ],
+    "template": [
+      "template_created",
+      "template_deleted",
+      "template_provisioned"
     ]
   }
 }

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

@@ -142,6 +142,13 @@
         "template_id": "string",
         "step_configuration": "vec\u003cdict\u003cstring, mixed\u003e\u003e"
       }
+    },
+    {
+      "type": "template",
+      "template": {
+        "id": "string",
+        "template_name": "string"
+      }
     }
   ]
 }

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

@@ -59,6 +59,9 @@
     ],
     "native_dlp": [
       ""
+    ],
+    "template": [
+      ""
     ]
   },
   "ok": false,

json-logs/samples/audit/v1/logs.json

@@ -1,5 +1,5 @@
 {
-  "ok": false,
+  "ok": true,
   "warning": "",
   "error": "",
   "needed": "",

json-logs/samples/audit/v1/schemas.json

@@ -84,6 +84,10 @@
         "updated_by": "",
         "step_configuration": "",
         "template_id": ""
+      },
+      "template": {
+        "id": "",
+        "template_name": ""
       }
     }
   ],

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

@@ -347,6 +347,8 @@ private Channel() {
         public static final String external_shared_channel_invite_request_denied = "external_shared_channel_invite_request_denied";
         public static final String channel_tab_added = "channel_tab_added";
         public static final String channel_tab_removed = "channel_tab_removed";
+        public static final String external_shared_channel_host_transferred = "external_shared_channel_host_transferred";
+        public static final String channel_template_provisioned = "channel_template_provisioned";
     }
 
     public static class App {
@@ -591,4 +593,13 @@ private NativeDlp() {
         public static final String native_dlp_rule_edited = "native_dlp_rule_edited";
         public static final String native_dlp_rule_action_applied = "native_dlp_rule_action_applied";
     }
+
+    public static class Template {
+        private Template() {
+        }
+
+        public static final String template_created = "template_created";
+        public static final String template_deleted = "template_deleted";
+        public static final String template_provisioned = "template_provisioned";
+    }
 }

slack-api-client/src/main/java/com/slack/api/audit/response/ActionsResponse.java

@@ -12,10 +12,15 @@
 public class ActionsResponse implements AuditApiResponse {
     private transient String rawBody;
 
-    private boolean ok;
+    @Deprecated // when an error is returned, it will be an exception instead
+    private boolean ok = true;
+    @Deprecated // when an error is returned, it will be an exception instead
     private String warning;
+    @Deprecated // when an error is returned, it will be an exception instead
     private String error;
+    @Deprecated // when an error is returned, it will be an exception instead
     private String needed;
+    @Deprecated // when an error is returned, it will be an exception instead
     private String provided;
 
     private Actions actions;
@@ -43,5 +48,6 @@ public static class Actions {
         private List<String> function;
         private List<String> salesElevate;
         private List<String> nativeDlp;
+        private List<String> template;
     }
 }

slack-api-client/src/main/java/com/slack/api/audit/response/LogsResponse.java

@@ -14,10 +14,15 @@
 public class LogsResponse implements AuditApiResponse {
     private transient String rawBody;
 
-    private boolean ok;
+    @Deprecated // when an error is returned, it will be an exception instead
+    private boolean ok = true;
+    @Deprecated // when an error is returned, it will be an exception instead
     private String warning;
+    @Deprecated // when an error is returned, it will be an exception instead
     private String error;
+    @Deprecated // when an error is returned, it will be an exception instead
     private String needed;
+    @Deprecated // when an error is returned, it will be an exception instead
     private String provided;
 
     private ResponseMetadata responseMetadata;

slack-api-client/src/main/java/com/slack/api/audit/response/SchemasResponse.java

@@ -11,10 +11,15 @@
 public class SchemasResponse implements AuditApiResponse {
     private transient String rawBody;
 
-    private boolean ok;
+    @Deprecated // when an error is returned, it will be an exception instead
+    private boolean ok = true;
+    @Deprecated // when an error is returned, it will be an exception instead
     private String warning;
+    @Deprecated // when an error is returned, it will be an exception instead
     private String error;
+    @Deprecated // when an error is returned, it will be an exception instead
     private String needed;
+    @Deprecated // when an error is returned, it will be an exception instead
     private String provided;
 
     private List<Schema> schemas;
@@ -36,6 +41,7 @@ public static class Schema {
         private Barrier barrier;
         private Canvas canvas;
         private WorkflowV2 workflowV2;
+        private Template template;
     }
 
     @Data
@@ -148,4 +154,10 @@ public static class WorkflowV2 {
         private String stepConfiguration;
         private String templateId;
     }
+
+    @Data
+    public static class Template {
+        private String id;
+        private String templateName;
+    }
 }

slack-api-client/src/test/java/test_with_remote_apis/audit/ApiTest.java

@@ -281,6 +281,12 @@ public void getActions_detectingNewOnes() throws IOException, AuditApiException
                 fail("Unknown action detected - " + action);
             }
         }
+        List<String> templateNames = getAllPublicStaticFieldValues(Actions.Template.class);
+        for (String action : actions.getTemplate()) {
+            if (!templateNames.contains(action)) {
+                fail("Unknown action detected - " + action);
+            }
+        }
     }
 
     @Test
@@ -329,6 +335,7 @@ public void getLogs_paginated() throws IOException, AuditApiException {
             );
             assertThat(cursor, not(equalTo(response.getResponseMetadata().getNextCursor())));
             assertThat(response, is(notNullValue()));
+            assertThat(response.isOk(), is(true));
         }
     }
 
@@ -368,6 +375,7 @@ static void verifyAllActions(String token, Class<?> clazz) throws Exception {
             try {
                 LogsResponse response = slack.auditAsync(token).getLogs(req -> req.limit(500).action(action)).get();
                 assertThat(response.getError(), is(nullValue()));
+                assertThat(response.isOk(), is(true));
             } catch (ExecutionException e) {
                 if (e.getCause() != null && e.getCause() instanceof AuditApiCompletionException) {
                     AuditApiCompletionException apiEx = ((AuditApiCompletionException) e.getCause());