refactor: solve the inconsistency of credentials refresh

aliyun · Jul 28, 2023 · 3578bf1 · 3578bf1
1 parent 9e05387
commit 3578bf1
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/java/pom.xml b/java/pom.xml
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>com.aliyun</groupId>
             <artifactId>credentials-java</artifactId>
-            <version>0.2.10</version>
+            <version>0.3.0</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.aliyun</groupId>
@@ -66,7 +66,7 @@
         <dependency>
             <groupId>com.aliyun</groupId>
             <artifactId>openapiutil</artifactId>
-            <version>0.2.0</version>
+            <version>0.2.1</version>
         </dependency>
         <dependency>
             <groupId>com.aliyun</groupId>

diff --git a/java/src/main/java/com/aliyun/teaopenapi/Client.java b/java/src/main/java/com/aliyun/teaopenapi/Client.java
@@ -780,14 +780,15 @@ public Client(com.aliyun.teaopenapi.models.Config config) throws Exception {
 
                 request_.headers.put("x-acs-content-sha256", hashedRequestPayload);
                 if (!com.aliyun.teautil.Common.equalString(params.authType, "Anonymous")) {
-                    String authType = this.getType();
+                    com.aliyun.credentials.models.CredentialModel credentialModel = _credential.getCredential();
+                    String authType = credentialModel.type;
                     if (com.aliyun.teautil.Common.equalString(authType, "bearer")) {
-                        String bearerToken = this.getBearerToken();
+                        String bearerToken = credentialModel.bearerToken;
                         request_.headers.put("x-acs-bearer-token", bearerToken);
                     } else {
-                        String accessKeyId = this.getAccessKeyId();
-                        String accessKeySecret = this.getAccessKeySecret();
-                        String securityToken = this.getSecurityToken();
+                        String accessKeyId = credentialModel.accessKeyId;
+                        String accessKeySecret = credentialModel.accessKeySecret;
+                        String securityToken = credentialModel.securityToken;
                         if (!com.aliyun.teautil.Common.empty(securityToken)) {
                             request_.headers.put("x-acs-accesskey-id", accessKeyId);
                             request_.headers.put("x-acs-security-token", securityToken);

diff --git a/main.tea b/main.tea
@@ -725,14 +725,15 @@ api doRequest(params: Params, request: OpenApiRequest, runtime: Util.RuntimeOpti
   __request.headers.x-acs-content-sha256 = hashedRequestPayload;
 
   if (!Util.equalString(params.authType, 'Anonymous')) {
-    var authType = getType();
+    var credentialModel = @credential.getCredential();
+    var authType = credentialModel.type;
     if (Util.equalString(authType, 'bearer')) {
-      var bearerToken = getBearerToken();
+      var bearerToken = credentialModel.bearerToken;
       __request.headers.x-acs-bearer-token = bearerToken;
     } else {
-      var accessKeyId = getAccessKeyId();
-      var accessKeySecret = getAccessKeySecret();
-      var securityToken = getSecurityToken();
+      var accessKeyId = credentialModel.accessKeyId;
+      var accessKeySecret = credentialModel.accessKeySecret;
+      var securityToken = credentialModel.securityToken;
 
       if (!Util.empty(securityToken)) {
         __request.headers.x-acs-accesskey-id = accessKeyId;