From 587442dfe3bd6c2e5a98b48cf649797a632fc403 Mon Sep 17 00:00:00 2001
From: afeiszli <alex.feiszli@gmail.com>
Date: Tue, 13 Apr 2021 01:10:57 -0400
Subject: [PATCH] adding necessary changes for client and server key to work

---
 controllers/networkHttpController.go |  2 +-
 netclient/functions/common.go        | 10 +++++++---
 serverctl/serverctl.go               |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/controllers/networkHttpController.go b/controllers/networkHttpController.go
index 53cc5b1e..506c76ce 100644
--- a/controllers/networkHttpController.go
+++ b/controllers/networkHttpController.go
@@ -526,7 +526,7 @@ func createAccessKey(w http.ResponseWriter, r *http.Request) {
 	netID := params["networkname"]
 	address := gconf.ServerGRPC + gconf.PortGRPC
 
-	accessstringdec := address + "." + netID + "." + accesskey.Value + "." + privAddr
+	accessstringdec := address + "|" + netID + "|" + accesskey.Value + "|" + privAddr
 	accesskey.AccessString = base64.StdEncoding.EncodeToString([]byte(accessstringdec))
 
 	network.AccessKeys = append(network.AccessKeys, accesskey)
diff --git a/netclient/functions/common.go b/netclient/functions/common.go
index baa0e64a..6c8ba8fb 100644
--- a/netclient/functions/common.go
+++ b/netclient/functions/common.go
@@ -93,7 +93,7 @@ func Install(accesskey string, password string, server string, network string, n
 			log.Fatalf("Something went wrong decoding your token: %v", err)
 		}
 		token := string(btoken)
-		tokenvals := strings.Split(token, ".")
+		tokenvals := strings.Split(token, "|")
 		tserver = tokenvals[0]
 		tnetwork = tokenvals[1]
 		tkey = tokenvals[2]
@@ -108,11 +108,15 @@ func Install(accesskey string, password string, server string, network string, n
 		if accesskey == "badkey" {
 			accesskey = tkey
 		}
+		fmt.Println(trange)
 		if trange != "" {
 			islocal = true
 			_, localrange, err = net.ParseCIDR(trange)
-			printrange = localrange.String()
-
+			if err == nil {
+				printrange = localrange.String()
+			} else {
+				//localrange = ""
+			}
 		} else {
 			printrange = "Not a local network. Will use public address for endpoint."
 		}
diff --git a/serverctl/serverctl.go b/serverctl/serverctl.go
index 7ab218bc..c335be00 100644
--- a/serverctl/serverctl.go
+++ b/serverctl/serverctl.go
@@ -13,7 +13,7 @@ import (
 func DownloadNetclient() error {
 
 	// Get the data
-	resp, err := http.Get("https://github.com/gravitl/netmaker/releases/download/develop/netclient")
+	resp, err := http.Get("https://github.com/gravitl/netmaker/releases/download/latest/netclient")
 	if err != nil {
 		return err
 	}