Merge pull request #166 from leeyeh/fix/_handleSaveResult

[fix] 某些登录 API 没有更新 currentUser 的问题

Author: leeyeh

lib/user.js

@@ -126,17 +126,12 @@ module.exports = function(AV) {
         var authData = this.get('authData') || {};
         authData[authType] = options.authData;
         this.set('authData', authData);
-
-        // Overridden so that the user can be made the current user.
-        var newOptions = _.clone(options) || {};
-        newOptions.success = function(model) {
-          model._handleSaveResult(true).then(function() {
-            if (options.success) {
-              options.success.apply(this, arguments);
-            }
-          });
-        };
-        return this.save({'authData': authData}, newOptions);
+        return this.save({'authData': authData}, filterOutCallbacks(options))
+          .then(function(model) {
+            return model._handleSaveResult(true).then(function() {
+              return model;
+            });
+          })._thenRunCallbacks(options);
       } else {
         var self = this;
         var promise = new AV.Promise();
@@ -270,7 +265,7 @@ module.exports = function(AV) {
         return AV.Promise.error(error);
       }
 
-      return this.save(attrs).then(function(model) {
+      return this.save(attrs, filterOutCallbacks(options)).then(function(model) {
         return model._handleSaveResult(true).then(function() {
           return model;
         });
@@ -324,21 +319,17 @@ module.exports = function(AV) {
         return AV.Promise.error(error);
       }
 
-      // Overridden so that the user can be made the current user.
-      var newOptions = _.clone(options);
+      var newOptions = filterOutCallbacks(options);
       newOptions._makeRequest = function(route, className, id, method, json) {
         return AV._request('usersByMobilePhone', null, null, "POST", json);
       };
-      newOptions.success = function(model) {
-        model._handleSaveResult(true).then(function() {
-          delete model.attributes.smsCode;
-          delete model._serverData.smsCode;
-          if (options.success) {
-            options.success.apply(this, arguments);
-          }
+      return this.save(attrs, newOptions).then(function(model) {
+        delete model.attributes.smsCode;
+        delete model._serverData.smsCode;
+        return model._handleSaveResult(true).then(function() {
+          return model;
         });
-      };
-      return this.save(attrs, newOptions);
+      })._thenRunCallbacks(options);
     },
 
     /**
@@ -384,15 +375,13 @@ module.exports = function(AV) {
       }
       options = options || {};
 
-      var newOptions = _.clone(options);
-      newOptions.success = function(model) {
-        model._handleSaveResult(false).then(function() {
-          if (options.success) {
-            options.success.apply(this, arguments);
-          }
-        });
-      };
-      return AV.Object.prototype.save.call(this, attrs, newOptions);
+      return AV.Object.prototype.save
+        .call(this, attrs, filterOutCallbacks(options))
+        .then(function(model) {
+          return model._handleSaveResult(false).then(function() {
+            return model;
+          });
+        })._thenRunCallbacks(options);
     },
 
     /**
@@ -465,15 +454,12 @@ module.exports = function(AV) {
      * @see AV.Object#fetch
      */
     fetch: function(options) {
-      var newOptions = options ? _.clone(options) : {};
-      newOptions.success = function(model) {
-        model._handleSaveResult(false).then(function() {
-          if (options && options.success) {
-            options.success.apply(this, arguments);
-          }
-        });
-      };
-      return AV.Object.prototype.fetch.call(this, newOptions);
+      return AV.Object.prototype.fetch.call(this, filterOutCallbacks(options))
+        .then(function(model) {
+          return model._handleSaveResult(false).then(function() {
+            return model;
+          });
+        })._thenRunCallbacks(options);
     },
 
     /**
@@ -1050,3 +1036,10 @@ module.exports = function(AV) {
 
   });
 };
+
+function filterOutCallbacks(options) {
+  var newOptions = _.clone(options) || {};
+  delete newOptions.success;
+  delete newOptions.error;
+  return newOptions;
+}

test/user.js

@@ -3,6 +3,7 @@ var email="u" + Date.now() + "@test.com";
 var password="password1";
 describe("User",function(){
 
+describe("User.signUp", function(){
   it("should sign up",function(done){
     var user = new AV.User();
     user.set("username", username);
@@ -214,3 +215,5 @@ describe("Follow/unfollow users",function(){
     });
   });
 });
+
+});