فهرست منبع

Use `findOne` method instead of `findUserBy...`.
Fix eslint error.

Hiroyuki Wada 7 سال پیش
والد
کامیت
581e6c2476
2فایلهای تغییر یافته به همراه5 افزوده شده و 11 حذف شده
  1. 5 4
      src/server/models/external-account.js
  2. 0 7
      src/server/models/user.js

+ 5 - 4
src/server/models/external-account.js

@@ -84,15 +84,16 @@ class ExternalAccount {
 
 
         const User = ExternalAccount.crowi.model('User');
         const User = ExternalAccount.crowi.model('User');
 
 
-        let promise = User.findUserByUsername(usernameToBeRegistered);
+        let promise = User.findOne({username: usernameToBeRegistered});
         if (isSameUsernameTreatedAsIdenticalUser && isSameEmailTreatedAsIdenticalUser) {
         if (isSameUsernameTreatedAsIdenticalUser && isSameEmailTreatedAsIdenticalUser) {
           promise = promise
           promise = promise
             .then(user => {
             .then(user => {
-              if (user == null) { return User.findUserByEmail(mailToBeRegistered) }
+              if (user == null) { return User.findOne({email: mailToBeRegistered}) }
               return user;
               return user;
             });
             });
-        } else if (isSameEmailTreatedAsIdenticalUser) {
-          promise = User.findUserByEmail(mailToBeRegistered);
+        }
+        else if (isSameEmailTreatedAsIdenticalUser) {
+          promise = User.findOne({email: mailToBeRegistered});
         }
         }
 
 
         return promise
         return promise

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

@@ -471,13 +471,6 @@ module.exports = function(crowi) {
     return this.findOne({username});
     return this.findOne({username});
   };
   };
 
 
-  userSchema.statics.findUserByEmail = function(email) {
-    if (email == null) {
-      return Promise.resolve(null);
-    }
-    return this.findOne({email});
-  };
-
   userSchema.statics.findUserByApiToken = function(apiToken) {
   userSchema.statics.findUserByApiToken = function(apiToken) {
     if (apiToken == null) {
     if (apiToken == null) {
       return Promise.resolve(null);
       return Promise.resolve(null);