fix(user): reimplement #dissociate with unset op (#526)

also refactor `Object#_applyOpSet` and `Object#set` to support operations like `object.set('a.b', 1)`

Author: leeyeh

src/object.js

@@ -7,6 +7,8 @@ const {
   isNullOrUndefined,
   ensureArray,
   transformFetchOptions,
+  setValue,
+  findValue,
 } = require('./utils');
 
 const RESERVED_KEYS = ['objectId', 'createdAt', 'updatedAt'];
@@ -525,9 +527,10 @@ module.exports = function(AV) {
     _applyOpSet: function(opSet, target) {
       var self = this;
       AV._objectEach(opSet, function(change, key) {
-        target[key] = change._estimate(target[key], self, key);
-        if (target[key] === AV.Op._UNSET) {
-          delete target[key];
+        const [value, actualTarget, actualKey] = findValue(target, key);
+        setValue(target, key, change._estimate(value, self, key));
+        if (actualTarget && actualTarget[actualKey] === AV.Op._UNSET) {
+          delete actualTarget[actualKey];
         }
       });
     },
@@ -569,9 +572,10 @@ module.exports = function(AV) {
       AV._arrayEach(this._opSetQueue, function(opSet) {
         var op = opSet[key];
         if (op) {
-          self.attributes[key] = op._estimate(self.attributes[key], self, key);
-          if (self.attributes[key] === AV.Op._UNSET) {
-            delete self.attributes[key];
+          const [value, actualTarget, actualKey] = findValue(self.attributes, key);
+          setValue(self.attributes, key, op._estimate(value, self, key));
+          if (actualTarget && actualTarget[actualKey] === AV.Op._UNSET) {
+            delete actualTarget[actualKey];
           } else {
             self._resetCacheForKey(key);
           }

src/user.js

@@ -197,13 +197,8 @@ module.exports = function(AV) {
      * @since 3.3.0
      */
     dissociateAuthData(provider) {
-      if (_.isString(provider)) {
-        provider = AV.User._authProviders[provider];
-      }
-      return this._linkWith(provider, null).then(model => {
-        this._synchronizeAuthData(provider);
-        return model;
-      });
+      this.unset(`authData.${provider}`);
+      return this.save().then(model => model._handleSaveResult(true).then(() => model));
     },
 
     /**
@@ -832,7 +827,7 @@ module.exports = function(AV) {
     },
 
     associateWithAuthData(userObj, platform, authData) {
-      console.warn('DEPRECATED: User.associateWithAuthData 已废弃，请使用 User#dissociateAuthData 代替');
+      console.warn('DEPRECATED: User.associateWithAuthData 已废弃，请使用 User#associateWithAuthData 代替');
       return userObj._linkWith(platform, authData);
     },
     /**

src/utils/index.js

@@ -156,6 +156,33 @@ function parseDate(iso8601) {
   return new Date(Date.UTC(year, month, day, hour, minute, second, milli));
 }
 
+const setValue = (target, key, value) => {
+  // '.' is not allowed in Class keys, escaping is not in concern now.
+  const segs = key.split('.');
+  const lastSeg = segs.pop();
+  let currentTarget = target;
+  segs.forEach((seg) => {
+    if (currentTarget[seg] === undefined) currentTarget[seg] = {};
+    currentTarget = currentTarget[seg];
+  });
+  currentTarget[lastSeg] = value;
+  return target;
+};
+
+const findValue = (target, key) => {
+  const segs = key.split('.');
+  const lastSeg = segs.pop();
+  let currentTarget = target;
+  for (let i = 0; i < segs.length; i++) {
+    currentTarget = currentTarget[segs[i]];
+    if (currentTarget === undefined) {
+      return [undefined, undefined, lastSeg];
+    }
+  }
+  const value = currentTarget[lastSeg];
+  return [value, currentTarget, lastSeg];
+};
+
 module.exports = {
   ajax,
   isNullOrUndefined,
@@ -165,4 +192,6 @@ module.exports = {
   tap,
   inherits,
   parseDate,
+  setValue,
+  findValue,
 };

test/user.js

@@ -202,6 +202,11 @@ describe("User", function() {
           access_token: 'a123123aaabbbbcccc',
           expires_in: 1382686496,
         });
+      }).then(user => {
+        user.get('authData').should.have.property('weixin');
+        return user.dissociateAuthData('weixin');
+      }).then(user => {
+        user.get('authData').should.not.have.property('weixin');
       });
     });
   });