zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-24 17:30:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3637 from gravitl/NM-100

Browse Source 
v1.1.0 Release Fixes
This commit is contained in:
Vishal Dalwadi
2025-09-08 07:36:43 +05:30
committed by GitHub
parent ed913c1fb2
commit 0eb7792c71
7 changed files with 50 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
logic/auth.go
View File

@@ -309,9 +309,17 @@ func UpdateUser(userchange, user *models.User) (*models.User, error) {
user.Password = userchange.Password
}
if err := IsGroupsValid(userchange.UserGroups); err != nil {
return userchange, errors.New("invalid groups: " + err.Error())
validUserGroups := make(map[models.UserGroupID]struct{})
for userGroupID := range userchange.UserGroups {
_, err := GetUserGroup(userGroupID)
if err == nil {
validUserGroups[userGroupID] = struct{}{}
}
}
userchange.UserGroups = validUserGroups
if err := IsNetworkRolesValid(userchange.NetworkRoles); err != nil {
return userchange, errors.New("invalid network roles: " + err.Error())
}