From 41a2e7ec6b7d29e414d607643fdf13eec243a001 Mon Sep 17 00:00:00 2001
From: Kazuhiro Sera <seratch@gmail.com>
Date: Thu, 28 May 2020 08:22:24 +0900
Subject: [PATCH] Fix #474 by making redirect_uri optional

---
 .../com/slack/api/methods/impl/MethodsClientImpl.java     | 8 ++++++--
 .../src/test/java/test_locally/api/methods/OAuthTest.java | 7 +++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/slack-api-client/src/main/java/com/slack/api/methods/impl/MethodsClientImpl.java b/slack-api-client/src/main/java/com/slack/api/methods/impl/MethodsClientImpl.java
index 5ba4851db..f8430ce0c 100644
--- a/slack-api-client/src/main/java/com/slack/api/methods/impl/MethodsClientImpl.java
+++ b/slack-api-client/src/main/java/com/slack/api/methods/impl/MethodsClientImpl.java
@@ -1680,7 +1680,9 @@ public MpimOpenResponse mpimOpen(RequestConfigurator<MpimOpenRequest.MpimOpenReq
     public OAuthAccessResponse oauthAccess(OAuthAccessRequest req) throws IOException, SlackApiException {
         FormBody.Builder form = new FormBody.Builder();
         form.add("code", req.getCode());
-        form.add("redirect_uri", req.getRedirectUri());
+        if (req.getRedirectUri() != null) {
+            form.add("redirect_uri", req.getRedirectUri());
+        }
         form.add("single_channel", req.isSingleChannel() ? "1" : "0");
         String authorizationHeader = Credentials.basic(req.getClientId(), req.getClientSecret());
         return postFormWithAuthorizationHeaderAndParseResponse(form, endpointUrlPrefix + Methods.OAUTH_ACCESS, authorizationHeader, OAuthAccessResponse.class);
@@ -1695,7 +1697,9 @@ public OAuthAccessResponse oauthAccess(RequestConfigurator<OAuthAccessRequest.OA
     public OAuthV2AccessResponse oauthV2Access(OAuthV2AccessRequest req) throws IOException, SlackApiException {
         FormBody.Builder form = new FormBody.Builder();
         form.add("code", req.getCode());
-        form.add("redirect_uri", req.getRedirectUri());
+        if (req.getRedirectUri() != null) {
+            form.add("redirect_uri", req.getRedirectUri());
+        }
         String authorizationHeader = Credentials.basic(req.getClientId(), req.getClientSecret());
         return postFormWithAuthorizationHeaderAndParseResponse(form, endpointUrlPrefix + Methods.OAUTH_V2_ACCESS, authorizationHeader, OAuthV2AccessResponse.class);
     }
diff --git a/slack-api-client/src/test/java/test_locally/api/methods/OAuthTest.java b/slack-api-client/src/test/java/test_locally/api/methods/OAuthTest.java
index 33789709e..0b0a23165 100644
--- a/slack-api-client/src/test/java/test_locally/api/methods/OAuthTest.java
+++ b/slack-api-client/src/test/java/test_locally/api/methods/OAuthTest.java
@@ -41,6 +41,13 @@ public void test() throws Exception {
                 .isOk(), is(true));
     }
 
+    @Test
+    public void issue_474() throws Exception {
+        assertThat(slack.methods(ValidToken).oauthAccess(r -> r.clientId("abc").clientSecret("xyz").code("xxx")).isOk(), is(true));
+        assertThat(slack.methods(ValidToken).oauthToken(r -> r.clientId("abc").clientSecret("xyz").code("xxx")).isOk(), is(true));
+        assertThat(slack.methods(ValidToken).oauthV2Access(r -> r.clientId("abc").clientSecret("xyz").code("xxx")).isOk(), is(true));
+    }
+
     @Test
     public void test_async() throws Exception {
         assertThat(slack.methodsAsync(ValidToken).oauthAccess(r ->