mirror of
https://github.com/gravitl/netmaker.git
synced 2025-09-09 22:55:02 +08:00
Net 1227 v2 (#3075)
* 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
This commit is contained in:
parent
a4d528e267
commit
d532060c50
1 changed files with 8 additions and 2 deletions
|
@ -282,6 +282,9 @@ func UpdateUser(userchange, user *models.User) (*models.User, error) {
|
|||
user.UserName = userchange.UserName
|
||||
}
|
||||
if userchange.Password != "" {
|
||||
if len(userchange.Password) < 5 {
|
||||
return &models.User{}, errors.New("password requires min 5 characters")
|
||||
}
|
||||
// encrypt that password so we never see it again
|
||||
hash, err := bcrypt.GenerateFromPassword([]byte(userchange.Password), 5)
|
||||
|
||||
|
@ -306,8 +309,11 @@ func UpdateUser(userchange, user *models.User) (*models.User, error) {
|
|||
}
|
||||
user.UserGroups = userchange.UserGroups
|
||||
user.NetworkRoles = userchange.NetworkRoles
|
||||
|
||||
if err := database.DeleteRecord(database.USERS_TABLE_NAME, queryUser); err != nil {
|
||||
err = ValidateUser(user)
|
||||
if err != nil {
|
||||
return &models.User{}, err
|
||||
}
|
||||
if err = database.DeleteRecord(database.USERS_TABLE_NAME, queryUser); err != nil {
|
||||
return &models.User{}, err
|
||||
}
|
||||
data, err := json.Marshal(&user)
|
||||
|
|
Loading…
Add table
Reference in a new issue