zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-16 13:51:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Net 1227 v2 (#3074)

Browse Source 
* 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
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
logic/auth.go
View File

@@ -268,6 +268,10 @@ 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 {
@@ -302,12 +306,8 @@ 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 != 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 return &models.User{}, err
} }
data, err := json.Marshal(&user) data, err := json.Marshal(&user)