Merge pull request #52 from leancloud/feature/2015.01.22

Feature/2015.01.22

Author: killme2008

.gitignore

@@ -1,2 +1,4 @@
 node_modules/
 dist/
+package/
+*tgz

.npmignore

@@ -0,0 +1,9 @@
+*.tgz
+node_modules/
+dist/
+package/
+tests/
+tools/
+demo/
+lib/cloud.js
+*.sh

changelog.md

@@ -1,3 +1,25 @@
+# 0.4.7 日期: 2015 年 1 月 23 日
+* 修复页面跳转更新 user 导致 current user 属性丢失的 Bug。
+* 增加 `AV.User.updatePassword` 方法，根据老密码修改成新密码。
+* 为 `AV.Object` 增加 `getObjectId, getUpdatedAt, getCreatedAt` 三个方法。
+* 增加 `AV.User#signUpOrlogInWithMobilePhone` 手机一键登录。
+* 一些内部改进和重构。
+
+# 0.4.6 日期：2014 年 12 月 11 日
+* 添加新方法 `AV.File.createWithoutData(objectId)`，根据 objectId 构造 AV.File
+* 添加 `AV.Query.and` 方法用于复合查询
+* `AV.File` 支持 get/set ACL
+* 增加新方法 `AV.setProduction(boolean)` 用于设置生产环境或者测试环境。
+
+# 0.4.5 日期：2014 年 10 月 29 日
+* CQL 查询支持占位符,AV.Query.doCloudQuery 方法增加三个参数版本
+* AV.Push 增加 cql 属性说明，可以通过 CQL 指定推送查询条件。
+* 部分内部代码重构。
+
+# 0.4.4 日期：2014 年 10 月 14 日
+* 修复 node.js 下上传文件无法指定文件 mime type 的Bug
+* 添加 `AV.Object.new` 函数用来创建对象，避免代码压缩带来的问题。
+
 # 0.4.3
 
 * 添加 CQL 查询支持，增加 `AV.Query.doCloudQuery` 方法。

lib/av.js

@@ -13,7 +13,7 @@
  */
 (function(root) {
   root.AV = root.AV || {};
-  root.AV.VERSION = "js0.4.6";
+  root.AV.VERSION = "js0.4.7";
 }(this));
 //     Underscore.js 1.4.4
 //     http://underscorejs.org
@@ -1409,14 +1409,14 @@
     *Use china avoscloud API service:https://cn.avoscloud.com
     */
    AV.useAVCloudCN = function(){
-    AV.serverURL = "https://cn.avoscloud.com";
+    AV.serverURL = "https://leancloud.cn";
    };
 
    /**
     *Use USA avoscloud API service:https://us.avoscloud.com
     */
    AV.useAVCloudUS = function(){
-    AV.serverURL = "https://us.avoscloud.com";
+    AV.serverURL = "https://avoscloud.us";
    };
 
   /**
@@ -1509,6 +1509,13 @@
       }
     };
     xdr.onerror = xdr.ontimeout = function() {
+      // Let's fake a real error message.
+      var fakeResponse = {
+        responseText: JSON.stringify({
+          code: AV.Error.X_DOMAIN_REQUEST,
+          error: "IE's XDomainRequest does not supply error info."
+        })
+      };
       promise.reject(xdr);
     };
     xdr.onprogress = function() {};
@@ -1517,14 +1524,25 @@
     return promise;
   };
 
+   AV._useXDomainRequest = function() {
+       if (typeof(XDomainRequest) !== "undefined") {
+           // We're in IE 8+.
+           if ('withCredentials' in new XMLHttpRequest()) {
+               // We're in IE 10+.
+               return false;
+           }
+           return true;
+       }
+       return false;
+   };
 
   AV._ajax = function(method, url, data, success, error) {
     var options = {
       success: success,
       error: error
     };
 
-    if (typeof(XDomainRequest) !== "undefined") {
+    if (AV._useXDomainRequest()) {
       return AV._ajaxIE8(method, url, data)._thenRunCallbacks(options);
     }
 
@@ -1607,11 +1625,13 @@
         route !== "requestSmsCode" &&
         route !== "verifySmsCode" &&
         route !== "users" &&
+        route !== "usersByMobilePhone" &&
         route !== "cloudQuery" &&
         route !== "qiniu" &&
         route !== "statuses" &&
         route !== 'subscribe/statuses/count' &&
         route !== 'subscribe/statuses' &&
+        !(/users\/[^\/]+\/updatePassword/.test(route)) &&
         !(/users\/[^\/]+\/friendship\/[^\/]+/.test(route))) {
       throw "Bad route: '" + route + "'.";
     }
@@ -2237,7 +2257,15 @@
      * Twitter) is unsupported.
      * @constant
      */
-    UNSUPPORTED_SERVICE: 252
+    UNSUPPORTED_SERVICE: 252,
+    /**
+     * Error code indicating a real error code is unavailable because
+     * we had to use an XDomainRequest object to allow CORS requests in
+     * Internet Explorer, which strips the body from HTTP responses that have
+     * a non-2XX status code.
+     * @constant
+     */
+    X_DOMAIN_REQUEST: 602
   });
 
 }(this));
@@ -4528,6 +4556,30 @@
       this._fetchWhenSave = enable;
     },
 
