itizawa %!s(int64=5) %!d(string=hai) anos
pai
achega
23d85b5569
Modificáronse 2 ficheiros con 2 adicións e 3 borrados
  1. 0 1
      src/client/js/services/PersonalContainer.js
  2. 2 2
      src/server/models/user.js

+ 0 - 1
src/client/js/services/PersonalContainer.js

@@ -55,7 +55,6 @@ export default class PersonalContainer extends Container {
         isEmailPublished: currentUser.isEmailPublished,
         lang: currentUser.lang,
         isGravatarEnabled: currentUser.isGravatarEnabled,
-        isPasswordSet: (currentUser.password != null),
         apiToken: currentUser.apiToken,
       });
     }

+ 2 - 2
src/server/models/user.js

@@ -441,14 +441,14 @@ module.exports = function(crowi) {
     if (username == null) {
       return Promise.resolve(null);
     }
-    return this.findOne({ username });
+    return this.findOne({ username }).select(this.USER_PUBLIC_FIELDS);
   };
 
   userSchema.statics.findUserByApiToken = function(apiToken) {
     if (apiToken == null) {
       return Promise.resolve(null);
     }
-    return this.findOne({ apiToken });
+    return this.findOne({ apiToken }).select(this.USER_PUBLIC_FIELDS);
   };
 
   userSchema.statics.findUserByGoogleId = function(googleId, callback) {