merge fix for netclient

config/dnsconfig/netmaker.hosts

@@ -1 +0,0 @@
-10.10.10.1       nethub.default

functions/helpers.go

@@ -44,9 +44,9 @@ func CreateServerToken(netID string) (string, error) {
 	if *network.IsLocal {
 		privAddr = network.LocalRange
 	}
-
         accessstringdec := address + "|"+ address + "|" + address + "|" + netID + "|" + accesskey.Value + "|" + privAddr
 
+	log.Println("Access String: " + accessstringdec)
 	accesskey.AccessString = base64.StdEncoding.EncodeToString([]byte(accessstringdec))
 
 	network.AccessKeys = append(network.AccessKeys, accesskey)

netclient/command/commands.go

@@ -135,10 +135,6 @@ func Uninstall(cfg config.GlobalConfig) error {
 	err = functions.Unregister(cfg)
         return err
 }
-func Reregister(cfg config.GlobalConfig) error {
-        err := functions.Reregister(cfg)
-        return err
-}
 func Unregister(cfg config.GlobalConfig) error {
         err := functions.Unregister(cfg)
         return err

netclient/config/config.go

@@ -273,6 +273,13 @@ func ModGlobalConfig(cfg models.IntClient) error{
         if cfg.ServerKey != ""{
                 modconfig.Client.ServerKey = cfg.ServerKey
         }
+        if cfg.AccessKey != ""{
+                modconfig.Client.AccessKey = cfg.AccessKey
+        }
+        if cfg.ClientID != ""{
+                modconfig.Client.ClientID = cfg.ClientID
+        }
+
         err = WriteGlobal(&modconfig)
         return err
 }

netclient/functions/register.go

@@ -52,6 +52,8 @@ func Register(cfg config.GlobalConfig) error {
 		return errors.New("request to server failed: " + res.Status)
 	}
 	bodyBytes, err := ioutil.ReadAll(res.Body)
+        //bodyString := string(bodyBytes)
+	//spew.Dump(bodyString)
 	if err != nil {
 		return err
 	}
@@ -74,6 +76,7 @@ func Register(cfg config.GlobalConfig) error {
 func Unregister(cfg config.GlobalConfig) error {
 	client := &http.Client{ Timeout: 7 * time.Second,}
 	publicaddress := cfg.Client.ServerPublicEndpoint + ":" + cfg.Client.ServerAPIPort
+	log.Println("sending delete request to: " + "http://"+publicaddress+"/api/intclient/"+cfg.Client.ClientID)
 	req, err := http.NewRequest("DELETE", "http://"+publicaddress+"/api/intclient/"+cfg.Client.ClientID, nil)
 	if err != nil {
                 log.Println(err)
@@ -94,17 +97,3 @@ func Unregister(cfg config.GlobalConfig) error {
 	}
 	return err
 }
-
-func Reregister(cfg config.GlobalConfig) error {
-	err := Unregister(cfg)
-	if err != nil {
-		log.Println("failed to un-register")
-		return err
-	}
-	err = Register(cfg)
-	if err != nil {
-		log.Println("failed to re-register after unregistering")
-	}
-	return err
-}
-

netclient/main.go

@@ -199,22 +199,6 @@ func main() {
                 return err
             },
         },
-        {
-            Name:  "reregister",
-            Usage: "Re-Register with Netmaker Server for secure GRPC communications.",
-            Flags: cliFlags,
-            Action: func(c *cli.Context) error {
-                cfg, err := config.ReadGlobalConfig()
-                if err != nil {
-                        return err
-                }
-                var gconf config.GlobalConfig
-                gconf = *cfg
-
-		err = command.Reregister(gconf)
-                return err
-            },
-        },
 	{
             Name:  "join",
             Usage: "Join a Netmaker network.",

serverctl/serverctl.go

@@ -208,7 +208,7 @@ func AddNetwork(network string) (bool, error) {
                 return false, err
 	}
 	token, err := functions.CreateServerToken(network)
-        if err != nil {
+	if err != nil {
                 log.Println("could not create server token for " + network)
 		return false, err
         }