Browse Source

get node fix

Abhishek Kondur 2 years ago
parent
commit
4c63478888
2 changed files with 3 additions and 1 deletions
  1. 2 1
      controllers/node.go
  2. 1 0
      models/structs.go

+ 2 - 1
controllers/node.go

@@ -435,7 +435,7 @@ func getNode(w http.ResponseWriter, r *http.Request) {
 		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
-	peerUpdate, err := logic.GetPeerUpdateForHost(host)
+	peerUpdate, err := logic.GetPeerUpdate(&node, host)
 	if err != nil && !database.IsEmptyRecord(err) {
 		logger.Log(0, r.Header.Get("user"),
 			fmt.Sprintf("error fetching wg peers config for node [ %s ]: %v", nodeid, err))
@@ -455,6 +455,7 @@ func getNode(w http.ResponseWriter, r *http.Request) {
 		Node:         *legacy,
 		Peers:        peerUpdate.Peers,
 		ServerConfig: server,
+		PeerIDs:      peerUpdate.PeerIDs,
 	}
 
 	if servercfg.Is_EE && nodeRequest {

+ 1 - 0
models/structs.go

@@ -206,6 +206,7 @@ type NodeGet struct {
 	Host         Host                 `json:"host" yaml:"host"`
 	Peers        []wgtypes.PeerConfig `json:"peers" bson:"peers" yaml:"peers"`
 	ServerConfig ServerConfig         `json:"serverconfig" bson:"serverconfig" yaml:"serverconfig"`
+	PeerIDs      PeerMap              `json:"peerids,omitempty" bson:"peerids,omitempty" yaml:"peerids,omitempty"`
 }
 
 // NodeJoinResponse data returned to node in response to join