v0.5.20 优化 putObject 返回 Location

tencentyun · Sep 11, 2019 · b96322e · b96322e
1 parent c34bf68
commit b96322e
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 12 deletions.
diff --git a/dist/cos-js-sdk-v5.js b/dist/cos-js-sdk-v5.js
@@ -2003,7 +2003,7 @@ base.init(COS, task);
 advance.init(COS, task);
 
 COS.getAuthorization = util.getAuth;
-COS.version = '0.5.19';
+COS.version = '0.5.20';
 
 module.exports = COS;
 
@@ -5026,7 +5026,7 @@ function putObject(params, callback) {
                 return callback(err);
             }
             onProgress({ loaded: FileSize, total: FileSize }, true);
-            if (data && data.headers && data.headers['etag']) {
+            if (data) {
                 var url = getUrl({
                     ForcePathStyle: self.options.ForcePathStyle,
                     protocol: self.options.Protocol,
@@ -5036,12 +5036,15 @@ function putObject(params, callback) {
                     object: params.Key
                 });
                 url = url.substr(url.indexOf('://') + 3);
-                return callback(null, {
+                var result = {
                     Location: url,
-                    ETag: data.headers['etag'],
                     statusCode: data.statusCode,
                     headers: data.headers
-                });
+                };
+                if (data.headers && data.headers.etag) {
+                    result.ETag = data.headers.etag;
+                }
+                return callback(null, result);
             }
             callback(null, data);
         });

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": "0.5.19",
+  "version": "0.5.20",
   "description": "JavaScript SDK for [腾讯云对象存储](https://cloud.tencent.com/product/cos)",
   "main": "index.js",
   "scripts": {

diff --git a/src/base.js b/src/base.js
@@ -1039,7 +1039,7 @@ function putObject(params, callback) {
                 return callback(err);
             }
             onProgress({loaded: FileSize, total: FileSize}, true);
-            if (data && data.headers && data.headers['etag']) {
+            if (data) {
                 var url = getUrl({
                     ForcePathStyle: self.options.ForcePathStyle,
                     protocol: self.options.Protocol,
@@ -1049,12 +1049,15 @@ function putObject(params, callback) {
                     object: params.Key,
                 });
                 url = url.substr(url.indexOf('://') + 3);
-                return callback(null, {
+                var result = {
                     Location: url,
-                    ETag: data.headers['etag'],
                     statusCode: data.statusCode,
                     headers: data.headers,
-                });
+                };
+                if (data.headers && data.headers.etag) {
+                    result.ETag = data.headers.etag;
+                }
+                return callback(null, result);
             }
             callback(null, data);
         });

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 = '0.5.19';
+COS.version = '0.5.20';
 
 module.exports = COS;