fix(token manager): exception when fetch token concurrently

xionghan.00 · xionghan.00 · commit 4e23a754d0a3 · 2020-02-04T14:03:23.000+08:00
diff --git a/appframework-sdk/pom.xml b/appframework-sdk/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>com.larksuite.appframework</groupId>
         <artifactId>appframework-parent</artifactId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
     </parent>
 
     <artifactId>appframework-sdk</artifactId>
diff --git a/appframework-sdk/src/main/java/com/larksuite/appframework/sdk/core/auth/AppTokenManager.java b/appframework-sdk/src/main/java/com/larksuite/appframework/sdk/core/auth/AppTokenManager.java
@@ -37,7 +37,7 @@ class AppTokenManager {
 
     private final Lock appAccessTokenFetchLock = new ReentrantLock();
 
-    private final Map<String, FutureTask<AppTenantAccessToken>> tenantTokenFetchFutureMap = new ConcurrentHashMap<>();
+    private final Map<String, FutureTask<?>> tenantTokenFetchFutureMap = new ConcurrentHashMap<>();
 
     public AppTokenManager(OpenApiClient openApiClient, App app, AppTicketStorage appTicketStorage) {
         this.app = app;
@@ -77,6 +77,8 @@ public void refreshAppAccessToken() {
             } finally {
                 appAccessTokenFetchLock.unlock();
             }
+
+            LoggerUtil.GLOBAL_LOGGER.debug("app access token refreshed for appId: {}", app.getAppId());
         } else {
             // if someone is already fetching token, we do nothing but wait for fetching done
             try {
@@ -88,7 +90,7 @@ public void refreshAppAccessToken() {
     }
 
     public void refreshTenantToken(String tenantKey) throws LarkClientException {
-        FutureTask<AppTenantAccessToken> doingTask = tenantTokenFetchFutureMap.get(tenantKey);
+        FutureTask<?> doingTask = tenantTokenFetchFutureMap.get(tenantKey);
 
         if (doingTask == null) {
 
@@ -100,6 +102,7 @@ public void refreshTenantToken(String tenantKey) throws LarkClientException {
                     }
 
                     if (appAccessToken == null || appAccessToken.isExpired()) {
+                        appAccessToken = null;
                         return null;
                     }
 
@@ -124,17 +127,29 @@ public void refreshTenantToken(String tenantKey) throws LarkClientException {
                 }
             };
 
-            FutureTask<AppTenantAccessToken> newTask = new FutureTask<>(() -> {
+            FutureTask<?> newTask = new FutureTask<Void>(() -> {
+                AppTenantAccessToken appTenantAccessToken;
                 // retry fetch tenant access token after refresh app access token
                 try {
-                    return c.call();
+                    appTenantAccessToken = c.call();
                 } catch (LarkClientException e) {
                     if (e.getCode() == LarkClientException.APP_ACCESS_TOKEN_INVALID) {
                         refreshAppAccessToken();
-                        return c.call();
+                        appTenantAccessToken =  c.call();
+                    } else {
+                        throw e;
                     }
-                    throw e;
                 }
+
+                if (appTenantAccessToken != null) {
+                    tenantTokenMap.put(tenantKey, appTenantAccessToken);
+                    LoggerUtil.GLOBAL_LOGGER.debug("tenant access token refreshed for appId: {}, tenantKey: {}", app.getAppId(), tenantKey);
+                } else {
+                    LoggerUtil.GLOBAL_LOGGER.error("tenant access token refreshed failed for appId: {}, tenantKey: {}", app.getAppId(), tenantKey);
+                }
+
+                return null;
+
             });
 
             doingTask = tenantTokenFetchFutureMap.putIfAbsent(tenantKey, newTask);
@@ -144,11 +159,8 @@ public void refreshTenantToken(String tenantKey) throws LarkClientException {
                 newTask.run();
 
                 try {
-                    AppTenantAccessToken appTenantAccessToken = newTask.get();
-                    if (appTenantAccessToken != null) {
-                        LoggerUtil.GLOBAL_LOGGER.debug("token refreshed for appId: {}, tenantKey: {}", app.getAppId(), tenantKey);
-                        tenantTokenMap.put(tenantKey, appTenantAccessToken);
-                    }
+                    newTask.get();
+
                 } catch (InterruptedException e) {
                     // wont happen here
                 } catch (ExecutionException e) {
@@ -168,6 +180,8 @@ public void refreshTenantToken(String tenantKey) throws LarkClientException {
         try {
             // others doing the task, wait for it done
             doingTask.get();
+            LoggerUtil.GLOBAL_LOGGER.debug("wait for refreshed for appId: {}, tenantKey: {},  done.", app.getAppId(), tenantKey);
+
         } catch (InterruptedException e) {
             LoggerUtil.GLOBAL_LOGGER.error("refreshTenantToken InterruptedException ", e);
         } catch (ExecutionException e) {
diff --git a/appframework-sdk/src/main/java/com/larksuite/appframework/sdk/utils/LoggerUtil.java b/appframework-sdk/src/main/java/com/larksuite/appframework/sdk/utils/LoggerUtil.java
@@ -11,5 +11,5 @@
 
 public class LoggerUtil {
 
-    public static final Logger GLOBAL_LOGGER = LoggerFactory.getLogger("botframework");
+    public static final Logger GLOBAL_LOGGER = LoggerFactory.getLogger("appframework");
 }
diff --git a/appframework-spring-boot-starter/pom.xml b/appframework-spring-boot-starter/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.larksuite.appframework</groupId>
         <artifactId>appframework-parent</artifactId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/pom.xml b/pom.xml
@@ -13,7 +13,7 @@
     <groupId>com.larksuite.appframework</groupId>
     <artifactId>appframework-parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
     <name>larksuite-appframework-sdk-java</name>
     <url>https://open.larksuite.com/</url>
 
@@ -24,7 +24,7 @@
 
 
     <properties>
-        <appframework.version>1.0.1</appframework.version>
+        <appframework.version>1.0.2</appframework.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
     </properties>
@@ -87,6 +87,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
@@ -102,6 +103,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
+                <version>3.2.1</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>

Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,5 @@`
`11`	`11`
`12`	`12`	`public class LoggerUtil {`
`13`	`13`
`14`		`- public static final Logger GLOBAL_LOGGER = LoggerFactory.getLogger("botframework");`
	`14`	`+ public static final Logger GLOBAL_LOGGER = LoggerFactory.getLogger("appframework");`
`15`	`15`	`}`