mirror of
https://github.com/gravitl/netmaker.git
synced 2025-09-11 23:54:22 +08:00
NET-1227: fix update password on update user handler (#3077)
* add list roles to pro and ce * if not pro set user role to admin * validate update user * add separate validation check for password on update * remove validate check
This commit is contained in:
parent
d532060c50
commit
0a1558d5ac
1 changed files with 1 additions and 5 deletions
|
@ -268,10 +268,6 @@ func UpdateUser(userchange, user *models.User) (*models.User, error) {
|
||||||
if _, err := GetUser(user.UserName); err != nil {
|
if _, err := GetUser(user.UserName); err != nil {
|
||||||
return &models.User{}, err
|
return &models.User{}, err
|
||||||
}
|
}
|
||||||
err := ValidateUser(userchange)
|
|
||||||
if err != nil {
|
|
||||||
return &models.User{}, err
|
|
||||||
}
|
|
||||||
|
|
||||||
queryUser := user.UserName
|
queryUser := user.UserName
|
||||||
if userchange.UserName != "" && user.UserName != userchange.UserName {
|
if userchange.UserName != "" && user.UserName != userchange.UserName {
|
||||||
|
@ -309,7 +305,7 @@ func UpdateUser(userchange, user *models.User) (*models.User, error) {
|
||||||
}
|
}
|
||||||
user.UserGroups = userchange.UserGroups
|
user.UserGroups = userchange.UserGroups
|
||||||
user.NetworkRoles = userchange.NetworkRoles
|
user.NetworkRoles = userchange.NetworkRoles
|
||||||
err = ValidateUser(user)
|
err := ValidateUser(user)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return &models.User{}, err
|
return &models.User{}, err
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue