Browse Source

change async

Seiya Tashiro 7 years ago
parent
commit
a70f3ecde0
1 changed files with 7 additions and 10 deletions
  1. 7 10
      src/server/models/user.js

+ 7 - 10
src/server/models/user.js

@@ -223,21 +223,18 @@ module.exports = function(crowi) {
     return this.updateGoogleId(null, callback);
   };
 
-  userSchema.methods.activateInvitedUser = function(username, name, password) {
+  userSchema.methods.activateInvitedUser = async function(username, name, password) {
     this.setPassword(password);
     this.name = name;
     this.username = username;
     this.status = STATUS_ACTIVE;
-    const self = this;
 
-    return new Promise(function(resolve, reject) {
-      self.save(function(err, userData) {
-        userEvent.emit('activated', userData);
-        if (err) {
-          return reject(err);
-        }
-        resolve(userData);
-      });
+    this.save(function(err, userData) {
+      userEvent.emit('activated', userData);
+      if (err) {
+        return Promise.reject(err);
+      }
+      return Promise.resolve(userData);
     });
   };