diff --git a/csharp/core/Client.cs b/csharp/core/Client.cs index 3fee618..bddb278 100644 --- a/csharp/core/Client.cs +++ b/csharp/core/Client.cs @@ -264,18 +264,19 @@ public Dictionary DoRPCRequest(string action, string version, st } if (!AlibabaCloud.TeaUtil.Common.EqualString(authType, "Anonymous")) { - string credentialType = GetType(); + Aliyun.Credentials.Models.CredentialModel credentialModel = this._credential.GetCredential(); + string credentialType = credentialModel.Type; if (AlibabaCloud.TeaUtil.Common.EqualString(credentialType, "bearer")) { - string bearerToken = GetBearerToken(); + string bearerToken = credentialModel.BearerToken; request_.Query["BearerToken"] = bearerToken; request_.Query["SignatureType"] = "BEARERTOKEN"; } else { - string accessKeyId = GetAccessKeyId(); - string accessKeySecret = GetAccessKeySecret(); - string securityToken = GetSecurityToken(); + string accessKeyId = credentialModel.AccessKeyId; + string accessKeySecret = credentialModel.AccessKeySecret; + string securityToken = credentialModel.SecurityToken; if (!AlibabaCloud.TeaUtil.Common.Empty(securityToken)) { request_.Query["SecurityToken"] = securityToken; @@ -535,18 +536,19 @@ public async Task> DoRPCRequestAsync(string action, s } if (!AlibabaCloud.TeaUtil.Common.EqualString(authType, "Anonymous")) { - string credentialType = await GetTypeAsync(); + Aliyun.Credentials.Models.CredentialModel credentialModel = await this._credential.GetCredentialAsync(); + string credentialType = credentialModel.Type; if (AlibabaCloud.TeaUtil.Common.EqualString(credentialType, "bearer")) { - string bearerToken = await GetBearerTokenAsync(); + string bearerToken = credentialModel.BearerToken; request_.Query["BearerToken"] = bearerToken; request_.Query["SignatureType"] = "BEARERTOKEN"; } else { - string accessKeyId = await GetAccessKeyIdAsync(); - string accessKeySecret = await GetAccessKeySecretAsync(); - string securityToken = await GetSecurityTokenAsync(); + string accessKeyId = credentialModel.AccessKeyId; + string accessKeySecret = credentialModel.AccessKeySecret; + string securityToken = credentialModel.SecurityToken; if (!AlibabaCloud.TeaUtil.Common.Empty(securityToken)) { request_.Query["SecurityToken"] = securityToken; @@ -789,18 +791,19 @@ public Dictionary DoROARequest(string action, string version, st } if (!AlibabaCloud.TeaUtil.Common.EqualString(authType, "Anonymous")) { - string credentialType = GetType(); + Aliyun.Credentials.Models.CredentialModel credentialModel = this._credential.GetCredential(); + string credentialType = credentialModel.Type; if (AlibabaCloud.TeaUtil.Common.EqualString(credentialType, "bearer")) { - string bearerToken = GetBearerToken(); + string bearerToken = credentialModel.BearerToken; request_.Headers["x-acs-bearer-token"] = bearerToken; request_.Headers["x-acs-signature-type"] = "BEARERTOKEN"; } else { - string accessKeyId = GetAccessKeyId(); - string accessKeySecret = GetAccessKeySecret(); - string securityToken = GetSecurityToken(); + string accessKeyId = credentialModel.AccessKeyId; + string accessKeySecret = credentialModel.AccessKeySecret; + string securityToken = credentialModel.SecurityToken; if (!AlibabaCloud.TeaUtil.Common.Empty(securityToken)) { request_.Headers["x-acs-accesskey-id"] = accessKeyId; @@ -1040,18 +1043,19 @@ public async Task> DoROARequestAsync(string action, s } if (!AlibabaCloud.TeaUtil.Common.EqualString(authType, "Anonymous")) { - string credentialType = await GetTypeAsync(); + Aliyun.Credentials.Models.CredentialModel credentialModel = await this._credential.GetCredentialAsync(); + string credentialType = credentialModel.Type; if (AlibabaCloud.TeaUtil.Common.EqualString(credentialType, "bearer")) { - string bearerToken = await GetBearerTokenAsync(); + string bearerToken = credentialModel.BearerToken; request_.Headers["x-acs-bearer-token"] = bearerToken; request_.Headers["x-acs-signature-type"] = "BEARERTOKEN"; } else { - string accessKeyId = await GetAccessKeyIdAsync(); - string accessKeySecret = await GetAccessKeySecretAsync(); - string securityToken = await GetSecurityTokenAsync(); + string accessKeyId = credentialModel.AccessKeyId; + string accessKeySecret = credentialModel.AccessKeySecret; + string securityToken = credentialModel.SecurityToken; if (!AlibabaCloud.TeaUtil.Common.Empty(securityToken)) { request_.Headers["x-acs-accesskey-id"] = accessKeyId; @@ -1292,18 +1296,19 @@ public Dictionary DoROARequestWithForm(string action, string ver } if (!AlibabaCloud.TeaUtil.Common.EqualString(authType, "Anonymous")) { - string credentialType = GetType(); + Aliyun.Credentials.Models.CredentialModel credentialModel = this._credential.GetCredential(); + string credentialType = credentialModel.Type; if (AlibabaCloud.TeaUtil.Common.EqualString(credentialType, "bearer")) { - string bearerToken = GetBearerToken(); + string bearerToken = credentialModel.BearerToken; request_.Headers["x-acs-bearer-token"] = bearerToken; request_.Headers["x-acs-signature-type"] = "BEARERTOKEN"; } else { - string accessKeyId = GetAccessKeyId(); - string accessKeySecret = GetAccessKeySecret(); - string securityToken = GetSecurityToken(); + string accessKeyId = credentialModel.AccessKeyId; + string accessKeySecret = credentialModel.AccessKeySecret; + string securityToken = credentialModel.SecurityToken; if (!AlibabaCloud.TeaUtil.Common.Empty(securityToken)) { request_.Headers["x-acs-accesskey-id"] = accessKeyId; @@ -1542,18 +1547,19 @@ public async Task> DoROARequestWithFormAsync(string a } if (!AlibabaCloud.TeaUtil.Common.EqualString(authType, "Anonymous")) { - string credentialType = await GetTypeAsync(); + Aliyun.Credentials.Models.CredentialModel credentialModel = await this._credential.GetCredentialAsync(); + string credentialType = credentialModel.Type; if (AlibabaCloud.TeaUtil.Common.EqualString(credentialType, "bearer")) { - string bearerToken = await GetBearerTokenAsync(); + string bearerToken = credentialModel.BearerToken; request_.Headers["x-acs-bearer-token"] = bearerToken; request_.Headers["x-acs-signature-type"] = "BEARERTOKEN"; } else { - string accessKeyId = await GetAccessKeyIdAsync(); - string accessKeySecret = await GetAccessKeySecretAsync(); - string securityToken = await GetSecurityTokenAsync(); + string accessKeyId = credentialModel.AccessKeyId; + string accessKeySecret = credentialModel.AccessKeySecret; + string securityToken = credentialModel.SecurityToken; if (!AlibabaCloud.TeaUtil.Common.Empty(securityToken)) { request_.Headers["x-acs-accesskey-id"] = accessKeyId; @@ -1827,10 +1833,11 @@ public Dictionary DoRequest(Params params_, OpenApiRequest reque request_.Headers["x-acs-content-sha256"] = hashedRequestPayload; if (!AlibabaCloud.TeaUtil.Common.EqualString(params_.AuthType, "Anonymous")) { - string authType = GetType(); + Aliyun.Credentials.Models.CredentialModel credentialModel = this._credential.GetCredential(); + string authType = credentialModel.Type; if (AlibabaCloud.TeaUtil.Common.EqualString(authType, "bearer")) { - string bearerToken = GetBearerToken(); + string bearerToken = credentialModel.BearerToken; request_.Headers["x-acs-bearer-token"] = bearerToken; if (AlibabaCloud.TeaUtil.Common.EqualString(params_.Style, "RPC")) { @@ -1843,9 +1850,9 @@ public Dictionary DoRequest(Params params_, OpenApiRequest reque } else { - string accessKeyId = GetAccessKeyId(); - string accessKeySecret = GetAccessKeySecret(); - string securityToken = GetSecurityToken(); + string accessKeyId = credentialModel.AccessKeyId; + string accessKeySecret = credentialModel.AccessKeySecret; + string securityToken = credentialModel.SecurityToken; if (!AlibabaCloud.TeaUtil.Common.Empty(securityToken)) { request_.Headers["x-acs-accesskey-id"] = accessKeyId; @@ -2123,10 +2130,11 @@ public async Task> DoRequestAsync(Params params_, Ope request_.Headers["x-acs-content-sha256"] = hashedRequestPayload; if (!AlibabaCloud.TeaUtil.Common.EqualString(params_.AuthType, "Anonymous")) { - string authType = await GetTypeAsync(); + Aliyun.Credentials.Models.CredentialModel credentialModel = await this._credential.GetCredentialAsync(); + string authType = credentialModel.Type; if (AlibabaCloud.TeaUtil.Common.EqualString(authType, "bearer")) { - string bearerToken = await GetBearerTokenAsync(); + string bearerToken = credentialModel.BearerToken; request_.Headers["x-acs-bearer-token"] = bearerToken; if (AlibabaCloud.TeaUtil.Common.EqualString(params_.Style, "RPC")) { @@ -2139,9 +2147,9 @@ public async Task> DoRequestAsync(Params params_, Ope } else { - string accessKeyId = await GetAccessKeyIdAsync(); - string accessKeySecret = await GetAccessKeySecretAsync(); - string securityToken = await GetSecurityTokenAsync(); + string accessKeyId = credentialModel.AccessKeyId; + string accessKeySecret = credentialModel.AccessKeySecret; + string securityToken = credentialModel.SecurityToken; if (!AlibabaCloud.TeaUtil.Common.Empty(securityToken)) { request_.Headers["x-acs-accesskey-id"] = accessKeyId; diff --git a/csharp/core/Properties/AssemblyInfo.cs b/csharp/core/Properties/AssemblyInfo.cs index 8f2a9a7..119de3a 100644 --- a/csharp/core/Properties/AssemblyInfo.cs +++ b/csharp/core/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ // Build Number // Revision // -[assembly : AssemblyVersion("0.1.10.0")] -[assembly : AssemblyFileVersion("0.1.10.0")] +[assembly : AssemblyVersion("0.1.11.0")] +[assembly : AssemblyFileVersion("0.1.11.0")] diff --git a/csharp/core/client.csproj b/csharp/core/client.csproj index 2829d86..0e3f2f2 100644 --- a/csharp/core/client.csproj +++ b/csharp/core/client.csproj @@ -41,10 +41,10 @@ runtime; build; native; contentfiles; analyzers - + - + \ No newline at end of file diff --git a/golang/client/client.go b/golang/client/client.go index d21b1d1..5726c5a 100644 --- a/golang/client/client.go +++ b/golang/client/client.go @@ -733,35 +733,20 @@ func (client *Client) DoRPCRequest(action *string, version *string, protocol *st } if !tea.BoolValue(util.EqualString(authType, tea.String("Anonymous"))) { - credentialType, _err := client.GetType() + credentialModel, _err := client.Credential.GetCredential() if _err != nil { return _result, _err } + credentialType := credentialModel.Type if tea.BoolValue(util.EqualString(credentialType, tea.String("bearer"))) { - bearerToken, _err := client.GetBearerToken() - if _err != nil { - return _result, _err - } - + bearerToken := credentialModel.BearerToken request_.Query["BearerToken"] = bearerToken request_.Query["SignatureType"] = tea.String("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_.Query["SecurityToken"] = securityToken } @@ -1019,35 +1004,20 @@ func (client *Client) DoROARequest(action *string, version *string, protocol *st } if !tea.BoolValue(util.EqualString(authType, tea.String("Anonymous"))) { - credentialType, _err := client.GetType() + credentialModel, _err := client.Credential.GetCredential() if _err != nil { return _result, _err } + credentialType := credentialModel.Type if tea.BoolValue(util.EqualString(credentialType, tea.String("bearer"))) { - bearerToken, _err := client.GetBearerToken() - if _err != nil { - return _result, _err - } - + bearerToken := credentialModel.BearerToken request_.Headers["x-acs-bearer-token"] = bearerToken request_.Headers["x-acs-signature-type"] = tea.String("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 @@ -1307,35 +1277,20 @@ func (client *Client) DoROARequestWithForm(action *string, version *string, prot } if !tea.BoolValue(util.EqualString(authType, tea.String("Anonymous"))) { - credentialType, _err := client.GetType() + credentialModel, _err := client.Credential.GetCredential() if _err != nil { return _result, _err } + credentialType := credentialModel.Type if tea.BoolValue(util.EqualString(credentialType, tea.String("bearer"))) { - bearerToken, _err := client.GetBearerToken() - if _err != nil { - return _result, _err - } - + bearerToken := credentialModel.BearerToken request_.Headers["x-acs-bearer-token"] = bearerToken request_.Headers["x-acs-signature-type"] = tea.String("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 index fbed2be..f7a3ab6 100644 --- a/golang/go.mod +++ b/golang/go.mod @@ -4,12 +4,12 @@ go 1.14 require ( github.com/alibabacloud-go/alibabacloud-gateway-pop v0.0.6 - github.com/alibabacloud-go/alibabacloud-gateway-spi v0.0.4 + github.com/alibabacloud-go/alibabacloud-gateway-spi v0.0.5 github.com/alibabacloud-go/openapi-util v0.1.0 github.com/alibabacloud-go/tea v1.2.2 github.com/alibabacloud-go/tea-utils/v2 v2.0.6 github.com/alibabacloud-go/tea-xml v1.1.3 - github.com/aliyun/credentials-go v1.3.1 + github.com/aliyun/credentials-go v1.3.10 github.com/clbanning/mxj/v2 v2.5.5 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect diff --git a/java/pom.xml b/java/pom.xml index 0857d9b..a773c68 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.aliyun tea-openapi @@ -56,7 +56,7 @@ com.aliyun credentials-java - 0.3.3 + 0.3.10 com.aliyun @@ -77,7 +77,7 @@ com.aliyun alibabacloud-gateway-spi - 0.0.1 + 0.0.2 com.aliyun diff --git a/java/src/main/java/com/aliyun/teaopenapi/Client.java b/java/src/main/java/com/aliyun/teaopenapi/Client.java index a320d6c..c913779 100644 --- a/java/src/main/java/com/aliyun/teaopenapi/Client.java +++ b/java/src/main/java/com/aliyun/teaopenapi/Client.java @@ -233,15 +233,16 @@ public Client(com.aliyun.teaopenapi.models.Config config) throws Exception { } if (!com.aliyun.teautil.Common.equalString(authType, "Anonymous")) { - String credentialType = this.getType(); + com.aliyun.credentials.models.CredentialModel credentialModel = _credential.getCredential(); + String credentialType = credentialModel.type; if (com.aliyun.teautil.Common.equalString(credentialType, "bearer")) { - String bearerToken = this.getBearerToken(); + String bearerToken = credentialModel.bearerToken; request_.query.put("BearerToken", bearerToken); request_.query.put("SignatureType", "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_.query.put("SecurityToken", securityToken); } @@ -451,15 +452,16 @@ public Client(com.aliyun.teaopenapi.models.Config config) throws Exception { } if (!com.aliyun.teautil.Common.equalString(authType, "Anonymous")) { - String credentialType = this.getType(); + com.aliyun.credentials.models.CredentialModel credentialModel = _credential.getCredential(); + String credentialType = credentialModel.type; if (com.aliyun.teautil.Common.equalString(credentialType, "bearer")) { - String bearerToken = this.getBearerToken(); + String bearerToken = credentialModel.bearerToken; request_.headers.put("x-acs-bearer-token", bearerToken); request_.headers.put("x-acs-signature-type", "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); @@ -667,15 +669,16 @@ public Client(com.aliyun.teaopenapi.models.Config config) throws Exception { } if (!com.aliyun.teautil.Common.equalString(authType, "Anonymous")) { - String credentialType = this.getType(); + com.aliyun.credentials.models.CredentialModel credentialModel = _credential.getCredential(); + String credentialType = credentialModel.type; if (com.aliyun.teautil.Common.equalString(credentialType, "bearer")) { - String bearerToken = this.getBearerToken(); + String bearerToken = credentialModel.bearerToken; request_.headers.put("x-acs-bearer-token", bearerToken); request_.headers.put("x-acs-signature-type", "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 index 6770d55..986275c 100644 --- a/main.tea +++ b/main.tea @@ -227,15 +227,16 @@ api doRPCRequest(action: string, version: string, protocol: string, method: stri } if (!Util.equalString(authType, 'Anonymous')) { - var credentialType = getType(); + var credentialModel = @credential.getCredential(); + var credentialType = credentialModel.type; if (Util.equalString(credentialType, 'bearer')) { - var bearerToken = getBearerToken(); + var bearerToken = credentialModel.bearerToken; __request.query.BearerToken = bearerToken; __request.query.SignatureType = '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.query.SecurityToken = securityToken; } @@ -404,15 +405,16 @@ api doROARequest(action: string, version: string, protocol: string, method: stri } if (!Util.equalString(authType, 'Anonymous')) { - var credentialType = getType(); + var credentialModel = @credential.getCredential(); + var credentialType = credentialModel.type; if (Util.equalString(credentialType, 'bearer')) { - var bearerToken = getBearerToken(); + var bearerToken = credentialModel.bearerToken; __request.headers.x-acs-bearer-token = bearerToken; __request.headers.x-acs-signature-type = '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; __request.headers.x-acs-security-token = securityToken; @@ -582,15 +584,16 @@ api doROARequestWithForm(action: string, version: string, protocol: string, meth } if (!Util.equalString(authType, 'Anonymous')) { - var credentialType = getType(); + var credentialModel = @credential.getCredential(); + var credentialType = credentialModel.type; if (Util.equalString(credentialType, 'bearer')) { - var bearerToken = getBearerToken(); + var bearerToken = credentialModel.bearerToken; __request.headers.x-acs-bearer-token = bearerToken; __request.headers.x-acs-signature-type = '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; __request.headers.x-acs-security-token = securityToken; diff --git a/python/alibabacloud_tea_openapi/client.py b/python/alibabacloud_tea_openapi/client.py index 5818091..94301da 100644 --- a/python/alibabacloud_tea_openapi/client.py +++ b/python/alibabacloud_tea_openapi/client.py @@ -223,15 +223,16 @@ def do_rpcrequest( _request.body = UtilClient.to_form_string(tmp) _request.headers['content-type'] = 'application/x-www-form-urlencoded' if not UtilClient.equal_string(auth_type, 'Anonymous'): - credential_type = self.get_type() + credential_model = self._credential.get_credential() + credential_type = credential_model.type if UtilClient.equal_string(credential_type, 'bearer'): - bearer_token = self.get_bearer_token() + bearer_token = credential_model.bearer_token _request.query['BearerToken'] = bearer_token _request.query['SignatureType'] = 'BEARERTOKEN' else: - access_key_id = self.get_access_key_id() - access_key_secret = self.get_access_key_secret() - security_token = self.get_security_token() + access_key_id = credential_model.access_key_id + access_key_secret = credential_model.access_key_secret + security_token = credential_model.security_token if not UtilClient.empty(security_token): _request.query['SecurityToken'] = security_token _request.query['SignatureMethod'] = 'HMAC-SHA1' @@ -418,15 +419,16 @@ async def do_rpcrequest_async( _request.body = UtilClient.to_form_string(tmp) _request.headers['content-type'] = 'application/x-www-form-urlencoded' if not UtilClient.equal_string(auth_type, 'Anonymous'): - credential_type = await self.get_type_async() + credential_model = await self._credential.get_credential_async() + credential_type = credential_model.type if UtilClient.equal_string(credential_type, 'bearer'): - bearer_token = await self.get_bearer_token_async() + bearer_token = credential_model.bearer_token _request.query['BearerToken'] = bearer_token _request.query['SignatureType'] = 'BEARERTOKEN' else: - access_key_id = await self.get_access_key_id_async() - access_key_secret = await self.get_access_key_secret_async() - security_token = await self.get_security_token_async() + access_key_id = credential_model.access_key_id + access_key_secret = credential_model.access_key_secret + security_token = credential_model.security_token if not UtilClient.empty(security_token): _request.query['SecurityToken'] = security_token _request.query['SignatureMethod'] = 'HMAC-SHA1' @@ -603,15 +605,16 @@ def do_roarequest( _request.query = TeaCore.merge(_request.query, request.query) if not UtilClient.equal_string(auth_type, 'Anonymous'): - credential_type = self.get_type() + credential_model = self._credential.get_credential() + credential_type = credential_model.type if UtilClient.equal_string(credential_type, 'bearer'): - bearer_token = self.get_bearer_token() + bearer_token = credential_model.bearer_token _request.headers['x-acs-bearer-token'] = bearer_token _request.headers['x-acs-signature-type'] = 'BEARERTOKEN' else: - access_key_id = self.get_access_key_id() - access_key_secret = self.get_access_key_secret() - security_token = self.get_security_token() + access_key_id = credential_model.access_key_id + access_key_secret = credential_model.access_key_secret + security_token = credential_model.security_token if not UtilClient.empty(security_token): _request.headers['x-acs-accesskey-id'] = access_key_id _request.headers['x-acs-security-token'] = security_token @@ -787,15 +790,16 @@ async def do_roarequest_async( _request.query = TeaCore.merge(_request.query, request.query) if not UtilClient.equal_string(auth_type, 'Anonymous'): - credential_type = await self.get_type_async() + credential_model = await self._credential.get_credential_async() + credential_type = credential_model.type if UtilClient.equal_string(credential_type, 'bearer'): - bearer_token = await self.get_bearer_token_async() + bearer_token = credential_model.bearer_token _request.headers['x-acs-bearer-token'] = bearer_token _request.headers['x-acs-signature-type'] = 'BEARERTOKEN' else: - access_key_id = await self.get_access_key_id_async() - access_key_secret = await self.get_access_key_secret_async() - security_token = await self.get_security_token_async() + access_key_id = credential_model.access_key_id + access_key_secret = credential_model.access_key_secret + security_token = credential_model.security_token if not UtilClient.empty(security_token): _request.headers['x-acs-accesskey-id'] = access_key_id _request.headers['x-acs-security-token'] = security_token @@ -972,15 +976,16 @@ def do_roarequest_with_form( _request.query = TeaCore.merge(_request.query, request.query) if not UtilClient.equal_string(auth_type, 'Anonymous'): - credential_type = self.get_type() + credential_model = self._credential.get_credential() + credential_type = credential_model.type if UtilClient.equal_string(credential_type, 'bearer'): - bearer_token = self.get_bearer_token() + bearer_token = credential_model.bearer_token _request.headers['x-acs-bearer-token'] = bearer_token _request.headers['x-acs-signature-type'] = 'BEARERTOKEN' else: - access_key_id = self.get_access_key_id() - access_key_secret = self.get_access_key_secret() - security_token = self.get_security_token() + access_key_id = credential_model.access_key_id + access_key_secret = credential_model.access_key_secret + security_token = credential_model.security_token if not UtilClient.empty(security_token): _request.headers['x-acs-accesskey-id'] = access_key_id _request.headers['x-acs-security-token'] = security_token @@ -1155,15 +1160,16 @@ async def do_roarequest_with_form_async( _request.query = TeaCore.merge(_request.query, request.query) if not UtilClient.equal_string(auth_type, 'Anonymous'): - credential_type = await self.get_type_async() + credential_model = await self._credential.get_credential_async() + credential_type = credential_model.type if UtilClient.equal_string(credential_type, 'bearer'): - bearer_token = await self.get_bearer_token_async() + bearer_token = credential_model.bearer_token _request.headers['x-acs-bearer-token'] = bearer_token _request.headers['x-acs-signature-type'] = 'BEARERTOKEN' else: - access_key_id = await self.get_access_key_id_async() - access_key_secret = await self.get_access_key_secret_async() - security_token = await self.get_security_token_async() + access_key_id = credential_model.access_key_id + access_key_secret = credential_model.access_key_secret + security_token = credential_model.security_token if not UtilClient.empty(security_token): _request.headers['x-acs-accesskey-id'] = access_key_id _request.headers['x-acs-security-token'] = security_token @@ -1355,18 +1361,19 @@ def do_request( _request.headers['content-type'] = 'application/x-www-form-urlencoded' _request.headers['x-acs-content-sha256'] = hashed_request_payload if not UtilClient.equal_string(params.auth_type, 'Anonymous'): - auth_type = self.get_type() + credential_model = self._credential.get_credential() + auth_type = credential_model.type if UtilClient.equal_string(auth_type, 'bearer'): - bearer_token = self.get_bearer_token() + bearer_token = credential_model.bearer_token _request.headers['x-acs-bearer-token'] = bearer_token if UtilClient.equal_string(params.style, 'RPC'): _request.query['SignatureType'] = 'BEARERTOKEN' else: _request.headers['x-acs-signature-type'] = 'BEARERTOKEN' else: - access_key_id = self.get_access_key_id() - access_key_secret = self.get_access_key_secret() - security_token = self.get_security_token() + access_key_id = credential_model.access_key_id + access_key_secret = credential_model.access_key_secret + security_token = credential_model.security_token if not UtilClient.empty(security_token): _request.headers['x-acs-accesskey-id'] = access_key_id _request.headers['x-acs-security-token'] = security_token @@ -1561,18 +1568,19 @@ async def do_request_async( _request.headers['content-type'] = 'application/x-www-form-urlencoded' _request.headers['x-acs-content-sha256'] = hashed_request_payload if not UtilClient.equal_string(params.auth_type, 'Anonymous'): - auth_type = await self.get_type_async() + credential_model = await self._credential.get_credential_async() + auth_type = credential_model.type if UtilClient.equal_string(auth_type, 'bearer'): - bearer_token = await self.get_bearer_token_async() + bearer_token = credential_model.bearer_token _request.headers['x-acs-bearer-token'] = bearer_token if UtilClient.equal_string(params.style, 'RPC'): _request.query['SignatureType'] = 'BEARERTOKEN' else: _request.headers['x-acs-signature-type'] = 'BEARERTOKEN' else: - access_key_id = await self.get_access_key_id_async() - access_key_secret = await self.get_access_key_secret_async() - security_token = await self.get_security_token_async() + access_key_id = credential_model.access_key_id + access_key_secret = credential_model.access_key_secret + security_token = credential_model.security_token if not UtilClient.empty(security_token): _request.headers['x-acs-accesskey-id'] = access_key_id _request.headers['x-acs-security-token'] = security_token diff --git a/python/setup.py b/python/setup.py index 0866d92..38aa5c9 100644 --- a/python/setup.py +++ b/python/setup.py @@ -24,7 +24,7 @@ """ setup module for alibabacloud_tea_openapi. -Created on 07/07/2024 +Created on 19/09/2024 @author: Alibaba Cloud SDK """ @@ -38,9 +38,9 @@ VERSION = __import__(PACKAGE).__version__ REQUIRES = [ "alibabacloud_tea_util>=0.3.13, <1.0.0", - "alibabacloud_credentials>=0.3.1, <1.0.0", + "alibabacloud_credentials>=0.3.5, <1.0.0", "alibabacloud_openapi_util>=0.2.1, <1.0.0", - "alibabacloud_gateway_spi>=0.0.1, <1.0.0", + "alibabacloud_gateway_spi>=0.0.2, <1.0.0", "alibabacloud_tea_xml>=0.0.2, <1.0.0" ] diff --git a/ts/package.json b/ts/package.json index 46ca91d..a51b349 100644 --- a/ts/package.json +++ b/ts/package.json @@ -24,7 +24,7 @@ "dependencies": { "@alicloud/tea-typescript": "^1.7.1", "@alicloud/tea-util": "^1.4.9", - "@alicloud/credentials": "^2", + "@alicloud/credentials": "^2.3.1", "@alicloud/openapi-util": "^0.3.2", "@alicloud/gateway-spi": "^0.0.8", "@alicloud/tea-xml": "0.0.3" diff --git a/ts/src/client.ts b/ts/src/client.ts index 0974644..460b632 100644 --- a/ts/src/client.ts +++ b/ts/src/client.ts @@ -435,15 +435,16 @@ export default class Client { } if (!Util.equalString(authType, "Anonymous")) { - let credentialType = await this.getType(); + let credentialModel = await this._credential.getCredential(); + let credentialType = credentialModel.type; if (Util.equalString(credentialType, "bearer")) { - let bearerToken = await this.getBearerToken(); + let bearerToken = credentialModel.bearerToken; request_.query["BearerToken"] = bearerToken; request_.query["SignatureType"] = "BEARERTOKEN"; } else { - let accessKeyId = await this.getAccessKeyId(); - let accessKeySecret = await this.getAccessKeySecret(); - let securityToken = await this.getSecurityToken(); + let accessKeyId = credentialModel.accessKeyId; + let accessKeySecret = credentialModel.accessKeySecret; + let securityToken = credentialModel.securityToken; if (!Util.empty(securityToken)) { request_.query["SecurityToken"] = securityToken; } @@ -650,15 +651,16 @@ export default class Client { } if (!Util.equalString(authType, "Anonymous")) { - let credentialType = await this.getType(); + let credentialModel = await this._credential.getCredential(); + let credentialType = credentialModel.type; if (Util.equalString(credentialType, "bearer")) { - let bearerToken = await this.getBearerToken(); + let bearerToken = credentialModel.bearerToken; request_.headers["x-acs-bearer-token"] = bearerToken; request_.headers["x-acs-signature-type"] = "BEARERTOKEN"; } else { - let accessKeyId = await this.getAccessKeyId(); - let accessKeySecret = await this.getAccessKeySecret(); - let securityToken = await this.getSecurityToken(); + let accessKeyId = credentialModel.accessKeyId; + let accessKeySecret = credentialModel.accessKeySecret; + let securityToken = credentialModel.securityToken; if (!Util.empty(securityToken)) { request_.headers["x-acs-accesskey-id"] = accessKeyId; request_.headers["x-acs-security-token"] = securityToken; @@ -863,15 +865,16 @@ export default class Client { } if (!Util.equalString(authType, "Anonymous")) { - let credentialType = await this.getType(); + let credentialModel = await this._credential.getCredential(); + let credentialType = credentialModel.type; if (Util.equalString(credentialType, "bearer")) { - let bearerToken = await this.getBearerToken(); + let bearerToken = credentialModel.bearerToken; request_.headers["x-acs-bearer-token"] = bearerToken; request_.headers["x-acs-signature-type"] = "BEARERTOKEN"; } else { - let accessKeyId = await this.getAccessKeyId(); - let accessKeySecret = await this.getAccessKeySecret(); - let securityToken = await this.getSecurityToken(); + let accessKeyId = credentialModel.accessKeyId; + let accessKeySecret = credentialModel.accessKeySecret; + let securityToken = credentialModel.securityToken; if (!Util.empty(securityToken)) { request_.headers["x-acs-accesskey-id"] = accessKeyId; request_.headers["x-acs-security-token"] = securityToken;