crichardson/enigma-bbs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

oputil cannot remove user from group #331

Browse Source
This commit is contained in:
Bryan Ashby
2020-11-29 14:43:26 -07:00
parent 6776453005
commit 6f06821f0c
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/oputil/oputil_help.js
View File

@@ -57,7 +57,7 @@ Actions:
lock USERNAME Set a user's status to "locked"
group USERNAME [+|-]GROUP Adds (+) or removes (-) user from a group
group USERNAME [+|~]GROUP Adds (+) or removes (~) user from a group
list [FILTER] List users with optional FILTER.

6
core/oputil/oputil_user.js
View File

@@ -275,7 +275,7 @@ function modUserGroups(user) {
let groupName = argv._[argv._.length - 1].toString().replace(/["']/g, ''); // remove any quotes - necessary to allow "-foo"
let action = groupName[0]; // + or -
if('-' === action || '+' === action) {
if('-' === action || '+' === action || '~' === action) {
groupName = groupName.substr(1);
}
@@ -286,7 +286,7 @@ function modUserGroups(user) {
}
//
// Groups are currently arbritary, so do a slight validation
// Groups are currently arbitrary, so do a slight validation
//
if(!/[A-Za-z0-9]+/.test(groupName)) {
process.exitCode = ExitCodes.BAD_ARGS;
@@ -303,7 +303,7 @@ function modUserGroups(user) {
}
const UserGroup = require('../../core/user_group.js');
if('-' === action) {
if('-' === action || '~' === action) {
UserGroup.removeUserFromGroup(user.userId, groupName, done);
} else {
UserGroup.addUserToGroup(user.userId, groupName, done);