AccessTokenInvalid and TokenExpired

eritpchy · eritpchy · commit ec1d6d53cf43 · 2023-05-25T14:57:14.000+08:00
Update QPS for list and downloadurl
open.aliyundrive.com =&gt; openapi.aliyundrive.com
bump version to 3.1.0
diff --git a/README.md b/README.md
@@ -146,18 +146,18 @@ implementation "com.squareup.okhttp3:logging-interceptor:3.12.13" //api19
 implementation "com.google.code.gson:gson:2.8.9"
 
 //主要
-implementation "net.xdow:aliyundrive-sdk-openapi:1.0.5"
-implementation "net.xdow:aliyundrive-sdk-webapi:1.0.5"
+implementation "net.xdow:aliyundrive-sdk-openapi:1.0.6"
+implementation "net.xdow:aliyundrive-sdk-webapi:1.0.6"
 
 //可选
-implementation "net.xdow:webdav:1.0.5"
-implementation "net.xdow:webdav-jakarta:1.0.5"
-implementation "net.xdow:webdav-javax:1.0.5"
-implementation "net.xdow:aliyundrive-webdav-internal:1.0.5"
-implementation "net.xdow:aliyundrive-android-core:1.0.5"
-implementation "net.xdow:jap-http:1.0.5"
-implementation "net.xdow:jap-http-jakarta-adapter:1.0.5"
-implementation "net.xdow:jap-http-javax-adapter:1.0.5"
+implementation "net.xdow:webdav:1.0.6"
+implementation "net.xdow:webdav-jakarta:1.0.6"
+implementation "net.xdow:webdav-javax:1.0.6"
+implementation "net.xdow:aliyundrive-webdav-internal:1.0.6"
+implementation "net.xdow:aliyundrive-android-core:1.0.6"
+implementation "net.xdow:jap-http:1.0.6"
+implementation "net.xdow:jap-http-jakarta-adapter:1.0.6"
+implementation "net.xdow:jap-http-javax-adapter:1.0.6"
 ```
 ## 基础用法
 ```java
