Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-26 16:46:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: use escaped group names in invite modal

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2022-01-27 16:00:01 -05:00
parent e1e1d5223e
commit 2a89ad8288
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/controllers/write/users.js
View File

@@ -200,7 +200,7 @@ Users.invite = async (req, res) => {
return helpers.formatApiResponse(403, res, new Error('[[error:no-privileges]]')); return helpers.formatApiResponse(403, res, new Error('[[error:no-privileges]]'));
} }
const inviteGroups = await groups.getUserInviteGroups(req.uid); const inviteGroups = (await groups.getUserInviteGroups(req.uid)).map(group => group.name);
const cannotInvite = groupsToJoin.some(group => !inviteGroups.includes(group)); const cannotInvite = groupsToJoin.some(group => !inviteGroups.includes(group));
if (groupsToJoin.length > 0 && cannotInvite) { if (groupsToJoin.length > 0 && cannotInvite) {
return helpers.formatApiResponse(403, res, new Error('[[error:no-privileges]]')); return helpers.formatApiResponse(403, res, new Error('[[error:no-privileges]]'));
@@ -231,7 +231,7 @@ Users.getInviteGroups = async function (req, res) {
} }
const userInviteGroups = await groups.getUserInviteGroups(req.params.uid); const userInviteGroups = await groups.getUserInviteGroups(req.params.uid);
return helpers.formatApiResponse(200, res, userInviteGroups); return helpers.formatApiResponse(200, res, userInviteGroups.map(group => group.displayName));
}; };
Users.listEmails = async (req, res) => { Users.listEmails = async (req, res) => {

8
src/groups/user.js
View File

@@ -37,7 +37,10 @@ module.exports = function (Groups) {
allGroups = allGroups.filter(group => !Groups.ephemeralGroups.includes(group.name)); allGroups = allGroups.filter(group => !Groups.ephemeralGroups.includes(group.name));
const publicGroups = allGroups.filter(group => group.hidden === 0 && group.system === 0 && group.private === 0); const publicGroups = allGroups.filter(group => group.hidden === 0 && group.system === 0 && group.private === 0);
const adminModGroups = [{ name: 'administrators' }, { name: 'Global Moderators' }]; const adminModGroups = [
{ name: 'administrators', displayName: 'administrators' },
{ name: 'Global Moderators', displayName: 'Global Moderators' },
];
// Private (but not hidden) // Private (but not hidden)
const privateGroups = allGroups.filter(group => group.hidden === 0 && group.system === 0 && group.private === 1); const privateGroups = allGroups.filter(group => group.hidden === 0 && group.system === 0 && group.private === 1);
@@ -58,7 +61,6 @@ module.exports = function (Groups) {
} }
return inviteGroups return inviteGroups
.concat(publicGroups) .concat(publicGroups);
.map(group => group.name);
}; };
}; };