Merge pull request #5 from avoscloud/0.3.7

0.3.7

Author: killme2008

lib/av.js

@@ -1584,6 +1584,12 @@
         route !== "push" &&
         route !== "search/select" &&
         route !== "requestPasswordReset" &&
+        route !== "requestEmailVerify" &&
+        route !== "requestMobilePhoneVerify" &&
+        route !== "requestLoginSmsCode" &&
+        route !== "verifyMobilePhone" &&
+        route !== "requestSmsCode" &&
+        route !== "verifySmsCode" &&
         route !== "users" &&
         route !== "qiniu" &&
         route !== "statuses" &&
@@ -6837,6 +6843,8 @@
         var serverAttrs = model.parse(resp, status, xhr);
         model._finishFetch(serverAttrs);
         model._handleSaveResult(true);
+        if(!serverAttrs.smsCode)
+          delete model.attributes['smsCode'];
         return model;
       })._thenRunCallbacks(options, this);
     },
@@ -6963,6 +6971,26 @@
       return this.get("username");
     },
 
+    /**
+     * Returns get("mobilePhoneNumber").
+     * @return {String}
+     * @see AV.Object#get
+     */
+    getMobilePhoneNumber: function(){
+      return this.get("mobilePhoneNumber");
+    },
+
+    /**
+     * Calls set("mobilePhoneNumber", phoneNumber, options) and returns the result.
+     * @param {String} mobilePhoneNumber
+     * @param {Object} options A Backbone-style options object.
+     * @return {Boolean}
+     * @see AV.Object.set
+     */
+    setMobilePhoneNumber: function(phone, options) {
+      return this.set("mobilePhoneNumber", phone, options);
+    },
+
     /**
      * Calls set("username", username, options) and returns the result.
      * @param {String} username
@@ -7078,6 +7106,47 @@
       return user.logIn(options);
     },
 
+    /**
+     * Logs in a user with a mobile phone number and sms code sent by
+     * AV.User.requestLoginSmsCode.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} mobilePhone The user's mobilePhoneNumber
+     * @param {String} smsCode The sms code sent by AV.User.requestLoginSmsCode
+     * @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#logIn
+     */
+   logInWithMobilePhoneSmsCode: function(mobilePhone, smsCode, options){
+      var user = AV.Object._create("_User");
+      user._finishFetch({ mobilePhoneNumber: mobilePhone, smsCode: smsCode });
+      return user.logIn(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
+     * user using <code>current</code>.
+     *
+     * <p>Calls options.success or options.error on completion.</p>
+     *
+     * @param {String} mobilePhone The user's mobilePhoneNumber
+     * @param {String} password The password to log in with.
+     * @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#logIn
+     */
+   logInWithMobilePhone: function(mobilePhone, password, options){
+      var user = AV.Object._create("_User");
+      user._finishFetch({ mobilePhoneNumber: mobilePhone, password: password });
+      return user.logIn(options);
+   },
+
     /**
      * Logs out the currently logged in user session. This will remove the
      * session from disk, log out of linked services, and future calls to
@@ -7142,6 +7211,74 @@
       return request._thenRunCallbacks(options);
     },
 
+    /**
+     * Requests a verify email to be sent to the specified email address
+     * associated with the user account. This email allows the user to securely
+     * verify their email address on the AV site.
+     *
+     * <p>Calls options.success or options.error on completion.</p>
+     *
+     * @param {String} email The email address associated with the user that
+     *     doesn't verify their email address.
+     * @param {Object} options A Backbone-style options object.
+     */
+    requestEmailVerfiyInBackground: function(email, options) {
+      var json = { email: email };
+      var request = AV._request("requestEmailVerify", null, null, "POST",
+                                   json);
+      return request._thenRunCallbacks(options);
+    },
+
+    /**
+     * Requests a verify sms code to be sent to the specified mobile phone
+     * number associated with the user account. This sms code allows the user to
+     * verify their mobile phone number by calling AV.User.verifyMobilePhone
+     *
+     * <p>Calls options.success or options.error on completion.</p>
+     *
+     * @param {String} mobilePhone The mobile phone number  associated with the
+     *                  user that doesn't verify their mobile phone number.
+     * @param {Object} options A Backbone-style options object.
+     */
+    requestMobilePhoneVerify: function(mobilePhone, options){
+      var json = { mobilePhoneNumber: mobilePhone };
+      var request = AV._request("requestMobilePhoneVerify", null, null, "POST",
+                                   json);
+      return request._thenRunCallbacks(options);
+    },
+
+    /**
+     * Makes a call to verify sms code that sent by AV.User.Cloud.requestSmsCode
+     * If verify successfully,the user mobilePhoneVerified attribute will be true.
+     * @param {String} code The sms code sent by AV.User.Cloud.requestSmsCode
+     * @param {Object} options A Backbone-style options object
+     * @return {AV.Promise} A promise that will be resolved with the result
+     * of the function.
+     */
+    verifyMobilePhone: function(code, options){
+      var request = AV._request("verifyMobilePhone", null, code, "POST",
+                                null);
+      return request._thenRunCallbacks(options);
+    },
+
+    /**
+     * Requests a logIn sms code to be sent to the specified mobile phone
+     * number associated with the user account. This sms code allows the user to
+     * login by AV.User.logInWithMobilePhoneSmsCode function.
+     *
+     * <p>Calls options.success or options.error on completion.</p>
+     *
+     * @param {String} mobilePhone The mobile phone number  associated with the
+     *           user that want to login by AV.User.logInWithMobilePhoneSmsCode
+     * @param {Object} options A Backbone-style options object.
+     */
+    requestLoginSmsCode: function(mobilePhone, options){
+      var json = { mobilePhoneNumber: mobilePhone };
+      var request = AV._request("requestLoginSmsCode", null, null, "POST",
+                                   json);
+      return request._thenRunCallbacks(options);
+    },
+
     /**
      * Retrieves the currently logged in AVUser with a valid session,
      * either from memory or localStorage, if necessary.
@@ -8658,7 +8795,39 @@
       return request.then(function(resp) {
         return AV._decode(null, resp).result;
       })._thenRunCallbacks(options);
-    }
+    },
+
+    /**
+     * Makes a call to request a sms code for operation verification.
+     * @param {Object} data The mobile phone number string or a JSON object contains mobilePhoneNumber,op,ttl,name etc.
+     * @param {Object} options A Backbone-style options object
+     * @return {AV.Promise} A promise that will be resolved with the result
+     * of the function.
+     */
+    requestSmsCode: function(data, options){
+      if(typeof data === 'string')
+        data = { mobilePhoneNumber: data };
+      if(!data.mobilePhoneNumber)
+        throw "Missing mobilePhoneNumber.";
+      var request = AV._request("requestSmsCode", null, null, 'POST',
+                                    data);
+      return request._thenRunCallbacks(options);
+    },
+
+    /**
+     * Makes a call to verify sms code that sent by AV.Cloud.requestSmsCode
+     * @param {String} code The sms code sent by AV.Cloud.requestSmsCode
+     * @param {Object} options A Backbone-style options object
+     * @return {AV.Promise} A promise that will be resolved with the result
+     * of the function.
+     */
+    verifySmsCode: function(code, options){
+      if(!code)
+        throw "Missing sms code.";
+      var request = AV._request("verifySmsCode", code, null, 'POST',
+                                    null);
+      return request._thenRunCallbacks(options);
+    },
   });
 }(this));
 

