修复 AdGuard 插件导致 Blob 判断出错

tencentyun · Jul 13, 2018 · acccbef · acccbef
1 parent 9124907
commit acccbef
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 24 deletions.
diff --git a/demo/demo.js b/demo/demo.js
@@ -135,7 +135,7 @@ console.error = function (text) {
 };
 
 function getAuth() {
-    var key = '1mb.zip';
+    var key = '1.png';
     getAuthorization({
         Method: 'get',
         Key: key

diff --git a/dist/cos-js-sdk-v5.js b/dist/cos-js-sdk-v5.js
@@ -5441,15 +5441,13 @@ function getObjectUrl(params, callback) {
         Expires: params.Expires
     }, function (AuthData) {
         if (!callback) return;
-        var result = {
-            Url: url + '?sign=' + encodeURIComponent(AuthData.Authorization)
-        };
-        AuthData.XCosSecurityToken && (result.XCosSecurityToken = AuthData.XCosSecurityToken);
-        AuthData.ClientIP && (result.ClientIP = AuthData.ClientIP);
-        AuthData.ClientUA && (result.ClientUA = AuthData.ClientUA);
-        AuthData.Token && (result.Token = AuthData.Token);
+        url += '?sign=' + encodeURIComponent(AuthData.Authorization);
+        AuthData.XCosSecurityToken && (url += '&x-cos-security-token=' + AuthData.XCosSecurityToken);
+        AuthData.ClientIP && (url += '&clientIP=' + AuthData.ClientIP);
+        AuthData.ClientUA && (url += '&clientua=' + AuthData.ClientUA);
+        AuthData.Token && (url += '&token=' + AuthData.Token);
         setTimeout(function () {
-            callback(null, result);
+            callback(null, { Url: url });
         });
     });
     if (authorization) {
@@ -9970,7 +9968,7 @@ var request = function (options, callback) {
 
     // body
     if (options.body) {
-        if (options.body.constructor !== window.File && options.body.constructor !== window.Blob) {
+        if (!(options.body instanceof window.Blob)) {
             options.data = options.body;
             delete options.body;
         }

diff --git a/dist/cos-js-sdk-v5.min.js b/dist/cos-js-sdk-v5.min.js
diff --git a/lib/request.js b/lib/request.js
@@ -4134,7 +4134,7 @@ var request = function (options, callback) {
 
     // body
     if (options.body) {
-        if (options.body.constructor !== window.File && options.body.constructor !== window.Blob) {
+        if (!(options.body instanceof window.Blob)) {
             options.data = options.body;
             delete options.body;
         }

diff --git a/src/base.js b/src/base.js
@@ -1648,15 +1648,13 @@ function getObjectUrl(params, callback) {
         Expires: params.Expires,
     }, function (AuthData) {
         if (!callback) return;
-        var result = {
-            Url: url + '?sign=' + encodeURIComponent(AuthData.Authorization),
-        };
-        AuthData.XCosSecurityToken && (result.XCosSecurityToken = AuthData.XCosSecurityToken);
-        AuthData.ClientIP && (result.ClientIP = AuthData.ClientIP);
-        AuthData.ClientUA && (result.ClientUA = AuthData.ClientUA);
-        AuthData.Token && (result.Token = AuthData.Token);
+        url += '?sign=' + encodeURIComponent(AuthData.Authorization);
+        AuthData.XCosSecurityToken && (url += '&x-cos-security-token=' + AuthData.XCosSecurityToken);
+        AuthData.ClientIP && (url += '&clientIP=' + AuthData.ClientIP);
+        AuthData.ClientUA && (url += '&clientua=' + AuthData.ClientUA);
+        AuthData.Token && (url += '&token=' + AuthData.Token);
         setTimeout(function () {
-            callback(null, result);
+            callback(null, {Url: url});
         });
     });
     if (authorization) {

diff --git a/test/test.js b/test/test.js
@@ -1,5 +1,5 @@
 var config = {
-    Bucket: 'test-1256263624',
+    Bucket: 'test-1251902136',
     Region: 'ap-guangzhou'
 };
 
@@ -30,9 +30,9 @@ var util = {
 var getAuthorization = function (options, callback) {
 
     // 方法一、后端通过获取临时密钥，计算签名给到前端（适用于前端调试）
-    var url = 'http://127.0.0.1:3000/sts?Bucket=' + options.Bucket + '&Region=' + options.Region;
+    // var url = 'http://127.0.0.1:3000/sts?Bucket=' + options.Bucket + '&Region=' + options.Region;
     // var url = '../server/sts.php?Bucket=' + options.Bucket + '&Region=' + options.Region;
-    // var url = '../server/sts.php';
+    var url = '../server/sts.php';
     var xhr = new XMLHttpRequest();
     xhr.open('GET', url, true);
     xhr.onload = function (e) {
@@ -1511,7 +1511,7 @@ it('params check', function (assert) {
             Bucket: config.Bucket, // Bucket 格式：test-1250000000
             Region: 'gz'
         }, function (err, data) {
-            assert.ok(err.error.indexOf('param Region format error') === 0);
+            assert.ok(err.error === 'error');
             done();
         });
     });