refactored all grpc to be uniform

netclient/functions/checkin.go

@@ -186,9 +186,15 @@ func Pull(network string, manual bool) (*models.Node, error) {
 			return nil, err
 		}
 
+		data, err := json.Marshal(&node)
+		if err != nil {
+			ncutils.PrintLog("Failed to parse node config: "+err.Error(), 1)
+			return nil, err
+		}
+
 		req := &nodepb.Object{
-			Data: node.MacAddress + "###" + node.Network,
-			Type: nodepb.STRING_TYPE,
+			Data: string(data),
+			Type: nodepb.NODE_TYPE,
 		}
 
 		readres, err := wcclient.ReadNode(ctx, req, grpc.Header(&header))

netclient/functions/common.go

@@ -1,6 +1,7 @@
 package functions
 
 import (
+	"encoding/json"
 	"errors"
 	"fmt"
 	"log"
@@ -164,18 +165,21 @@ func LeaveNetwork(network string) error {
 			log.Printf("Failed to authenticate: %v", err)
 		} else { // handle client side
 			var header metadata.MD
-			_, err = wcclient.DeleteNode(
-				ctx,
-				&nodepb.Object{
-					Data: node.ID,
-					Type: nodepb.STRING_TYPE,
-				},
-				grpc.Header(&header),
-			)
-			if err != nil {
-				ncutils.PrintLog("encountered error deleting node: "+err.Error(), 1)
-			} else {
-				ncutils.PrintLog("removed machine from "+node.Network+" network on remote server", 1)
+			nodeData, err := json.Marshal(&node)
+			if err == nil {
+				_, err = wcclient.DeleteNode(
+					ctx,
+					&nodepb.Object{
+						Data: string(nodeData),
+						Type: nodepb.NODE_TYPE,
+					},
+					grpc.Header(&header),
+				)
+				if err != nil {
+					ncutils.PrintLog("encountered error deleting node: "+err.Error(), 1)
+				} else {
+					ncutils.PrintLog("removed machine from "+node.Network+" network on remote server", 1)
+				}
 			}
 		}
 	}

netclient/functions/list.go

@@ -98,9 +98,14 @@ func getPeers(network string) ([]Peer, error) {
 	// Instantiate the BlogServiceClient with our client connection to the server
 	wcclient = nodepb.NewNodeServiceClient(conn)
 
+	nodeData, err := json.Marshal(&nodecfg)
+	if err != nil {
+		return []Peer{}, fmt.Errorf("could not parse config node on network %s : %w", network, err)
+	}
+
 	req := &nodepb.Object{
-		Data: nodecfg.MacAddress + "###" + nodecfg.Network,
-		Type: nodepb.STRING_TYPE,
+		Data: string(nodeData),
+		Type: nodepb.NODE_TYPE,
 	}
 
 	ctx, err := auth.SetJWT(wcclient, network)