Added user groups.
Ylian Saint-Hilaire committed
Apr 12, 2019 at 17:56 UTC
1da8347924622ea9503ede10ed10aae11031bf22
2 files changed
+42
meshuser.js
+9
@@ -895,6 +895,15 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
895
if ((command.emailVerified === true || command.emailVerified === false) && (chguser.emailVerified != command.emailVerified)) { chguser.emailVerified = command.emailVerified; change = 1; }
896
if ((common.validateInt(command.quota, 0) || command.quota == null) && (command.quota != chguser.quota)) { chguser.quota = command.quota; if (chguser.quota == null) { delete chguser.quota; } change = 1; }
897
if ((user.siteadmin == 0xFFFFFFFF) && common.validateInt(command.siteadmin) && (chguser.siteadmin != command.siteadmin)) { chguser.siteadmin = command.siteadmin; change = 1; }
898
+
899
+ if ((Array.isArray(command.groups)) && (user.name != command.name)) {
900
+ if (command.groups.length == 0) {
901
+ if (chguser.groups != null) { delete chguser.groups; change = 1; }
902
+ } else {
903
+ if (chguser.groups != command.groups) { chguser.groups = command.groups; change = 1; }
904
+ }
905
+ }
906
+
907
if (change == 1) {
908
db.SetUser(chguser);
909
parent.parent.DispatchEvent([chguser._id], obj, 'resubscribe');
views/default.handlebars
+33
@@ -6775,6 +6775,34 @@
6775
meshserver.send({ action: 'adduser', username: Q('p4name').value, email: Q('p4email').value, pass: Q('p4pass1').value, resetNextLogin: Q('p4resetNextLogin').checked });
6776
}
6777
6778
+ function showUserGroupDialog(e, userid) {
6779
+ if (xxdialogMode) return;
6780
+ haltEvent(e);
6781
+ userid = decodeURIComponent(userid);
6782
+ var user = users[userid.toLowerCase()], groups = "";
6783
+ if (user.groups != null) { groups = user.groups.join(', ') }
6784
+ var x = 'Enter a comma seperate list of groups.<br /><br />';
6785
+ x += addHtmlValue('Groups', '<input id=dp4usergroups style=width:230px value="' + groups + '" placeholder="Group1, Group2, Group3" maxlength=256 onchange=p4validateUserGroups() onkeyup=p4validateUserGroups() />');
6786
+ setDialogMode(2, "User Groups", 3, showUserGroupDialogEx, x, user);
6787
+ focusTextBox('dp4usergroups');
6788
+ p4validateUserGroups();
6789
+ return false;
6790
+ }
6791
+
6792
+ function p4validateUserGroups() {
6793
+ var groups = Q('dp4usergroups').value;
6794
+ var k = 0, i = groups.indexOf('\"') + groups.indexOf('/') + groups.indexOf('>') + groups.indexOf('<') + groups.indexOf('\'');
6795
+ var g = groups.split(',');
6796
+ for (var j in g) { if (g[j].trim().length == 0) k++; }
6797
+ QE('idx_dlgOkButton', (groups == '') || ((i == -5) && (k < 1)));
6798
+ }
6799
+
6800
+ function showUserGroupDialogEx(event, user) {
6801
+ var groups = Q('dp4usergroups').value, g = groups.split(','), g2 = [];
6802
+ for (var j in g) { var x = g[j].trim(); if (x.length > 0) { g2.push(x); } }
6803
+ meshserver.send({ action: 'edituser', name: user.name, groups: g2 });
6804
+ }
6805
+
6806
function showUserAdminDialog(e, userid) {
6807
if (xxdialogMode) return;
6808
haltEvent(e);
@@ -6886,6 +6914,7 @@
6914
if (user.passchange == -1) { x += addDeviceAttribute('Password', 'Will be changed on next login.'); }
6915
else if (user.passchange) { x += addDeviceAttribute('Password', 'Last changed: ' + new Date(user.passchange * 1000).toLocaleString()); }
6916
6917
+ // Device Groups
6918
var linkCount = 0, linkCountStr = '<i>None<i>';
6919
if (user.links) {
6920
for (var i in user.links) { linkCount++; }
@@ -6893,6 +6922,10 @@
6922
}
6923
x += addDeviceAttribute('Device Groups', linkCountStr);
6924
6925
+ // User Groups
6926
+ if (user.groups) { linkCountStr = EscapeHtml(user.groups.join(', ')); } else { linkCountStr = '<i>None<i>'; }
6927
+ x += addDeviceAttribute('User Groups', addLinkConditional(linkCountStr, 'showUserGroupDialog(event,\"' + userid + '\")', ((userinfo.groups == null) && (userinfo.siteadmin & 2) && (userinfo._id != user._id))));
6928
+
6929
var multiFactor = 0;
6930
if ((user.otpsecret > 0) || (user.otphkeys > 0)) {
6931
multiFactor = 1;