Fixed user groups.
Ylian Saint-Hilaire committed
Jul 28, 2019 at 12:16 UTC
8eec48d49577b636fd784120be88734ded952eb5
1 file changed
+3
-2
meshuser.js
+3
-2
@@ -1100,7 +1100,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
1100
if (domain.newaccountsrights) { newuser.siteadmin = domain.newaccountsrights; }
1101
if (command.users[i].email != null) { newuser.email = command.users[i].email.toLowerCase(); if (command.users[i].emailVerified === true) { newuser.emailVerified = true; } } // Email, always lowercase
1102
if (command.users[i].resetNextLogin === true) { newuser.passchange = -1; } else { newuser.passchange = Math.floor(Date.now() / 1000); }
1103
- if ((command.users[i].groups != null) && (common.validateStrArray(command.users[i].groups, 1, 32))) { newuser.groups = command.users[i].groups; } // New account are automatically part of our groups.
1103
+ if (user.groups) { newuser.groups = user.groups; } // New accounts are automatically part of our groups (Realms).
1104
1105
if (parent.users[newuserid] == null) {
1106
parent.users[newuserid] = newuser;
@@ -1188,6 +1188,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
1188
else if (domain.newaccountsrights) { newuser.siteadmin = domain.newaccountsrights; }
1189
if (command.email != null) { newuser.email = command.email.toLowerCase(); if (command.emailVerified === true) { newuser.emailVerified = true; } } // Email
1190
if (command.resetNextLogin === true) { newuser.passchange = -1; } else { newuser.passchange = Math.floor(Date.now() / 1000); }
1191
+ if (user.groups) { newuser.groups = user.groups; } // New accounts are automatically part of our groups (Realms).
1192
1193
parent.users[newuserid] = newuser;
1194
@@ -1268,7 +1269,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
1269
}
1270
groups2.sort();
1271
1271
- // Set the user groups
1272
+ // Set the user groups (Realms)
1273
if (chguser.groups != groups2) { chguser.groups = groups2; change = 1; }
1274
1275
// Add any missing groups in the target list