Fix a bug where DetailedLoggingListener does not print text request body (#999)

Author: seratch

slack-api-client/src/main/java/com/slack/api/methods/impl/MethodsClientImpl.java

@@ -3173,7 +3173,7 @@ protected <T extends SlackApiTextResponse> T postMultipartAndParseResponse(
                 metricsDatastore.addToLastMinuteRequests(executorName, teamId, methodName, System.currentTimeMillis());
             }
             Response response = runPostMultipart(form, methodName, token);
-            T apiResponse = parseJsonResponseAndRunListeners(teamId, methodName, response, clazz);
+            T apiResponse = parseJsonResponseAndRunListeners(teamId, methodName, response, clazz, true);
             return apiResponse;
 
         } catch (IOException e) {
@@ -3221,7 +3221,18 @@ <T extends SlackApiTextResponse> T parseJsonResponseAndRunListeners(
             String teamId,
             String methodName,
             Response response,
-            Class<T> clazz) throws IOException, SlackApiException {
+            Class<T> clazz
+    ) throws IOException, SlackApiException {
+        return parseJsonResponseAndRunListeners(teamId, methodName, response, clazz, false);
+    }
+
+    <T extends SlackApiTextResponse> T parseJsonResponseAndRunListeners(
+            String teamId,
+            String methodName,
+            Response response,
+            Class<T> clazz,
+            boolean isRequestBodyBinary
+            ) throws IOException, SlackApiException {
         String body = response.body().string();
         if (response.isSuccessful()) {
             try {
@@ -3236,7 +3247,7 @@ <T extends SlackApiTextResponse> T parseJsonResponseAndRunListeners(
                 apiResponse.setHttpResponseHeaders(toLowerCasedKeyMap(response.headers()));
                 return apiResponse;
             } finally {
-                slackHttpClient.runHttpResponseListeners(response, body);
+                slackHttpClient.runHttpResponseListeners(response, body, isRequestBodyBinary);
             }
         } else {
             throw new SlackApiException(slackHttpClient.getConfig(), response, body);

slack-api-client/src/main/java/com/slack/api/util/http/SlackHttpClient.java

@@ -253,7 +253,11 @@ private String toCamelCaseJsonString(Object obj) {
     }
 
     public void runHttpResponseListeners(Response response, String body) {
-        HttpResponseListener.State state = new HttpResponseListener.State(config, response, body);
+        runHttpResponseListeners(response, body, false);
+    }
+
+    public void runHttpResponseListeners(Response response, String body, boolean isRequestBodyBinary) {
+        HttpResponseListener.State state = new HttpResponseListener.State(config, response, body, isRequestBodyBinary);
         for (HttpResponseListener responseListener : config.getHttpClientResponseHandlers()) {
             responseListener.accept(state);
         }

slack-api-client/src/main/java/com/slack/api/util/http/listener/DetailedLoggingListener.java

@@ -47,23 +47,16 @@ public void accept(State state) {
 
             String textRequestBody = null;
             try {
-                String contentType = "";
-                if (requestBodyObj.contentType() != null
-                    && requestBodyObj.contentType().type() != null
-                ) {
-                    contentType = requestBodyObj.contentType().type().toLowerCase(Locale.ENGLISH);
-                }
-                if (contentType.equals("application/json") ||
-                        contentType.equals("text/html")) {
+                if (state.isRequestBodyBinary()) {
+                    textRequestBody = "(binary)";
+                } else {
                     textRequestBody = requestBody.buffer().readUtf8();
                     if (!state.getConfig().isLibraryMaintainerMode()) {
                         if (textRequestBody.contains("refresh_token=")) {
                             textRequestBody = textRequestBody.replaceFirst(
                                     "refresh_token=[^\\&]+", "refresh_token=(redacted)");
                         }
                     }
-                } else {
-                    textRequestBody = "(binary)";
                 }
             } catch (Exception e) {
                 log.debug("Failed to read request body because {}, error: {}", e.getMessage(), e.getClass().getCanonicalName());

slack-api-client/src/main/java/com/slack/api/util/http/listener/HttpResponseListener.java

@@ -18,9 +18,14 @@ public abstract class HttpResponseListener implements Consumer<HttpResponseListe
     @AllArgsConstructor
     @Data
     public static class State {
+        public State(SlackConfig config, Response response, String parsedResponseBody) {
+            this(config, response, parsedResponseBody, false);
+        }
+
         private SlackConfig config;
         private Response response;
         private String parsedResponseBody;
+        private boolean requestBodyBinary;
     }
 
 }