Net 1227 v2 (#3074)

* add list roles to pro and ce

* if not pro set user role to admin

* validate update user
This commit is contained in:
Abhishek K 2024-08-27 12:29:32 +05:30 committed by GitHub
parent d95b96ad6e
commit a4d528e267
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -268,6 +268,10 @@ func UpdateUser(userchange, user *models.User) (*models.User, error) {
if _, err := GetUser(user.UserName); err != nil {
return &models.User{}, err
}
err := ValidateUser(userchange)
if err != nil {
return &models.User{}, err
}
queryUser := user.UserName
if userchange.UserName != "" && user.UserName != userchange.UserName {
@ -302,12 +306,8 @@ func UpdateUser(userchange, user *models.User) (*models.User, error) {
}
user.UserGroups = userchange.UserGroups
user.NetworkRoles = userchange.NetworkRoles
err := ValidateUser(user)
if err != nil {
return &models.User{}, err
}
if err = database.DeleteRecord(database.USERS_TABLE_NAME, queryUser); err != nil {
if err := database.DeleteRecord(database.USERS_TABLE_NAME, queryUser); err != nil {
return &models.User{}, err
}
data, err := json.Marshal(&user)