Merge pull request #427 from seratch/issue-426

Fix #426 url_verification request fails with bolt-micronaut

Author: seratch

bolt-micronaut/src/main/java/com/slack/api/bolt/micronaut/SlackAppController.java

@@ -9,8 +9,6 @@
 import io.micronaut.http.annotation.Controller;
 import io.micronaut.http.annotation.Post;
 
-import java.util.LinkedHashMap;
-
 /**
  * The default Web controller that works in Micronaut apps.
  * This component requires singleton {@link App} instance managed by the Micronaut DI container.
@@ -30,7 +28,7 @@ public SlackAppController(App slackApp, SlackAppMicronautAdapter adapter) {
     }
 
     @Post(value = "/events", consumes = {MediaType.APPLICATION_FORM_URLENCODED, MediaType.APPLICATION_JSON})
-    public HttpResponse<String> dispatch(HttpRequest<String> request, @Body LinkedHashMap<String, String> body) throws Exception {
+    public HttpResponse<String> dispatch(HttpRequest<String> request, @Body String body) throws Exception {
         Request<?> slackRequest = adapter.toSlackRequest(request, body);
         return adapter.toMicronautResponse(slackApp.run(slackRequest));
     }

bolt-micronaut/src/main/java/com/slack/api/bolt/micronaut/SlackAppMicronautAdapter.java

@@ -13,14 +13,10 @@
 import lombok.extern.slf4j.Slf4j;
 
 import javax.inject.Singleton;
-import java.io.UnsupportedEncodingException;
 import java.net.InetSocketAddress;
-import java.net.URLEncoder;
 import java.util.Collections;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * The default adaptor that translates Micronaut specific interfaces into Bolt's ones.
@@ -36,16 +32,7 @@ public SlackAppMicronautAdapter(AppConfig appConfig) {
         this.requestParser = new SlackRequestParser(appConfig);
     }
 
-    public Request<?> toSlackRequest(HttpRequest<?> req, LinkedHashMap<String, String> body) {
-        String requestBody = body.entrySet().stream().map(e -> {
-            try {
-                String k = URLEncoder.encode(e.getKey(), "UTF-8");
-                String v = URLEncoder.encode(e.getValue(), "UTF-8");
-                return k + "=" + v;
-            } catch (UnsupportedEncodingException ex) {
-                return e.getKey() + "=" + e.getValue();
-            }
-        }).collect(Collectors.joining("&"));
+    public Request<?> toSlackRequest(HttpRequest<?> req, String requestBody) {
         RequestHeaders headers = new RequestHeaders(
                 req.getHeaders() != null ? req.getHeaders().asMap() : Collections.emptyMap());
 

bolt-micronaut/src/test/java/example/app/AppFactory.java

@@ -1,10 +1,10 @@
 package example.app;
 
-import com.slack.api.bolt.App;
-import com.slack.api.bolt.AppConfig;
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
+import com.slack.api.bolt.App;
+import com.slack.api.bolt.AppConfig;
 import io.micronaut.context.annotation.Factory;
 
 import javax.inject.Singleton;

bolt-micronaut/src/test/java/test_locally/AdapterTest.java

@@ -7,15 +7,16 @@
 import io.micronaut.core.convert.DefaultConversionService;
 import io.micronaut.http.HttpRequest;
 import io.micronaut.http.HttpResponse;
-import io.micronaut.http.MediaType;
 import io.micronaut.http.simple.SimpleHttpHeaders;
 import io.micronaut.http.simple.SimpleHttpParameters;
 import org.junit.Test;
 
-import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -39,11 +40,7 @@ public void toSlackRequest() {
         SimpleHttpParameters parameters = new SimpleHttpParameters(params, new DefaultConversionService());
         when(req.getParameters()).thenReturn(parameters);
 
-        LinkedHashMap<String, String> body = new LinkedHashMap<>();
-        body.put("token", "random");
-        body.put("ssl_check", "1");
-
-        Request<?> slackRequest = adapter.toSlackRequest(req, body);
+        Request<?> slackRequest = adapter.toSlackRequest(req, "token=random&ssl_check=1");
 
         assertNotNull(slackRequest);
         assertEquals("token=random&ssl_check=1", slackRequest.getRequestBodyAsString());
@@ -61,11 +58,7 @@ public void toSlackRequest_with_remote_address() throws UnknownHostException {
         InetSocketAddress isa = new InetSocketAddress("localhost", 443);
         when(req.getRemoteAddress()).thenReturn(isa);
 
-        LinkedHashMap<String, String> body = new LinkedHashMap<>();
-        body.put("token", "random");
-        body.put("ssl_check", "1");
-
-        Request<?> slackRequest = adapter.toSlackRequest(req, body);
+        Request<?> slackRequest = adapter.toSlackRequest(req, "token=random&ssl_check=1");
 
         assertNotNull(slackRequest);
         assertEquals("127.0.0.1", slackRequest.getClientIpAddress());

bolt-micronaut/src/test/java/test_locally/ControllerTest.java

@@ -12,7 +12,6 @@
 import org.junit.Test;
 
 import java.util.HashMap;
-import java.util.LinkedHashMap;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -33,11 +32,7 @@ public void test() throws Exception {
         SimpleHttpParameters parameters = new SimpleHttpParameters(new HashMap<>(), new DefaultConversionService());
         when(req.getParameters()).thenReturn(parameters);
 
-        LinkedHashMap<String, String> body = new LinkedHashMap<>();
-        body.put("token", "random");
-        body.put("ssl_check", "1");
-
-        HttpResponse<String> response = controller.dispatch(req, body);
+        HttpResponse<String> response = controller.dispatch(req, "token=random&ssl_check=1");
         assertEquals(200, response.getStatus().getCode());
     }
 

bolt-micronaut/src/test/java/test_locally/app/CommandsTest.java

@@ -1,12 +1,12 @@
 package test_locally.app;
 
-import com.slack.api.Slack;
 import com.slack.api.RequestConfigurator;
+import com.slack.api.Slack;
+import com.slack.api.app_backend.SlackSignature;
+import com.slack.api.bolt.AppConfig;
 import com.slack.api.methods.MethodsClient;
 import com.slack.api.methods.SlackApiException;
 import com.slack.api.methods.response.auth.AuthTestResponse;
-import com.slack.api.app_backend.SlackSignature;
-import com.slack.api.bolt.AppConfig;
 import io.micronaut.context.annotation.Primary;
 import io.micronaut.http.HttpRequest;
 import io.micronaut.http.HttpResponse;