package.json

@@ -1,6 +1,6 @@
 {
  "name": "avoscloud-sdk",
- "version": "0.3.5",
+ "version": "0.3.7",
  "main": "./lib/av.js",
  "description": "AVOSCloud JavaScript SDK.",
  "dependencies": {

tests/sms.js

@@ -0,0 +1,58 @@
+describe("sms", function() {
+
+	describe("#verifyUserMobilePhone", function(){
+		this.timeout(10000);
+		it("should be verified", function(done){
+			var user = new AV.User();
+			user.set("username", "dennis");
+			user.set("password", "123456");
+			user.setMobilePhoneNumber('18668012283');
+
+			user.signUp(null, {
+				success: function(user) {
+					AV.User.requestMobilePhoneVerify('18668012283').then(function(){
+						AV.User.logInWithMobilePhone('18668012283',
+													 '123456').then(function(user){
+														 console.dir(user);
+														 expect(user.get('mobilePhoneVerified')).to.be(false);
+														 AV.User.requestLoginSmsCode('18668012283').then(function(){
+															 throw "Unverfied.";
+														 }, function(err){
+															 user.destroy().then(function(){
+																 done();
+															 });
+														 });
+													 }, function(err){
+														 throw err;
+													 });
+
+					},function(err){
+						throw err;
+					});
+				},
+				error: function(user, error) {
+					throw error;
+				}
+			});
+		});
+	});
+
+	describe("#requestSmsCode", function(){
+		it("should send sms code.", function(done){
+			AV.Cloud.requestSmsCode('18668012283').then(function(){
+				AV.Cloud.requestSmsCode({
+					mobilePhoneNumber: '18668012283',
+					name: '测试啊',
+					op: '测试操作',
+					ttl: 5
+				}).then(function(){
+					done();
+				}, function(err){
+					throw err;
+				});
+			}, function(err){
+				throw err;
+			});
+		});
+	});
+});

tests/test.html

@@ -38,7 +38,6 @@
       if (!expr) throw new Error(msg || 'failed');
       }
     </script>
-
 	<script src="file.js"></script>
 	<script src="error.js"></script>
 	<script src="object.js"></script>
@@ -50,6 +49,7 @@
 	<script src="master_key.js"></script>
 
 	<script src="status.js"></script>
+	<script src="sms.js"></script>
     <script>
       onload = function(){
       mocha.checkLeaks();