fix authorization error

tencentyun · May 15, 2019 · 7e8a406 · 7e8a406
1 parent fe74e2d
commit 7e8a406
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 4 deletions.
diff --git a/dist/cos-js-sdk-v5.js b/dist/cos-js-sdk-v5.js
@@ -1983,7 +1983,7 @@ base.init(COS, task);
 advance.init(COS, task);
 
 COS.getAuthorization = util.getAuth;
-COS.version = '0.5.15';
+COS.version = '0.5.16';
 
 module.exports = COS;
 
@@ -6089,6 +6089,10 @@ function submitRequest(params, callback) {
             ResourceKey: params.ResourceKey,
             Scope: params.Scope
         }, function (err, AuthData) {
+            if (err) {
+                callback(err);
+                return;
+            }
             params.AuthData = AuthData;
             _submitRequest.call(self, params, function (err, data) {
                 if (err && tryIndex < 2 && (oldClockOffset !== self.options.SystemClockOffset || allowRetry.call(self, err))) {
@@ -6291,10 +6295,26 @@ var API_MAP = {
     getAuth: getAuth
 };
 
+function warnOldApi(apiName, fn, proto) {
+    util.each(['Cors', 'Acl'], function (suffix) {
+        if (apiName.slice(-suffix.length) === suffix) {
+            var oldName = apiName.slice(0, -suffix.length) + suffix.toUpperCase();
+            var apiFn = util.apiWrapper(apiName, fn);
+            var warned = false;
+            proto[oldName] = function () {
+                !warned && console.warn('warning: cos.' + oldName + ' has been deprecated. Please Use cos.' + apiName + ' instead.');
+                warned = true;
+                apiFn.apply(this, arguments);
+            };
+        }
+    });
+}
+
 module.exports.init = function (COS, task) {
     task.transferToTaskMethod(API_MAP, 'putObject');
     util.each(API_MAP, function (fn, apiName) {
         COS.prototype[apiName] = util.apiWrapper(apiName, fn);
+        warnOldApi(apiName, fn, COS.prototype);
     });
 };
 

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

diff --git a/src/base.js b/src/base.js
@@ -2204,6 +2204,10 @@ function submitRequest(params, callback) {
             ResourceKey: params.ResourceKey,
             Scope: params.Scope,
         }, function (err, AuthData) {
+            if (err) {
+                callback(err);
+                return;
+            }
             params.AuthData = AuthData;
             _submitRequest.call(self, params, function (err, data) {
                 if (err && tryIndex < 2 && (oldClockOffset !== self.options.SystemClockOffset || allowRetry.call(self, err))) {
@@ -2409,9 +2413,25 @@ var API_MAP = {
     getAuth: getAuth,
 };
 
+function warnOldApi(apiName, fn, proto) {
+    util.each(['Cors', 'Acl'], function (suffix) {
+        if (apiName.slice(-suffix.length) === suffix) {
+            var oldName = apiName.slice(0, -suffix.length) + suffix.toUpperCase();
+            var apiFn = util.apiWrapper(apiName, fn);
+            var warned = false;
+            proto[oldName] = function () {
+                !warned && console.warn('warning: cos.' + oldName + ' has been deprecated. Please Use cos.' + apiName + ' instead.');
+                warned = true;
+                apiFn.apply(this, arguments);
+            };
+        }
+    });
+}
+
 module.exports.init = function (COS, task) {
     task.transferToTaskMethod(API_MAP, 'putObject');
     util.each(API_MAP, function (fn, apiName) {
         COS.prototype[apiName] = util.apiWrapper(apiName, fn);
+        warnOldApi(apiName, fn, COS.prototype);
     });
 };
diff --git a/src/cos.js b/src/cos.js
@@ -58,6 +58,6 @@ base.init(COS, task);
 advance.init(COS, task);
 
 COS.getAuthorization = util.getAuth;
-COS.version = '0.5.15';
+COS.version = '0.5.16';
 
 module.exports = COS;