Merge pull request #455 from seratch/no-team-no-redirect-uri

Update OAuth flow to complete with some cases

Author: seratch

bolt/src/main/java/com/slack/api/bolt/service/builtin/oauth/default_impl/OAuthV2DefaultSuccessHandler.java

@@ -30,7 +30,10 @@ public Response handle(OAuthCallbackRequest request, Response response, OAuthV2A
         if (o.getEnterprise() != null) {
             context.setEnterpriseId(o.getEnterprise().getId());
         }
-        context.setTeamId(o.getTeam().getId());
+        // "team" can be null for org-level installation
+        String teamId = o.getTeam() != null ? o.getTeam().getId() : null;
+        String teamName = o.getTeam() != null ? o.getTeam().getName() : null;
+        context.setTeamId(teamId);
         context.setBotUserId(o.getBotUserId());
         context.setBotToken(o.getAccessToken());
         context.setRequestUserId(o.getAuthedUser().getId());
@@ -40,8 +43,8 @@ public Response handle(OAuthCallbackRequest request, Response response, OAuthV2A
                 .botUserId(o.getBotUserId())
                 .botAccessToken(o.getAccessToken())
                 .enterpriseId(o.getEnterprise() != null ? o.getEnterprise().getId() : null)
-                .teamId(o.getTeam().getId())
-                .teamName(o.getTeam().getName())
+                .teamId(teamId)
+                .teamName(teamName)
                 .scope(o.getScope())
                 .botScope(o.getScope())
                 .installedAt(System.currentTimeMillis());

codecov.yml

@@ -3,3 +3,7 @@ coverage:
     project:
       default:
         threshold: 0.3%
+    patch:
+      default:
+        target: 50%
+

slack-app-backend/src/main/java/com/slack/api/app_backend/oauth/OAuthFlowOperator.java

@@ -22,21 +22,25 @@ public OAuthFlowOperator(Slack slack, SlackAppConfig config) {
     }
 
     public OAuthAccessResponse callOAuthAccessMethod(VerificationCodePayload payload) throws IOException, SlackApiException {
-        return slack.methods().oauthAccess(OAuthAccessRequest.builder()
+        OAuthAccessRequest.OAuthAccessRequestBuilder apiRequest = OAuthAccessRequest.builder()
                 .clientId(config.getClientId())
                 .clientSecret(config.getClientSecret())
-                .code(payload.getCode())
-                .redirectUri(config.getRedirectUri())
-                .build());
+                .code(payload.getCode());
+        if (config.getRedirectUri() != null) {
+            apiRequest = apiRequest.redirectUri(config.getRedirectUri());
+        }
+        return slack.methods().oauthAccess(apiRequest.build());
     }
 
     public OAuthV2AccessResponse callOAuthV2AccessMethod(VerificationCodePayload payload) throws IOException, SlackApiException {
-        return slack.methods().oauthV2Access(OAuthV2AccessRequest.builder()
+        OAuthV2AccessRequest.OAuthV2AccessRequestBuilder apiRequest = OAuthV2AccessRequest.builder()
                 .clientId(config.getClientId())
                 .clientSecret(config.getClientSecret())
-                .code(payload.getCode())
-                .redirectUri(config.getRedirectUri())
-                .build());
+                .code(payload.getCode());
+        if (config.getRedirectUri() != null) {
+            apiRequest = apiRequest.redirectUri(config.getRedirectUri());
+        }
+        return slack.methods().oauthV2Access(apiRequest.build());
     }
 
 }