v1.2.4 例子里 XCosSecurityToken 改为 SecurityToken

tencentyun · Feb 26, 2021 · dda5aa8 · dda5aa8
1 parent c0c1696
commit dda5aa8
Show file tree

Hide file tree

Showing 13 changed files with 37 additions and 21 deletions.
diff --git a/demo/demo.js b/demo/demo.js
@@ -59,12 +59,18 @@ var getAuthorization = function (options, callback) {
         } catch (e) {
         }
         if (!data || !credentials) return console.error('credentials invalid');
+        var authorization = COS.getAuthorization({
+            SecretId: credentials.tmpSecretId, // 可传固定密钥或者临时密钥
+            SecretKey: credentials.tmpSecretKey, // 可传固定密钥或者临时密钥
+            Method: options.Method,
+            Pathname: options.Pathname,
+            Query: options.Query,
+            Headers: options.Headers,
+            Expires: 900,
+        });
         callback({
-            TmpSecretId: credentials.tmpSecretId,
-            TmpSecretKey: credentials.tmpSecretKey,
+            Authorization: authorization,
             XCosSecurityToken: credentials.sessionToken,
-            StartTime: data.startTime, // 时间戳，单位秒，如：1580000000，建议返回服务器时间作为签名的开始时间，避免用户浏览器本地时间偏差过大导致签名错误
-            ExpiredTime: data.expiredTime, // 时间戳，单位秒，如：1580000900
         });
     };
     xhr.send();

diff --git a/demo/policy-post.html b/demo/policy-post.html
@@ -83,7 +83,7 @@ <h1>PostObject 上传（Policy 保护，Ajax POST 请求）</h1>
 
                 // // 使用普通签名格式
                 // fd.append('Signature', credentials.Authorization);
-                // fd.append('x-cos-security-token', credentials.XCosSecurityToken || '');
+                // fd.append('x-cos-security-token', credentials.SecurityToken || '');
 
                 // 使用 policy 签名保护格式
                 credentials.securityToken && fd.append('x-cos-security-token', credentials.securityToken);

