gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-09-12 08:04:25 +08:00
Code Issues Projects Releases Packages Wiki Activity

Net 1227 v2 (#3075)

Browse source 
* 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:
Abhishek K 2024-08-27 13:36:53 +05:30 • committed by GitHub
parent a4d528e267
commit d532060c50
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
logic/auth.go
View file

@ -282,6 +282,9 @@ func UpdateUser(userchange, user *models.User) (*models.User, error) {
user.UserName = userchange.UserName user.UserName = userchange.UserName
} }
if userchange.Password != "" { 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 // encrypt that password so we never see it again
hash, err := bcrypt.GenerateFromPassword([]byte(userchange.Password), 5) 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.UserGroups = userchange.UserGroups
user.NetworkRoles = userchange.NetworkRoles user.NetworkRoles = userchange.NetworkRoles
err = ValidateUser(user)
if err := database.DeleteRecord(database.USERS_TABLE_NAME, queryUser); err != nil { if err != nil {
return &models.User{}, err
}
if err = database.DeleteRecord(database.USERS_TABLE_NAME, queryUser); err != nil {
return &models.User{}, err return &models.User{}, err
} }
data, err := json.Marshal(&user) data, err := json.Marshal(&user)