diff --git a/aliyundrive-android-core/build.gradle b/aliyundrive-android-core/build.gradle
@@ -15,7 +15,7 @@ buildscript {
 apply plugin: 'com.android.library'
 
 group 'net.xdow'
-version '1.0.5'
+version '1.0.6'
 description 'AliyunDrive Webdav Android Core'
 
 repositories {
diff --git a/aliyundrive-sdk-openapi/build.gradle b/aliyundrive-sdk-openapi/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 group 'net.xdow'
-version '1.0.5'
+version '1.0.6'
 description 'AliyunDrive OpenApi SDK'
 
 java {
diff --git a/aliyundrive-sdk-openapi/src/main/java/net/xdow/aliyundrive/AliyunDriveConstant.java b/aliyundrive-sdk-openapi/src/main/java/net/xdow/aliyundrive/AliyunDriveConstant.java
@@ -5,7 +5,7 @@ public class AliyunDriveConstant {
     public static final int MAX_DOWNLOAD_URL_EXPIRE_TIME_SEC = 115200; //32h
     public static final int MAX_FILE_CREATE_PART_INFO_LIST_SIZE = 10000;
     public static final String REFERER = "https://www.aliyundrive.com/";
-    public static final String API_HOST = "https://open.aliyundrive.com";
+    public static final String API_HOST = "https://openapi.aliyundrive.com";
     public static final String API_ACCESS_TOKEN = API_HOST + "/oauth/access_token";
     public static final String API_QRCODE_GENERATE = API_HOST + "/oauth/authorize/qrcode";
     public static final String API_QRCODE_IMAGE = API_HOST + "/oauth/qrcode/%s";
diff --git a/aliyundrive-sdk-openapi/src/main/java/net/xdow/aliyundrive/impl/AliyunDriveOpenApiImplV1.java b/aliyundrive-sdk-openapi/src/main/java/net/xdow/aliyundrive/impl/AliyunDriveOpenApiImplV1.java
@@ -52,7 +52,7 @@ public Response intercept(Chain chain) throws IOException {
                             if (code == 401 || code == 400) {
                                 ResponseBody body = response.peekBody(40960);
                                 String res = body.string();
-                                if (res.contains("AccessTokenInvalid")) {
+                                if (res.contains("AccessTokenInvalid") || res.contains("TokenExpired")) {
                                     AliyunDriveOpenApiImplV1.this.requestNewAccessToken();
                                     return chain.proceed(AliyunDriveOpenApiImplV1.this.buildCommonRequestHeader(request));
                                 }
diff --git a/aliyundrive-sdk-openapi/src/main/java/net/xdow/aliyundrive/net/AliyunDriveCall.java b/aliyundrive-sdk-openapi/src/main/java/net/xdow/aliyundrive/net/AliyunDriveCall.java
@@ -68,6 +68,9 @@ public void checkAuthorize(T t) {
         if ("AccessTokenInvalid".equals(t.getCode())) {
             throw new NotAuthenticatedException(t.getMessage() + "(" + t.getCode() + ")");
         }
+        if ("TokenExpired".equals(t.getCode())) {
+            throw new NotAuthenticatedException(t.getMessage() + "(" + t.getCode() + ")");
+        }
     }
 
     public AliyunDriveCall<T> disableAuthorizeCheck() {
diff --git a/aliyundrive-sdk-openapi/src/main/java/net/xdow/aliyundrive/net/interceptor/AccessTokenInvalidInterceptor.java b/aliyundrive-sdk-openapi/src/main/java/net/xdow/aliyundrive/net/interceptor/AccessTokenInvalidInterceptor.java
@@ -24,7 +24,7 @@ public Response intercept(Chain chain) throws IOException {
             if (code == 401 || code == 400) {
                 ResponseBody body = response.peekBody(40960);
                 String res = body.string();
-                if (res.contains("AccessTokenInvalid")) {
+                if (res.contains("AccessTokenInvalid") || res.contains("TokenExpired")) {
                     listener.run();
                 }
             }
diff --git a/aliyundrive-sdk-webapi/build.gradle b/aliyundrive-sdk-webapi/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 group 'net.xdow'
-version '1.0.5'
+version '1.0.6'
 description 'AliyunDrive WebApi SDK'
 
 java {
diff --git a/aliyundrive-webdav-internal/build.gradle b/aliyundrive-webdav-internal/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 group 'net.xdow'
-version '1.0.5'
+version '1.0.6'
 description 'AliyunDrive Webdav internal'
 
 java {
diff --git a/aliyundrive-webdav-internal/src/main/java/com/github/zxbu/webdavteambition/config/AliyunDriveProperties.java b/aliyundrive-webdav-internal/src/main/java/com/github/zxbu/webdavteambition/config/AliyunDriveProperties.java
@@ -31,7 +31,7 @@ public class AliyunDriveProperties {
     private transient String clientId;
 
     private transient String authorizationCode;
-    private transient String aliyunAccessTokenUrl = "https://adrive.xdow.net/oauth/access_token?code=%s&refresh_token=%s&ver=1.0.5";
+    private transient String aliyunAccessTokenUrl = "https://adrive.xdow.net/oauth/access_token?code=%s&refresh_token=%s&ver=1.0.6";
     private transient String aliyunAuthorizeUrl = "https://adrive.xdow.net/oauth/authorize?redirect_uri=%s";
 
     private transient Auth auth = new Auth();
diff --git a/aliyundrive-webdav-internal/src/main/java/com/github/zxbu/webdavteambition/store/AliyunDriveClientService.java b/aliyundrive-webdav-internal/src/main/java/com/github/zxbu/webdavteambition/store/AliyunDriveClientService.java
@@ -138,7 +138,7 @@ private List<AliyunDriveFileInfo> fileListFromApi(String nodeId, String marker,
             if (res.isError()) {
                 if ("TooManyRequests".equals(res.getCode())) {
                     try {
-                        TimeUnit.SECONDS.sleep(6);
+                        TimeUnit.MILLISECONDS.sleep(300);
                     } catch (InterruptedException e) {
                     }
                     res = this.mAliyunDrive.fileList(query).execute();
@@ -147,7 +147,7 @@ private List<AliyunDriveFileInfo> fileListFromApi(String nodeId, String marker,
             if (res.isError()) {
                 if ("TooManyRequests".equals(res.getCode())) {
                     try {
-                        TimeUnit.SECONDS.sleep(6);
+                        TimeUnit.MILLISECONDS.sleep(300);
                     } catch (InterruptedException e) {
                     }
                     res = this.mAliyunDrive.fileList(query).execute();
@@ -468,7 +468,7 @@ private synchronized AliyunDriveResponse.FileGetDownloadUrlInfo fileGetDownloadU
         if (res.isError()) {
             if ("TooManyRequests".equals(res.getCode())) {
                 try {
-                    TimeUnit.SECONDS.sleep(6);
+                    TimeUnit.SECONDS.sleep(1);
                 } catch (InterruptedException e) {
                 }
                 res = this.mAliyunDrive.fileGetDownloadUrl(query).execute();
@@ -477,7 +477,7 @@ private synchronized AliyunDriveResponse.FileGetDownloadUrlInfo fileGetDownloadU
         if (res.isError()) {
             if ("TooManyRequests".equals(res.getCode())) {
                 try {
-                    TimeUnit.SECONDS.sleep(6);
+                    TimeUnit.SECONDS.sleep(1);
                 } catch (InterruptedException e) {
                 }
                 res = this.mAliyunDrive.fileGetDownloadUrl(query).execute();
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ plugins {
 }
 
 group 'com.github'
-version '3.0.8'
+version '3.1.0'
 sourceCompatibility = '17'
 
 configurations {
diff --git a/jap-http-adapter/jap-http-jakarta-adapter/build.gradle b/jap-http-adapter/jap-http-jakarta-adapter/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 group 'net.xdow'
-version '1.0.5'
+version '1.0.6'
 description 'jap-http servlet interface jakarta adapter'
 
 java {
diff --git a/jap-http-adapter/jap-http-javax-adapter/build.gradle b/jap-http-adapter/jap-http-javax-adapter/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 group 'net.xdow'
-version '1.0.5'
+version '1.0.6'
 description 'jap-http servlet interface javax adapter'
 
 java {
diff --git a/jap-http/build.gradle b/jap-http/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 group 'net.xdow'
-version '1.0.5'
+version '1.0.6'
 description 'jap-http servlet interface'
 
 java {
diff --git a/webdav-jakarta/build.gradle b/webdav-jakarta/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 group 'net.xdow'
-version '1.0.5'
+version '1.0.6'
 description 'AliyunDrive Webdav jakarta implement'
 
 java {
diff --git a/webdav-javax/build.gradle b/webdav-javax/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 group 'net.xdow'
-version '1.0.5'
+version '1.0.6'
 description 'AliyunDrive Webdav javax implement'
 
 java {
diff --git a/webdav/build.gradle b/webdav/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 group 'net.xdow'
-version '1.0.5'
+version '1.0.6'
 description 'AliyunDrive Webdav core'
 
 java {

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ plugins {`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`group 'net.xdow'`
`6`		`-version '1.0.5'`
	`6`	`+version '1.0.6'`
`7`	`7`	`description 'AliyunDrive OpenApi SDK'`
`8`	`8`
`9`	`9`	`java {`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public Response intercept(Chain chain) throws IOException {`
`52`	`52`	`if (code == 401 \|\| code == 400) {`
`53`	`53`	`ResponseBody body = response.peekBody(40960);`
`54`	`54`	`String res = body.string();`
`55`		`- if (res.contains("AccessTokenInvalid")) {`
	`55`	`+ if (res.contains("AccessTokenInvalid") \|\| res.contains("TokenExpired")) {`
`56`	`56`	`AliyunDriveOpenApiImplV1.this.requestNewAccessToken();`
`57`	`57`	`return chain.proceed(AliyunDriveOpenApiImplV1.this.buildCommonRequestHeader(request));`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,9 @@ public void checkAuthorize(T t) {`
`68`	`68`	`if ("AccessTokenInvalid".equals(t.getCode())) {`
`69`	`69`	`throw new NotAuthenticatedException(t.getMessage() + "(" + t.getCode() + ")");`
`70`	`70`	`}`
	`71`	`+ if ("TokenExpired".equals(t.getCode())) {`
	`72`	`+ throw new NotAuthenticatedException(t.getMessage() + "(" + t.getCode() + ")");`
	`73`	`+ }`
`71`	`74`	`}`
`72`	`75`
`73`	`76`	`public AliyunDriveCall<T> disableAuthorizeCheck() {`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public Response intercept(Chain chain) throws IOException {`
`24`	`24`	`if (code == 401 \|\| code == 400) {`
`25`	`25`	`ResponseBody body = response.peekBody(40960);`
`26`	`26`	`String res = body.string();`
`27`		`- if (res.contains("AccessTokenInvalid")) {`
	`27`	`+ if (res.contains("AccessTokenInvalid") \|\| res.contains("TokenExpired")) {`
`28`	`28`	`listener.run();`
`29`	`29`	`}`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ plugins {`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`group 'com.github'`
`9`		`-version '3.0.8'`
	`9`	`+version '3.1.0'`
`10`	`10`	`sourceCompatibility = '17'`
`11`	`11`
`12`	`12`	`configurations {`