Fix #887 by skipping to create team_id cache data for metrics (#888)

Author: seratch

bolt-servlet/src/test/java/samples/OpenIDConnectSample.java

@@ -49,6 +49,10 @@ public static void main(String[] args) throws Exception {
                     OpenIDConnectUserInfoResponse userInfo = teamIdWiredClient.openIDConnectUserInfo(r -> r
                             .token(refreshedToken.getAccessToken()));
                     logger.info("userInfo: {}", userInfo);
+
+                    // To revoke this, you can use auth.revoke API method
+                    // Slack.getInstance().methods().authRevoke(r -> r.token(refreshedToken.getAccessToken()));
+
                 } else {
                     OpenIDConnectUserInfoResponse userInfo = client.openIDConnectUserInfo(r -> r
                             .token(token.getAccessToken()));

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

@@ -13,6 +13,8 @@
 import java.util.Map;
 import java.util.concurrent.*;
 
+import static com.slack.api.methods.impl.TeamIdCache.METHOD_NAMES_TO_SKIP_TEAM_ID_CACHE_RESOLUTION;
+
 @Slf4j
 public class AsyncRateLimitExecutor {
 
@@ -60,7 +62,9 @@ public <T extends SlackApiResponse> CompletableFuture<T> execute(
             Map<String, String> params,
             AsyncExecutionSupplier<T> methodsSupplier) {
         String token = params.get("token");
-        final String teamId = token != null ? teamIdCache.lookupOrResolve(token) : null;
+        final String teamId = (token != null
+                && !METHOD_NAMES_TO_SKIP_TEAM_ID_CACHE_RESOLUTION.contains(methodName)) ?
+                teamIdCache.lookupOrResolve(token) : null;
         final ExecutorService executorService = teamId != null ? ThreadPools.getOrCreate(config, teamId) : ThreadPools.getDefault(config);
         return CompletableFuture.supplyAsync(() -> {
             if (NO_TOKEN_METHOD_NAMES.contains(methodName) || teamId == null) {

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

@@ -219,6 +219,7 @@
 
 import static com.slack.api.methods.RequestFormBuilder.toForm;
 import static com.slack.api.methods.RequestFormBuilder.toMultipartBody;
+import static com.slack.api.methods.impl.TeamIdCache.METHOD_NAMES_TO_SKIP_TEAM_ID_CACHE_RESOLUTION;
 
 @Slf4j
 public class MethodsClientImpl implements MethodsClient {
@@ -3022,7 +3023,8 @@ protected Response postFormWithToken(
             String methodName,
             String token) throws IOException {
         String teamId = this.teamId.orElse(null);
-        if (statsEnabled && teamId == null) {
+        if (statsEnabled && teamId == null
+                && !METHOD_NAMES_TO_SKIP_TEAM_ID_CACHE_RESOLUTION.contains(methodName)) {
             teamId = teamIdCache.lookupOrResolve(token);
         }
         try {
@@ -3047,7 +3049,8 @@ protected <T extends SlackApiTextResponse> T postFormWithTokenAndParseResponse(
             String token,
             Class<T> clazz) throws IOException, SlackApiException {
         String teamId = this.teamId.orElse(null);
-        if (statsEnabled && teamId == null) {
+        if (statsEnabled && teamId == null
+                && !METHOD_NAMES_TO_SKIP_TEAM_ID_CACHE_RESOLUTION.contains(methodName)) {
             teamId = teamIdCache.lookupOrResolve(token);
         }
         try {
@@ -3089,7 +3092,8 @@ protected <T extends SlackApiTextResponse> T postMultipartAndParseResponse(
             String token,
             Class<T> clazz) throws IOException, SlackApiException {
         String teamId = this.teamId.orElse(null);
-        if (statsEnabled && teamId == null) {
+        if (statsEnabled && teamId == null
+                && !METHOD_NAMES_TO_SKIP_TEAM_ID_CACHE_RESOLUTION.contains(methodName)) {
             teamId = teamIdCache.lookupOrResolve(token);
         }
         try {

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

@@ -9,6 +9,8 @@
 import okhttp3.Response;
 
 import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.function.Function;
@@ -18,6 +20,14 @@
 @Slf4j
 public class TeamIdCache {
 
+    // As the tokens issued for "Sign in with Slack" does not work with auth.test API method,
+    // we skip creating team_id cache for these API methods.
+    public static final List<String> METHOD_NAMES_TO_SKIP_TEAM_ID_CACHE_RESOLUTION = Arrays.asList(
+            "auth.revoke",
+            "openid.connect.token",
+            "openid.connect.userInfo"
+    );
+
     private static final ConcurrentMap<String, String> TOKEN_TO_TEAM_ID = new ConcurrentHashMap<>();
 
     private final MethodsClientImpl methodsImpl;