Skip to content

Node.js based forum software built for the modern web

Merge branch 'master' into develop

Barış Soner Uşaklı5fedc76ec6b4
diff --cc src/api/users.js
index 6c04995cd0,35fa345143..83c61f4da7
--- a/src/api/users.js
+++ b/src/api/users.js
@@@ -475,14 -475,14 +475,14 @@@ usersAPI.listEmails = async (caller, {
};
usersAPI.getEmail = async (caller, { uid, email }) => {
- const [isPrivileged, { showemail }, emailUid] = await Promise.all([
+ const [isPrivileged, { showemail }, ownerUid] = await Promise.all([
- user.isPrivileged(caller.uid),
+ user.isAdminOrGlobalMod(caller.uid),
user.getSettings(uid),
- db.sortedSetScore('email:uid', String(email).toLowerCase()),
+ db.sortedSetScore('email:uid', email.toLowerCase()),
]);
-
const isSelf = caller.uid === parseInt(uid, 10);
- const exists = parseInt(emailUid, 10) === parseInt(uid, 10);
+ const exists = ownerUid && parseInt(ownerUid, 10) === parseInt(uid, 10);
+
return exists && (isSelf || isPrivileged || showemail);
};