@alicloud/openapi-client - npm Package Compare versions

Comparing version 0.4.9 to 0.4.10

dist/client.d.ts

@@ -34,2 +34,3 @@ /// <reference types="node" />
     securityToken?: string;
+    bearerToken?: string;
     protocol?: string;
@@ -36,0 +37,0 @@ method?: string;

dist/client.js

@@ -66,2 +66,3 @@ "use strict";
             securityToken: 'securityToken',
+            bearerToken: 'bearerToken',
             protocol: 'protocol',
@@ -100,2 +101,3 @@ method: 'method',
             securityToken: 'string',
+            bearerToken: 'string',
             protocol: 'string',
@@ -216,2 +218,9 @@ method: 'string',
         }
+        else if (!tea_util_1.default.empty(config.bearerToken)) {
+            let cc = new $Credential.Config({
+                type: "bearer",
+                bearerToken: config.bearerToken,
+            });
+            this._credential = new credentials_1.default(cc);
+        }
         else if (!tea_util_1.default.isUnset(config.credential)) {
@@ -330,17 +339,25 @@ this._credential = config.credential;
                 if (!tea_util_1.default.equalString(authType, "Anonymous")) {
-                    let accessKeyId = await this.getAccessKeyId();
-                    let accessKeySecret = await this.getAccessKeySecret();
-                    let securityToken = await this.getSecurityToken();
-                    if (!tea_util_1.default.empty(securityToken)) {
-                        request_.query["SecurityToken"] = securityToken;
+                    let credentialType = await this.getType();
+                    if (tea_util_1.default.equalString(credentialType, "bearer")) {
+                        let bearerToken = await this.getBearerToken();
+                        request_.query["BearerToken"] = bearerToken;
+                        request_.query["SignatureType"] = "BEARERTOKEN";
                     }
-                    request_.query["SignatureMethod"] = "HMAC-SHA1";
-                    request_.query["SignatureVersion"] = "1.0";
-                    request_.query["AccessKeyId"] = accessKeyId;
-                    let t = null;
-                    if (!tea_util_1.default.isUnset(request.body)) {
-                        t = tea_util_1.default.assertAsMap(request.body);
+                    else {
+                        let accessKeyId = await this.getAccessKeyId();
+                        let accessKeySecret = await this.getAccessKeySecret();
+                        let securityToken = await this.getSecurityToken();
+                        if (!tea_util_1.default.empty(securityToken)) {
+                            request_.query["SecurityToken"] = securityToken;
+                        }
+                        request_.query["SignatureMethod"] = "HMAC-SHA1";
+                        request_.query["SignatureVersion"] = "1.0";
+                        request_.query["AccessKeyId"] = accessKeyId;
+                        let t = null;
+                        if (!tea_util_1.default.isUnset(request.body)) {
+                            t = tea_util_1.default.assertAsMap(request.body);
+                        }
+                        let signedParam = Object.assign(Object.assign({}, request_.query), openapi_util_1.default.query(t));
+                        request_.query["Signature"] = openapi_util_1.default.getRPCSignature(signedParam, request_.method, accessKeySecret);
                     }
-                    let signedParam = Object.assign(Object.assign({}, request_.query), openapi_util_1.default.query(t));
-                    request_.query["Signature"] = openapi_util_1.default.getRPCSignature(signedParam, request_.method, accessKeySecret);
                 }
@@ -500,11 +517,19 @@ _lastRequest = request_;
                 if (!tea_util_1.default.equalString(authType, "Anonymous")) {
-                    let accessKeyId = await this.getAccessKeyId();
-                    let accessKeySecret = await this.getAccessKeySecret();
-                    let securityToken = await this.getSecurityToken();
-                    if (!tea_util_1.default.empty(securityToken)) {
-                        request_.headers["x-acs-accesskey-id"] = accessKeyId;
-                        request_.headers["x-acs-security-token"] = securityToken;
+                    let credentialType = await this.getType();
+                    if (tea_util_1.default.equalString(credentialType, "bearer")) {
+                        let bearerToken = await this.getBearerToken();
+                        request_.headers["x-acs-bearer-token"] = bearerToken;
+                        request_.headers["x-acs-signature-type"] = "BEARERTOKEN";
                     }
-                    let stringToSign = openapi_util_1.default.getStringToSign(request_);
-                    request_.headers["authorization"] = `acs ${accessKeyId}:${openapi_util_1.default.getROASignature(stringToSign, accessKeySecret)}`;
+                    else {
+                        let accessKeyId = await this.getAccessKeyId();
+                        let accessKeySecret = await this.getAccessKeySecret();
+                        let securityToken = await this.getSecurityToken();
+                        if (!tea_util_1.default.empty(securityToken)) {
+                            request_.headers["x-acs-accesskey-id"] = accessKeyId;
+                            request_.headers["x-acs-security-token"] = securityToken;
+                        }
+                        let stringToSign = openapi_util_1.default.getStringToSign(request_);
+                        request_.headers["authorization"] = `acs ${accessKeyId}:${openapi_util_1.default.getROASignature(stringToSign, accessKeySecret)}`;
+                    }
                 }
@@ -671,11 +696,19 @@ _lastRequest = request_;
                 if (!tea_util_1.default.equalString(authType, "Anonymous")) {
-                    let accessKeyId = await this.getAccessKeyId();
-                    let accessKeySecret = await this.getAccessKeySecret();
-                    let securityToken = await this.getSecurityToken();
-                    if (!tea_util_1.default.empty(securityToken)) {
-                        request_.headers["x-acs-accesskey-id"] = accessKeyId;
-                        request_.headers["x-acs-security-token"] = securityToken;
+                    let credentialType = await this.getType();
+                    if (tea_util_1.default.equalString(credentialType, "bearer")) {
+                        let bearerToken = await this.getBearerToken();
+                        request_.headers["x-acs-bearer-token"] = bearerToken;
+                        request_.headers["x-acs-signature-type"] = "BEARERTOKEN";
                     }
-                    let stringToSign = openapi_util_1.default.getStringToSign(request_);
-                    request_.headers["authorization"] = `acs ${accessKeyId}:${openapi_util_1.default.getROASignature(stringToSign, accessKeySecret)}`;
+                    else {
+                        let accessKeyId = await this.getAccessKeyId();
+                        let accessKeySecret = await this.getAccessKeySecret();
+                        let securityToken = await this.getSecurityToken();
+                        if (!tea_util_1.default.empty(securityToken)) {
+                            request_.headers["x-acs-accesskey-id"] = accessKeyId;
+                            request_.headers["x-acs-security-token"] = securityToken;
+                        }
+                        let stringToSign = openapi_util_1.default.getStringToSign(request_);
+                        request_.headers["authorization"] = `acs ${accessKeyId}:${openapi_util_1.default.getROASignature(stringToSign, accessKeySecret)}`;
+                    }
                 }
@@ -869,11 +902,18 @@ _lastRequest = request_;
                 if (!tea_util_1.default.equalString(params.authType, "Anonymous")) {
-                    let authType = await this.getType();
+                    let credentialModel = await this._credential.getCredential();
+                    let authType = credentialModel.type;
                     if (tea_util_1.default.equalString(authType, "bearer")) {
-                        let bearerToken = await this.getBearerToken();
+                        let bearerToken = credentialModel.bearerToken;
                         request_.headers["x-acs-bearer-token"] = bearerToken;
+                        if (tea_util_1.default.equalString(params.style, "RPC")) {
+                            request_.query["SignatureType"] = "BEARERTOKEN";
+                        }
+                        else {
+                            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 (!tea_util_1.default.empty(securityToken)) {
@@ -880,0 +920,0 @@ request_.headers["x-acs-accesskey-id"] = accessKeyId;

package.json

 {
   "name": "@alicloud/openapi-client",
-  "version": "0.4.9",
+  "version": "0.4.10",
   "description": "",
@@ -9,3 +9,2 @@ "main": "dist/client.js",
     "test-cov": "nyc -e .ts -r=html -r=text -r=lcov npm run test",
-    "ci": "npm run test-cov && codecov",
     "build": "tsc",
@@ -18,3 +17,2 @@ "prepublishOnly": "tsc"
     "@types/mocha": "^5.2.7",
-    "codecov": "^3.6.1",
     "mocha": "^6.2.0",
@@ -21,0 +19,0 @@ "@types/node": "^12.12.26",

src/client.ts

@@ -42,2 +42,3 @@ // This file is auto-generated, don't edit it
   securityToken?: string;
+  bearerToken?: string;
   protocol?: string;
@@ -74,2 +75,3 @@ method?: string;
       securityToken: 'securityToken',
+      bearerToken: 'bearerToken',
       protocol: 'protocol',
@@ -109,2 +111,3 @@ method: 'method',
       securityToken: 'string',
+      bearerToken: 'string',
       protocol: 'string',
@@ -280,2 +283,8 @@ method: 'string',
       this._credential = new Credential(credentialConfig);
+    } else if (!Util.empty(config.bearerToken)) {
+      let cc = new $Credential.Config({
+        type: "bearer",
+        bearerToken: config.bearerToken,
+      });
+      this._credential = new Credential(cc);
     } else if (!Util.isUnset(config.credential)) {
@@ -427,22 +436,30 @@ this._credential = config.credential;
         if (!Util.equalString(authType, "Anonymous")) {
-          let accessKeyId = await this.getAccessKeyId();
-          let accessKeySecret = await this.getAccessKeySecret();
-          let securityToken = await this.getSecurityToken();
-          if (!Util.empty(securityToken)) {
-            request_.query["SecurityToken"] = securityToken;
-          }
+          let credentialType = await this.getType();
+          if (Util.equalString(credentialType, "bearer")) {
+            let bearerToken = await this.getBearerToken();
+            request_.query["BearerToken"] = bearerToken;
+            request_.query["SignatureType"] = "BEARERTOKEN";
+          } else {
+            let accessKeyId = await this.getAccessKeyId();
+            let accessKeySecret = await this.getAccessKeySecret();
+            let securityToken = await this.getSecurityToken();
+            if (!Util.empty(securityToken)) {
+              request_.query["SecurityToken"] = securityToken;
+            }
 
-          request_.query["SignatureMethod"] = "HMAC-SHA1";
-          request_.query["SignatureVersion"] = "1.0";
-          request_.query["AccessKeyId"] = accessKeyId;
-          let t : {[key: string ]: any} = null;
-          if (!Util.isUnset(request.body)) {
-            t = Util.assertAsMap(request.body);
+            request_.query["SignatureMethod"] = "HMAC-SHA1";
+            request_.query["SignatureVersion"] = "1.0";
+            request_.query["AccessKeyId"] = accessKeyId;
+            let t : {[key: string ]: any} = null;
+            if (!Util.isUnset(request.body)) {
+              t = Util.assertAsMap(request.body);
+            }
+
+            let signedParam = {
+              ...request_.query,
+              ...OpenApiUtil.query(t),
+            };
+            request_.query["Signature"] = OpenApiUtil.getRPCSignature(signedParam, request_.method, accessKeySecret);
           }
 
-          let signedParam = {
-            ...request_.query,
-            ...OpenApiUtil.query(t),
-          };
-          request_.query["Signature"] = OpenApiUtil.getRPCSignature(signedParam, request_.method, accessKeySecret);
         }
@@ -627,12 +644,20 @@
         if (!Util.equalString(authType, "Anonymous")) {
-          let accessKeyId = await this.getAccessKeyId();
-          let accessKeySecret = await this.getAccessKeySecret();
-          let securityToken = await this.getSecurityToken();
-          if (!Util.empty(securityToken)) {
-            request_.headers["x-acs-accesskey-id"] = accessKeyId;
-            request_.headers["x-acs-security-token"] = securityToken;
+          let credentialType = await this.getType();
+          if (Util.equalString(credentialType, "bearer")) {
+            let bearerToken = await this.getBearerToken();
+            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();
+            if (!Util.empty(securityToken)) {
+              request_.headers["x-acs-accesskey-id"] = accessKeyId;
+              request_.headers["x-acs-security-token"] = securityToken;
+            }
+
+            let stringToSign = OpenApiUtil.getStringToSign(request_);
+            request_.headers["authorization"] = `acs ${accessKeyId}:${OpenApiUtil.getROASignature(stringToSign, accessKeySecret)}`;
           }
 
-          let stringToSign = OpenApiUtil.getStringToSign(request_);
-          request_.headers["authorization"] = `acs ${accessKeyId}:${OpenApiUtil.getROASignature(stringToSign, accessKeySecret)}`;
         }
@@ -825,12 +850,20 @@
         if (!Util.equalString(authType, "Anonymous")) {
-          let accessKeyId = await this.getAccessKeyId();
-          let accessKeySecret = await this.getAccessKeySecret();
-          let securityToken = await this.getSecurityToken();
-          if (!Util.empty(securityToken)) {
-            request_.headers["x-acs-accesskey-id"] = accessKeyId;
-            request_.headers["x-acs-security-token"] = securityToken;
+          let credentialType = await this.getType();
+          if (Util.equalString(credentialType, "bearer")) {
+            let bearerToken = await this.getBearerToken();
+            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();
+            if (!Util.empty(securityToken)) {
+              request_.headers["x-acs-accesskey-id"] = accessKeyId;
+              request_.headers["x-acs-security-token"] = securityToken;
+            }
+
+            let stringToSign = OpenApiUtil.getStringToSign(request_);
+            request_.headers["authorization"] = `acs ${accessKeyId}:${OpenApiUtil.getROASignature(stringToSign, accessKeySecret)}`;
           }
 
-          let stringToSign = OpenApiUtil.getStringToSign(request_);
-          request_.headers["authorization"] = `acs ${accessKeyId}:${OpenApiUtil.getROASignature(stringToSign, accessKeySecret)}`;
         }
@@ -1051,10 +1084,17 @@
         if (!Util.equalString(params.authType, "Anonymous")) {
-          let authType = await this.getType();
+          let credentialModel = await this._credential.getCredential();
+          let authType = credentialModel.type;
           if (Util.equalString(authType, "bearer")) {
-            let bearerToken = await this.getBearerToken();
+            let bearerToken = credentialModel.bearerToken;
             request_.headers["x-acs-bearer-token"] = bearerToken;
+            if (Util.equalString(params.style, "RPC")) {
+              request_.query["SignatureType"] = "BEARERTOKEN";
+            } else {
+              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)) {
@@ -1061,0 +1101,0 @@ request_.headers["x-acs-accesskey-id"] = accessKeyId;

No alert changes

Improved metrics

Total package byte prevSize

170180

increased by3.15%

Dev dependency count

7

decreased by-12.5%

Lines of code

2927

increased by2.7%

No dependency changes