From 53e152e97535d256248a02a22c84f4d7c34d18a5 Mon Sep 17 00:00:00 2001
From: Carmen <carmen@oursky.com>
Date: Tue, 22 Mar 2016 19:08:25 +0800
Subject: [PATCH] Instead of executing write directly, reuse rest.update to fix
 request object in user before save is empty when reset password. #951

---
 src/Controllers/UserController.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Controllers/UserController.js b/src/Controllers/UserController.js
index 1581a659..97cc35aa 100644
--- a/src/Controllers/UserController.js
+++ b/src/Controllers/UserController.js
@@ -2,6 +2,7 @@ import { randomString } from '../cryptoUtils';
 import { inflate } from '../triggers';
 import AdaptableController from './AdaptableController';
 import MailAdapter from '../Adapters/Email/MailAdapter';
+import rest from '../rest';
 
 var DatabaseAdapter = require('../DatabaseAdapter');
 var RestWrite = require('../RestWrite');
@@ -165,8 +166,8 @@ export class UserController extends AdaptableController {
   }
 
   updatePassword(username, token, password, config) {
-   return this.checkResetTokenValidity(username, token).then(() => {
-     return updateUserPassword(username, token, password, this.config);
+   return this.checkResetTokenValidity(username, token).then((user) => {
+     return updateUserPassword(user._id, password, this.config);
    });
   }
 
@@ -192,12 +193,11 @@ export class UserController extends AdaptableController {
 }
 
 // Mark this private
-function updateUserPassword(username, token, password, config) {
-    var write = new RestWrite(config, Auth.master(config), '_User', {
-            username: username,
-            _perishable_token: token
-          }, {password: password, _perishable_token: null }, undefined);
-    return write.execute();
+function updateUserPassword(userId, password, config) {
+    return rest.update(config, Auth.master(config), '_User', userId, {
+      password: password,
+      _perishable_token: null
+    });
  }
 
 export default UserController;