Skip to content

Node.js based forum software built for the modern web

fix: the admin setting hideEmail/hideFullname

Barış Soner Uşaklıfddbb629981a
diff --git a/src/controllers/user.js b/src/controllers/user.js
index 6c924acf87..9ec7677cf5 100644
--- a/src/controllers/user.js
+++ b/src/controllers/user.js
@@ -44,9 +44,11 @@ userController.getUserDataByField = async function (callerUid, field, fieldValue
} else if (field === 'email') {
uid = await user.getUidByEmail(fieldValue);
if (uid) {
- const isPrivileged = await user.isAdminOrGlobalMod(callerUid);
- const settings = await user.getSettings(uid);
- if (!isPrivileged && (settings && !settings.showemail)) {
+ const [isPrivileged, { showemail }] = await Promise.all([
+ user.isAdminOrGlobalMod(callerUid),
+ user.getSettings(uid),
+ ]);
+ if (!isPrivileged && !showemail) {
uid = 0;
}
}
diff --git a/src/posts/user.js b/src/posts/user.js
index ec4454055e..ef6e0ab266 100644
--- a/src/posts/user.js
+++ b/src/posts/user.js
@@ -25,10 +25,6 @@ module.exports = function (Posts) {
userData.forEach((userData, index) => {
userData.fullname = userSettings[index].showfullname ? userData.fullname || '' : undefined;
userData.selectedGroups = [];
-
- if (meta.config.hideFullname) {
- userData.fullname = undefined;
- }
});
const result = await Promise.all(userData.map(async (userData) => {
diff --git a/src/user/data.js b/src/user/data.js
index 687848f7f0..471a650057 100644
--- a/src/user/data.js
+++ b/src/user/data.js
@@ -237,10 +237,10 @@ module.exports = function (User) {
const isSelf = parseInt(callerUID, 10) === parseInt(_userData.uid, 10);
const privilegedOrSelf = isAdmin || isGlobalModerator || isSelf;
- if (!privilegedOrSelf && (!userSettings[idx].showemail || meta.config.hideEmail)) {
+ if (!privilegedOrSelf && !userSettings[idx].showemail) {
_userData.email = '';
}
- if (!privilegedOrSelf && (!userSettings[idx].showfullname || meta.config.hideFullname)) {
+ if (!privilegedOrSelf && !userSettings[idx].showfullname) {
_userData.fullname = '';
}
return _userData;
diff --git a/src/user/settings.js b/src/user/settings.js
index 9a14995b0d..94050e0dd8 100644
--- a/src/user/settings.js
+++ b/src/user/settings.js
@@ -54,8 +54,8 @@ module.exports = function (User) {
const defaultTopicsPerPage = meta.config.topicsPerPage;
const defaultPostsPerPage = meta.config.postsPerPage;
- settings.showemail = parseInt(getSetting(settings, 'showemail', 0), 10) === 1;
- settings.showfullname = parseInt(getSetting(settings, 'showfullname', 0), 10) === 1;
+ settings.showemail = parseInt(getSetting(settings, 'showemail', 0), 10) === 1 && !meta.config.hideEmail;
+ settings.showfullname = parseInt(getSetting(settings, 'showfullname', 0), 10) === 1 && !meta.config.hideFullname;
settings.openOutgoingLinksInNewTab = parseInt(getSetting(settings, 'openOutgoingLinksInNewTab', 0), 10) === 1;
settings.dailyDigestFreq = getSetting(settings, 'dailyDigestFreq', 'off');
settings.usePagination = parseInt(getSetting(settings, 'usePagination', 0), 10) === 1;
diff --git a/test/user.js b/test/user.js
index 2f649faa4a..534a49d6dd 100644
--- a/test/user.js
+++ b/test/user.js
@@ -2580,6 +2580,26 @@ describe('User', () => {
assert.strictEqual(userData[1].email, '');
});
+ it('should respect admin setting in api.user.listEmails', async () => {
+ assert.strictEqual(
+ await apiUser.listEmails({ uid: regularUser.uid }, { uid: hidingUser.uid }),
+ null,
+ );
+ });
+
+ it('should respect admin setting in api.user.getEmail', async () => {
+ assert.strictEqual(
+ await apiUser.getEmail({ uid: regularUser.uid }, { uid: hidingUser.uid }),
+ false,
+ );
+ });
+
+ it('should respect admin setting in userController.getUserDataByField', async () => {
+ const userController = require('../src/controllers/user');
+ const userData = await userController.getUserDataByField({ uid: regularUser.uid }, 'email', hidingUser.email);
+ assert.strictEqual(userData, null);
+ });
+
it('should hide fullname in topic list and topic', async () => {
await Topics.post({
uid: hidingUser.uid,