AV.User._currentUserDisabled 更名 AV._config.disableCurrentUser，由 init 初始化该配置项

Author: jysperm

src/user.js

@@ -96,7 +96,7 @@ module.exports = function(AV) {
 
     _handleSaveResult: function(makeCurrent) {
       // Clean up and synchronize the authData object, removing any unset values
-      if (makeCurrent && !AV.User._currentUserDisabled) {
+      if (makeCurrent && !AV._config.disableCurrentUser) {
         this._isCurrentUser = true;
       }
       this._cleanupAuthData();
@@ -105,7 +105,7 @@ module.exports = function(AV) {
       delete this._serverData.password;
       this._rebuildEstimatedDataForKey("password");
       this._refreshCache();
-      if ((makeCurrent || this.isCurrent()) && !AV.User._currentUserDisabled) {
+      if ((makeCurrent || this.isCurrent()) && !AV._config.disableCurrentUser) {
         // Some old version of leanengine-node-sdk will overwrite
         // AV.User._saveCurrentUser which returns no Promise.
         // So we need a Promise wrapper.
@@ -606,8 +606,6 @@ module.exports = function(AV) {
     // The mapping of auth provider names to actual providers
     _authProviders: {},
 
-    _currentUserDisabled: false,
-
     // Class Methods
 
     /**
@@ -797,7 +795,7 @@ module.exports = function(AV) {
      * <code>current</code> will return <code>null</code>.
      */
     logOut: function() {
-      if (AV.User._currentUserDisabled) {
+      if (AV._config.disableCurrentUser) {
         return console.warn('AV.User\'s currentUser disabled, use User#logOut instead');
       }
 
@@ -978,7 +976,7 @@ module.exports = function(AV) {
      * @return {AV.Promise} resolved with the currently logged in AV.User.
      */
     currentAsync: function() {
-      if (AV.User._currentUserDisabled) {
+      if (AV._config.disableCurrentUser) {
         console.warn('AV.User\'s currentUser disabled, access user from request instead');
         return AV.Promise.as(null);
       }
@@ -1027,7 +1025,7 @@ module.exports = function(AV) {
      * @return {AV.Object} The currently logged in AV.User.
      */
     current: function() {
-      if (AV.User._currentUserDisabled) {
+      if (AV._config.disableCurrentUser) {
         console.warn('AV.User\'s currentUser disabled, access user from request instead');
         return null;
       }
@@ -1067,10 +1065,6 @@ module.exports = function(AV) {
       return AV.User._currentUser;
     },
 
-    disableCurrentUser: function() {
-      AV.User._currentUserDisabled = true;
-    },
-
     /**
      * Persists a user as currentUser to localStorage, and into the singleton.
      */

src/utils.js

@@ -28,7 +28,10 @@ const init = (AV) => {
     APIServerURL: AVConfig.APIServerURL || '',
 
     // 当前是否为 nodejs 环境
-    isNode: false
+    isNode: false,
+
+    // 禁用 currentUser，通常用于多用户环境
+    disableCurrentUser: false
   });
 
   /**
@@ -154,6 +157,7 @@ const init = (AV) => {
           }
           initialize(options.appId, options.appKey, options.masterKey);
           setRegionServer(options.region);
+          AVConfig.disableCurrentUser = options.disableCurrentUser;
         } else {
           throw new Error('AV.init(): Parameter is not correct.');
         }
@@ -393,7 +397,7 @@ const init = (AV) => {
       // Pass the session token
       if (sessionToken) {
         dataObject._SessionToken = sessionToken;
-      } else if (!AV.User._currentUserDisabled) {
+      } else if (!AV._config.disableCurrentUser) {
         return AV.User.currentAsync().then(function(currentUser) {
           if (currentUser && currentUser._sessionToken) {
             dataObject._SessionToken = currentUser._sessionToken;
@@ -402,7 +406,7 @@ const init = (AV) => {
       }
     }).then(function() {
       // Pass the installation id
-      if (!AV.User._currentUserDisabled) {
+      if (!AV._config.disableCurrentUser) {
         return AV._getInstallationId().then(function(installationId) {
           dataObject._InstallationId = installationId;
         });

test/user.js

@@ -288,7 +288,7 @@ describe("User", function() {
     before(function() {
       originalUser = AV.User._currentUser;
       AV.User._currentUser = null;
-      AV.User._currentUserDisabled = true;
+      AV._config.disableCurrentUser = true;
       AV._useMasterKey = false;
     });
 
@@ -343,7 +343,7 @@ describe("User", function() {
     });
 
     after(function() {
-      AV.User._currentUserDisabled = false;
+      AV._config.disableCurrentUser = false;
       AV._useMasterKey = true;
       AV.User._currentUser = originalUser;
     });