+   /**
+    * Returns the object's objectId.
+    * @return {String} the objectId.
+    */
+    getObjectId: function() {
+      return this.id;
+    },
+
+   /**
+    * Returns the object's createdAt attribute.
+    * @return {Date}
+    */
+    getCreatedAt: function() {
+      return this.createdAt || this.get('createdAt');
+    },
+
+   /**
+    * Returns the object's updatedAt attribute.
+    * @return {Date}
+    */
+    getUpdatedAt: function() {
+      return this.updatedAt || this.get('updatedAt');
+    },
+
     /**
      * Returns a JSON version of the object suitable for saving to AV.
      * @return {Object}
@@ -5277,7 +5329,9 @@
           route = "users";
           className = null;
         }
-        var request = AV._request(route, className, model.id, method, json);
+        //hook makeRequest in options.
+        var makeRequest = options._makeRequest || AV._request;
+        var request = makeRequest(route, className, model.id, method, json);
 
         request = request.then(function(resp, status, xhr) {
           var serverAttrs = model.parse(resp, status, xhr);
@@ -6894,6 +6948,69 @@
       return this.save(attrs, newOptions);
     },
 
+    /**
+     * Signs up a new user with mobile phone and sms code.
+     * You should call this instead of save for
+     * new AV.Users. This will create a new AV.User on the server, and
+     * also persist the session on disk so that you can access the user using
+     * <code>current</code>.
+     *
+     * <p>A username and password must be set before calling signUp.</p>
+     *
+     * <p>Calls options.success or options.error on completion.</p>
+     *
+     * @param {Object} attrs Extra fields to set on the new user, or null.
+     * @param {Object} options A Backbone-style options object.
+     * @return {AV.Promise} A promise that is fulfilled when the signup
+     *     finishes.
+     * @see AV.User.signUpOrlogInWithMobilePhone
+     * @see AV.Cloud.requestSmsCode
+     */
+    signUpOrlogInWithMobilePhone: function(attrs, options) {
+      var error;
+      options = options || {};
+
+      var mobilePhoneNumber = (attrs && attrs.mobilePhoneNumber) ||
+                              this.get("mobilePhoneNumber");
+      if (!mobilePhoneNumber || (mobilePhoneNumber === "")) {
+        error = new AV.Error(
+            AV.Error.OTHER_CAUSE,
+            "Cannot sign up or login user by mobilePhoneNumber " +
+            "with an empty mobilePhoneNumber.");
+        if (options && options.error) {
+          options.error(this, error);
+        }
+        return AV.Promise.error(error);
+      }
+
+      var smsCode = (attrs && attrs.smsCode) || this.get("smsCode");
+      if (!smsCode || (smsCode === "")) {
+        error = new AV.Error(
+            AV.Error.OTHER_CAUSE,
+             "Cannot sign up or login user by mobilePhoneNumber  " +
+             "with an empty smsCode.");
+        if (options && options.error) {
+          options.error(this, error);
+        }
+        return AV.Promise.error(error);
+      }
+
+      // Overridden so that the user can be made the current user.
+      var newOptions = _.clone(options);
+      newOptions._makeRequest = function(route, className, id, method, json) {
+        return AV._request('usersByMobilePhone', null, null, "POST", json);
+      };
+      newOptions.success = function(model) {
+        model._handleSaveResult(true);
+        delete model.attributes.smsCode;
+        delete model._serverData.smsCode;
+        if (options.success) {
+          options.success.apply(this, arguments);
+        }
+      };
+      return this.save(attrs, newOptions);
+    },
+
     /**
      * Logs in a AV.User. On success, this saves the session to localStorage,
      * so you can retrieve the currently logged in user using
@@ -7026,6 +7143,24 @@
       return AV.Object.prototype.fetch.call(this, newOptions);
     },
 
+    /**
+     * Update user's new password safely based on old password.
+     * @param {String} oldPassword, the old password.
+     * @param {String} newPassword, the new password.
+     * @param {Object} An optional Backbone-like options object with
+     *     success and error callbacks that will be invoked once the iteration
+     *     has finished.
+     */
+    updatePassword: function(oldPassword, newPassword, options) {
+      var route = 'users/' + this.id + '/updatePassword';
+      var params = {
+        old_password: oldPassword,
+        new_password: newPassword
+      };
+      var request = AV._request(route, null, null, 'PUT', params);
+      return request._thenRunCallbacks(options, this);
+    },
+
     /**
      * Returns true if <code>current</code> would return this user.
      * @see AV.User#current
@@ -7199,6 +7334,31 @@
       return user.logIn(options);
    },
 
+    /**
+     * Sign up or logs in a user with a mobilePhoneNumber and smsCode.
+     * 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 {String} mobilePhoneNumber The user's mobilePhoneNumber.
+     * @param {String} smsCode The sms code sent by AV.Cloud.requestSmsCode
+     * @param {Object} attributes  The user's other attributes such as username etc.
+     * @param {Object} options A Backbone-style options object.
+     * @return {AV.Promise} A promise that is fulfilled with the user when
+     *     the login completes.
+     * @see AV.User#signUpOrlogInWithMobilePhone
+     * @see AV.Cloud.requestSmsCode
+     */
+    signUpOrlogInWithMobilePhone: function(mobilePhoneNumber, smsCode, attrs, options) {
+      attrs = attrs || {};
+      attrs.mobilePhoneNumber = mobilePhoneNumber;
+      attrs.smsCode = smsCode;
+      var user = AV.Object._create("_User");
+      return user.signUpOrlogInWithMobilePhone(attrs, options);
+    },
+
+
     /**
      * Logs in a user with a mobile phone number and password. On success, this
      * saves the session to disk, so you can retrieve the currently logged in
@@ -7428,7 +7588,8 @@
       delete json._id;
       AV.User._currentUser._sessionToken = json._sessionToken;
       delete json._sessionToken;
-      AV.User._currentUser.set(json);
+      AV.User._currentUser._finishFetch(json);
+      //AV.User._currentUser.set(json);
 
       AV.User._currentUser._synchronizeAllAuthData();
       AV.User._currentUser._refreshCache();