diff --git a/demo/queue/index.js b/demo/queue/index.js
@@ -17,7 +17,7 @@ var cos = new COS({
             callback({
                 TmpSecretId: data.credentials && data.credentials.tmpSecretId,
                 TmpSecretKey: data.credentials && data.credentials.tmpSecretKey,
-                XCosSecurityToken: data.credentials && data.credentials.sessionToken,
+                SecurityToken: data.credentials && data.credentials.sessionToken,
                 ExpiredTime: data.expiredTime
             });
         };

diff --git a/demo/slice.html b/demo/slice.html
@@ -47,7 +47,7 @@ <h1>自定义的分片上传</h1>
                     callback({
                         TmpSecretId: credentials.tmpSecretId,
                         TmpSecretKey: credentials.tmpSecretKey,
-                        XCosSecurityToken: credentials.sessionToken,
+                        SecurityToken: credentials.sessionToken,
                         StartTime: data.startTime, // 时间戳，单位秒，如：1580000000，建议返回服务器时间作为签名的开始时间，避免用户浏览器本地时间偏差过大导致签名错误
                         ExpiredTime: data.expiredTime, // 时间戳，单位秒，如：1580000900
                     });

diff --git a/demo/sts-form.html b/demo/sts-form.html
@@ -64,7 +64,7 @@ <h1>Form 表单简单上传（兼容 IE8）</h1>
                         } catch (e) {}
                         if (credentials) {
                             callback(null, {
-                                XCosSecurityToken: credentials.sessionToken,
+                                SecurityToken: credentials.sessionToken,
                                 Authorization: CosAuth({
                                     SecretId: credentials.tmpSecretId,
                                     SecretKey: credentials.tmpSecretKey,
@@ -123,7 +123,7 @@ <h1>Form 表单简单上传（兼容 IE8）</h1>
                 document.getElementById('success_action_redirect').value = location.href.substr(0, location.href.lastIndexOf('/') + 1) + 'empty.html';
                 document.getElementById('key').value = Key;
                 document.getElementById('signature').value = AuthData.Authorization;
-                document.getElementById('x-cos-security-token').value = AuthData.XCosSecurityToken || '';
+                document.getElementById('x-cos-security-token').value = AuthData.SecurityToken || '';
                 form.submit();
             });
         };

diff --git a/demo/sts-post.html b/demo/sts-post.html
@@ -56,7 +56,7 @@ <h1>Ajax Post 上传</h1>
                         } catch (e) {}
                         if (credentials) {
                             callback(null, {
-                                XCosSecurityToken: credentials.sessionToken,
+                                SecurityToken: credentials.sessionToken,
                                 Authorization: CosAuth({
                                     SecretId: credentials.tmpSecretId,
                                     SecretKey: credentials.tmpSecretKey,
@@ -84,7 +84,7 @@ <h1>Ajax Post 上传</h1>
                 fd.append('key', Key);
                 fd.append('signature', info.Authorization);
                 fd.append('Content-Type', '');
-                info.XCosSecurityToken && fd.append('x-cos-security-token', info.XCosSecurityToken);
+                info.SecurityToken && fd.append('x-cos-security-token', info.SecurityToken);
                 fd.append('file', file); // file 字段放在表单最后，避免文件内容过长影响签名判断和鉴权
                 var url = prefix;
                 var xhr = new XMLHttpRequest();

diff --git a/demo/sts-put-server-key.html b/demo/sts-put-server-key.html
@@ -56,7 +56,7 @@ <h1>Ajax Put 上传</h1>
                 if (result && credentials) {
                     callback(null, {
                         Key: result.Key, // 这里在后端加一个字段决定上传的文件名
-                        XCosSecurityToken: credentials.sessionToken,
+                        SecurityToken: credentials.sessionToken,
                         Authorization: CosAuth({
                             SecretId: credentials.tmpSecretId,
                             SecretKey: credentials.tmpSecretKey,
@@ -86,12 +86,12 @@ <h1>Ajax Put 上传</h1>
                 }
 
                 var auth = info.Authorization;
-                var XCosSecurityToken = info.XCosSecurityToken;
+                var SecurityToken = info.SecurityToken;
                 var url = prefix + camSafeUrlEncode(Key).replace(/%2F/g, '/');
                 var xhr = new XMLHttpRequest();
                 xhr.open('PUT', url, true);
                 xhr.setRequestHeader('Authorization', auth);
-                XCosSecurityToken && xhr.setRequestHeader('x-cos-security-token', XCosSecurityToken);
+                SecurityToken && xhr.setRequestHeader('x-cos-security-token', SecurityToken);
                 xhr.upload.onprogress = function (e) {
                     console.log('上传进度 ' + (Math.round(e.loaded / e.total * 10000) / 100) + '%');
                 };

diff --git a/demo/sts-put.html b/demo/sts-put.html
@@ -55,7 +55,7 @@ <h1>Ajax Put 上传</h1>
                 } catch (e) {}
                 if (credentials) {
                     callback(null, {
-                        XCosSecurityToken: credentials.sessionToken,
+                        SecurityToken: credentials.sessionToken,
                         Authorization: CosAuth({
                             SecretId: credentials.tmpSecretId,
                             SecretKey: credentials.tmpSecretKey,
@@ -85,12 +85,12 @@ <h1>Ajax Put 上传</h1>
                 }
 
                 var auth = info.Authorization;
-                var XCosSecurityToken = info.XCosSecurityToken;
+                var SecurityToken = info.SecurityToken;
                 var url = prefix + camSafeUrlEncode(Key).replace(/%2F/g, '/');
                 var xhr = new XMLHttpRequest();
                 xhr.open('PUT', url, true);
                 xhr.setRequestHeader('Authorization', auth);
-                XCosSecurityToken && xhr.setRequestHeader('x-cos-security-token', XCosSecurityToken);
+                SecurityToken && xhr.setRequestHeader('x-cos-security-token', SecurityToken);
                 xhr.upload.onprogress = function (e) {
                     console.log('上传进度 ' + (Math.round(e.loaded / e.total * 10000) / 100) + '%');
                 };

diff --git a/dist/cos-js-sdk-v5.js b/dist/cos-js-sdk-v5.js
@@ -2221,7 +2221,7 @@ base.init(COS, task);
 advance.init(COS, task);
 
 COS.getAuthorization = util.getAuth;
-COS.version = '1.2.3';
+COS.version = '1.2.4';
 
 module.exports = COS;
 
@@ -7772,6 +7772,11 @@ function getAuthorizationAsync(params, callback) {
     var cb = function (err, AuthData) {
         if (cbDone) return;
         cbDone = true;
+        if (AuthData.XCosSecurityToken && !AuthData.SecurityToken) {
+            AuthData = util.clone(AuthData);
+            AuthData.SecurityToken = AuthData.XCosSecurityToken;
+            delete AuthData.XCosSecurityToken;
+        }
         callback && callback(err, AuthData);
     };
 

diff --git a/dist/cos-js-sdk-v5.min.js b/dist/cos-js-sdk-v5.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cos-js-sdk-v5",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "description": "JavaScript SDK for [腾讯云对象存储](https://cloud.tencent.com/product/cos)",
   "main": "index.js",
   "types": "types",

diff --git a/src/base.js b/src/base.js
@@ -2981,6 +2981,11 @@ function getAuthorizationAsync(params, callback) {
     var cb = function (err, AuthData) {
         if (cbDone) return;
         cbDone = true;
+        if (AuthData.XCosSecurityToken && !AuthData.SecurityToken) {
+            AuthData = util.clone(AuthData);
+            AuthData.SecurityToken = AuthData.XCosSecurityToken;
+            delete AuthData.XCosSecurityToken;
+        }
         callback && callback(err, AuthData);
     };
 

diff --git a/src/cos.js b/src/cos.js
@@ -59,6 +59,6 @@ base.init(COS, task);
 advance.init(COS, task);
 
 COS.getAuthorization = util.getAuth;
-COS.version = '1.2.3';
+COS.version = '1.2.4';
 
 module.exports = COS;