MyFavMirrors
/
MeshCentral
mirror of https://github.com/Ylianst/MeshCentral.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix checking sub property before parent property 

fixes bug 4520
This commit is contained in:
mstrhakr 2022-09-07 10:31:02 -04:00
parent d25bfeafa5
commit b0ec3af9bb
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webserver.js
View File

@ -2673,8 +2673,9 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
if ((req.user.name != null) && (req.user.name != user.name)) { user.name = req.user.name; userChanged = true; } if ((req.user.name != null) && (req.user.name != user.name)) { user.name = req.user.name; userChanged = true; }
if ((req.user.email != null) && (req.user.email != user.email)) { user.email = req.user.email; user.emailVerified = true; userChanged = true; } if ((req.user.email != null) && (req.user.email != user.email)) { user.email = req.user.email; user.emailVerified = true; userChanged = true; }
if (typeof domain.authstrategies[authStrategy].groups == 'object') {
// Sync the user groups if enabled // Sync the user groups if enabled
if (domain.authstrategies[authStrategy].groups.sync.enabled === true) { syncExternalUserGroups(domain, user, userMemberships, authStrategy) } if ((typeof domain.authstrategies[authStrategy].groups.sync == 'object') && (domain.authstrategies[authStrategy].groups.sync.enabled === true)) { syncExternalUserGroups(domain, user, userMemberships, authStrategy) }
// See if the user is a member of the site admin group. // See if the user is a member of the site admin group.
if ((typeof domain.authstrategies[authStrategy].groups.siteadmin !== 'undefined') && (domain.authstrategies[authStrategy].groups.siteadmin !== null)) { if ((typeof domain.authstrategies[authStrategy].groups.siteadmin !== 'undefined') && (domain.authstrategies[authStrategy].groups.siteadmin !== null)) {
@ -2688,6 +2689,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
userChanged = true; userChanged = true;
} }
} }
}
// Update db record for user if there are changes detected // Update db record for user if there are changes detected
if (userChanged) { if (userChanged) {