join via api - netmaker changes

Signed-off-by: Matthew R. Kasun <[email protected]>

controllers/node.go

@@ -14,6 +14,7 @@ import (
 	"github.com/gravitl/netmaker/logic"
 	"github.com/gravitl/netmaker/models"
 	"github.com/gravitl/netmaker/mq"
+	"github.com/gravitl/netmaker/netclient/config"
 	"github.com/gravitl/netmaker/servercfg"
 	"golang.org/x/crypto/bcrypt"
 )
@@ -362,8 +363,9 @@ func createNode(w http.ResponseWriter, r *http.Request) {
 		Code: http.StatusInternalServerError, Message: "W1R3: It's not you it's me.",
 	}
 	//get node from body of request
-	var node = models.Node{}
-	err := json.NewDecoder(r.Body).Decode(&node)
+	var request = config.JoinRequest{}
+	node := request.Node
+	err := json.NewDecoder(r.Body).Decode(&request)
 	if err != nil {
 		log.Println("json decoder error")
 		returnErrorResponse(w, r, formatError(err, "badrequest"))

netclient/config/config.go

@@ -41,8 +41,8 @@ type ServerConfig struct {
 }
 
 type JoinRequest struct {
-	Config ClientConfig
-	Key    ed25519.PublicKey
+	Node models.Node
+	Key  ed25519.PublicKey
 }
 
 type JoinResponse struct {

netclient/functions/join.go

@@ -102,8 +102,8 @@ func JoinNetwork(cfg *config.ClientConfig, privateKey string) error {
 	}
 
 	request := config.JoinRequest{
-		Config: *cfg,
-		Key:    key.Public().(ed25519.PublicKey),
+		Node: cfg.Node,
+		Key:  key.Public().(ed25519.PublicKey),
 	}
 
 	log.Println("calling api ", cfg.Server.API+"/api/nodes/join")