itizawa 5 سال پیش
والد
کامیت
b3a3e65525
2فایلهای تغییر یافته به همراه7 افزوده شده و 3 حذف شده
  1. 1 2
      src/server/models/user.js
  2. 6 1
      src/server/routes/apiv3/personal-setting.js

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

@@ -65,11 +65,10 @@ module.exports = function(crowi) {
   }, {
     toObject: {
       transform: (doc, ret, opt) => {
-        const isEmailInclude = opt.isEmailInclude || false;
         // omit password
         delete ret.password;
         // omit email
-        if (!doc.isEmailPublished && !isEmailInclude) {
+        if (!doc.isEmailPublished) {
           delete ret.email;
         }
         return ret;

+ 6 - 1
src/server/routes/apiv3/personal-setting.js

@@ -127,7 +127,12 @@ module.exports = (crowi) => {
 
     try {
       const user = await User.findUserByUsername(username);
-      const currentUser = user.toObject({ isEmailInclude: true });
+
+      // return email whether it's private
+      const { email } = user;
+      const currentUser = user.toObject();
+      currentUser.email = email;
+
       return res.apiv3({ currentUser });
     }
     catch (err) {