AV._useMasterKey -> AV._config.isUseMasterKey

Author: wangxiao

src/utils.js

@@ -24,7 +24,13 @@ module.exports = function(AV) {
     region: 'cn',
 
     // 服务器的 URL，默认初始化时被设置为大陆节点地址
-    apiServerUrl: AVConfig.apiServerUrl || ''
+    apiServerUrl: AVConfig.apiServerUrl || '',
+
+    // 当前是否为 nodejs 环境
+    isNode: false,
+
+    // 是否启用 masterKey
+    isUseMasterKey: false
   });
 
   /**
@@ -105,7 +111,6 @@ module.exports = function(AV) {
     AV.applicationId = appId;
     AV.applicationKey = appKey;
     AV.masterKey = masterKey;
-    AV._useMasterKey = false;
   };
 
   const setRegionServer = (region) => {
@@ -172,7 +177,7 @@ module.exports = function(AV) {
      * </p>
      */
     AV.Cloud.useMasterKey = function() {
-      AV._useMasterKey = true;
+      AVConfig.isUseMasterKey = true;
     };
   }
 
@@ -380,7 +385,7 @@ module.exports = function(AV) {
     if(!AV._isNullOrUndefined(AV.applicationProduction)) {
       dataObject._ApplicationProduction = AV.applicationProduction;
     }
-    if(AV._useMasterKey)
+    if(AVConfig.isUseMasterKey)
         dataObject._MasterKey = AV.masterKey;
     dataObject._ClientVersion = AV.VERSION;
     // Pass the session token on every request.

test/cloud.js

@@ -7,12 +7,12 @@ describe("AV.Cloud", function() {
     originalServerURL = AV._config.apiServerUrl;
     originalAppId = AV.applicationId;
     originalAppKey = AV.applicationKey;
-    originalUseMasterKey = AV._useMasterKey;
+    originalUseMasterKey = AV._config.isUseMasterKey;
 
     AV._config.apiServerUrl = 'https://leancloud.cn'
     AV.applicationId = '4h2h4okwiyn8b6cle0oig00vitayum8ephrlsvg7xo8o19ne';
     AV.applicationKey = '3xjj1qw91cr3ygjq9lt0g8c3qpet38rrxtwmmp0yffyoy2t4';
-    AV._useMasterKey = false;
+    AV._config.isUseMasterKey = false;
 
     AV.User._currentUser = null;
   });
@@ -119,6 +119,6 @@ describe("AV.Cloud", function() {
     AV._config.apiServerUrl = originalServerURL;
     AV.applicationId = originalAppId;
     AV.applicationKey = originalAppKey;
-    AV._useMasterKey = originalUseMasterKey;
+    AV._config.isUseMasterKey = originalUseMasterKey;
   });
 });

test/file_blob.html

@@ -69,7 +69,7 @@
         function upload (){
             AV._config.apiServerUrl="https://cn-stg1.avoscloud.com";
             AV.init('mxrb5nn3qz7drek0etojy5lh4yrwjnk485lqajnsgjwfxrb5', 'd7sbus0d81mrum4tko4t8gl74b27vl0rh762ff7ngrb6ymmq', 'l0n9wu3kwnrtf2cg1b6w2l87nphzpypgff6240d0lxui2mm4');
-            AV._useMasterKey = true;
+            AV._config.isUseMasterKey = true;
             AV.setProduction(true);
 
             var name = "photo.png";

test/file_form.html

@@ -18,7 +18,7 @@
 function upload (){
 AV._config.apiServerUrl="https://cn.avoscloud.com";
 AV.init('u8d277gijfac1ysldfyb92zn9fwhxsiecjs3wnrnj4yi7i00', 'nblwmv06uzbjp170pm1zw3umhrbhs75wp6djgutcglh5sopr', 'c2cbbq9fnrewpvtwm7lm25exs62hk0tnkmbs4q16c4podmdc');
-AV._useMasterKey = true;
+AV._config.isUseMasterKey = true;
 
   var fileUploadControl = document.getElementById ('profilePhotoFileUpload');
   console.log(fileUploadControl);

test/test.js

@@ -14,4 +14,4 @@ AV.init({
   masterKey: 'l0n9wu3kwnrtf2cg1b6w2l87nphzpypgff6240d0lxui2mm4'
 });
 AV.setProduction(true);
-AV._useMasterKey = true;
+AV._config.isUseMasterKey = true;