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

set NetworkUser defaults

Browse Source
This commit is contained in:
afeiszli
2022-09-14 15:08:38 -04:00
parent 57f93c8b43
commit 255e400be8
3 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
controllers/networkusers.go
View File

@@ -95,6 +95,7 @@ func getNetworkUserData(w http.ResponseWriter, r *http.Request) {
Nodes: netUser.Nodes, Nodes: netUser.Nodes,
Clients: netUser.Clients, Clients: netUser.Clients,
} }
newData.User.SetDefaults()
// check network level permissions // check network level permissions
if doesNetworkAllow := pro.IsUserAllowed(&networks[i], networkUserName, u.Groups); doesNetworkAllow || netUser.AccessLevel == pro.NET_ADMIN { if doesNetworkAllow := pro.IsUserAllowed(&networks[i], networkUserName, u.Groups); doesNetworkAllow || netUser.AccessLevel == pro.NET_ADMIN {
netNodes, err := logic.GetNetworkNodes(netID) netNodes, err := logic.GetNetworkNodes(netID)

2
logic/pro/networkuser.go
View File

@@ -49,7 +49,7 @@ func CreateNetworkUser(network *models.Network, user *promodels.NetworkUser) err
if err != nil { if err != nil {
return err return err
} }
user.SetDefaults()
currentUsers.Add(user) currentUsers.Add(user)
data, err := json.Marshal(currentUsers) data, err := json.Marshal(currentUsers)
if err != nil { if err != nil {

10
models/promodels/networkuser.go
View File

@@ -25,3 +25,13 @@ func (N NetworkUserMap) Delete(ID NetworkUserID) {
func (N NetworkUserMap) Add(User *NetworkUser) { func (N NetworkUserMap) Add(User *NetworkUser) {
N[User.ID] = *User N[User.ID] = *User
} }
// SetDefaults - adds the defaults to network user
func (U *NetworkUser) SetDefaults() {
if U.Clients == nil {
U.Clients = []string{}
}
if U.Nodes == nil {
U.Nodes = []string{}
}
}