refactor: solve the inconsistency of credentials refresh

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

Hide file tree

Showing 5 changed files with 24 additions and 37 deletions.
diff --git a/golang/client/client.go b/golang/client/client.go
@@ -1345,34 +1345,19 @@ func (client *Client) DoRequest(params *Params, request *OpenApiRequest, runtime
 
 			request_.Headers["x-acs-content-sha256"] = hashedRequestPayload
 			if !tea.BoolValue(util.EqualString(params.AuthType, tea.String("Anonymous"))) {
-				authType, _err := client.GetType()
+				credentialModel, _err := client.Credential.GetCredential()
 				if _err != nil {
 					return _result, _err
 				}
 
+				authType := credentialModel.Type
 				if tea.BoolValue(util.EqualString(authType, tea.String("bearer"))) {
-					bearerToken, _err := client.GetBearerToken()
-					if _err != nil {
-						return _result, _err
-					}
-
+					bearerToken := credentialModel.BearerToken
 					request_.Headers["x-acs-bearer-token"] = bearerToken
 				} else {
-					accessKeyId, _err := client.GetAccessKeyId()
-					if _err != nil {
-						return _result, _err
-					}
-
-					accessKeySecret, _err := client.GetAccessKeySecret()
-					if _err != nil {
-						return _result, _err
-					}
-
-					securityToken, _err := client.GetSecurityToken()
-					if _err != nil {
-						return _result, _err
-					}
-
+					accessKeyId := credentialModel.AccessKeyId
+					accessKeySecret := credentialModel.AccessKeySecret
+					securityToken := credentialModel.SecurityToken
 					if !tea.BoolValue(util.Empty(securityToken)) {
 						request_.Headers["x-acs-accesskey-id"] = accessKeyId
 						request_.Headers["x-acs-security-token"] = securityToken

diff --git a/golang/go.mod b/golang/go.mod
@@ -5,10 +5,10 @@ go 1.14
 require (
 	github.com/alibabacloud-go/alibabacloud-gateway-spi v0.0.4
 	github.com/alibabacloud-go/openapi-util v0.1.0
-	github.com/alibabacloud-go/tea v1.1.20
-	github.com/alibabacloud-go/tea-utils/v2 v2.0.1
-	github.com/alibabacloud-go/tea-xml v1.1.2
-	github.com/aliyun/credentials-go v1.2.6
+	github.com/alibabacloud-go/tea v1.2.1
+	github.com/alibabacloud-go/tea-utils/v2 v2.0.4
+	github.com/alibabacloud-go/tea-xml v1.1.3
+	github.com/aliyun/credentials-go v1.3.1
 	github.com/clbanning/mxj/v2 v2.5.5 // indirect
 	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
 )
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;