Add associateWithAuthData() and fix signUpOrlogInWithAuthData bug (#318)

* fix signUpOrlogInWithAuthData() can not use by promise style

* Add associateWithAuthData()

* codereview fix

Author: wangxiao

src/user.js

@@ -757,38 +757,42 @@ module.exports = function(AV) {
      * On success, this saves the session to disk, so you can retrieve the currently
      * logged in user using <code>current</code>.
      *
-     * <p>Calls options.success or options.error on completion.</p>
-     *
-     * @param {Object} data The response json data returned from third party token.
+     * @param {Object} authData The response json data returned from third party token, maybe like { openid: 'abc123', access_token: '123abc', expires_in: 1382686496 }
      * @param {string} platform Available platform for sign up.
      * @param {Object} [callback] An object that has an optional success function, that takes no arguments and will be called on a successful puSH. and an error function that takes a AVError and will be called if the push failed.
      * @return {AV.Promise} A promise that is fulfilled with the user when
      *     the login completes.
-     * @example AV.User.signUpOrlogInWithAuthData(data, platform, {
-         *          success: function(user) {
-         *              //Access user here
-         *          },
-         *          error: function(error) {
-         *              //console.log("error: ", error);
-         *          }
-         *      });
+     * @example AV.User.signUpOrlogInWithAuthData(authData, platform).then(function(user) {
+     *   //Access user here
+     * }).catch(function(error) {
+     *   //console.error("error: ", error);
+     * });
      * @see {@link https://leancloud.cn/docs/js_guide.html#绑定第三方平台账户}
      */
-    signUpOrlogInWithAuthData: function (data, platform, callback) {
-        /**
-         * Construct accessToken
-         */
-        return AV.User._logInWith(platform, {
-            "authData": data,
-            success: function (user) {
-                callback.success(user);
-            },
-            error: function (error) {
-                callback.error(error);
-            }
-        });
+    signUpOrlogInWithAuthData(authData, platform, callback) {
+      return AV.User._logInWith(platform, { authData })._thenRunCallbacks(callback);
     },
 
+    /**
+     * Associate a user with a third party auth data(AccessToken).
+     *
+     * @param {AV.User} userObj A user which you want to associate.
+     * @param {string} platform Available platform for sign up.
+     * @param {Object} authData The response json data returned from third party token, maybe like { openid: 'abc123', access_token: '123abc', expires_in: 1382686496 }
+     * @return {AV.Promise} A promise that is fulfilled with the user when completed.
+     * @example AV.User.associateWithAuthData(loginUser, 'weixin', {
+     *   openid: 'abc123',
+     *   access_token: '123abc',
+     *   expires_in: 1382686496
+     * }).then(function(user) {
+     *   //Access user here
+     * }).catch(function(error) {
+     *   //console.error("error: ", error);
+     * });
+     */
+    associateWithAuthData(userObj, platform, authData) {
+      return userObj._linkWith(platform, { authData });
+    },
     /**
      * Logs out the currently logged in user session. This will remove the
      * session from disk, log out of linked services, and future calls to

test/user.js

@@ -270,14 +270,30 @@ describe("User", function() {
         id: getFixedId()
       }
 
-      AV.User.signUpOrlogInWithAuthData(data, "anonymous", {
-        success: function(user) {
-          expect(user.id).to.be.ok();
-          done();
-        },
-        error: function(error) {
-          throw error.message;
-        }
+      AV.User.signUpOrlogInWithAuthData(data, 'anonymous').then(function(user) {
+        expect(user.id).to.be.ok();
+        done();
+      }).catch(function(error) {
+        throw error;
+      });
+    });
+  });
+
+  describe('associate with authData', function() {
+    it('logIn an user, and associate with authData', function() {
+      var username = Date.now().toString(36);
+      var password = '123456';
+      var user = new AV.User();
+      user.set('username', username);
+      user.set('password', password);
+      return user.save().then(function() {
+        return AV.User.logIn(username, password);
+      }).then(function (loginedUser) {
+        return AV.User.associateWithAuthData(loginedUser, 'weixin', {
+          openid: 'aaabbbccc123123',
+          access_token: 'a123123aaabbbbcccc',
+          expires_in: 1382686496,
+        });
       });
     });
   });