diff --git a/netclient/functions/common.go b/netclient/functions/common.go index 1a2d3dbe..f7a86db1 100644 --- a/netclient/functions/common.go +++ b/netclient/functions/common.go @@ -133,6 +133,7 @@ func Uninstall() error { } } } + err = nil // clean up OS specific stuff if ncutils.IsWindows() { daemon.CleanupWindows() @@ -159,19 +160,21 @@ func LeaveNetwork(network string, force bool) error { if node.IsServer != "yes" { token, err := Authenticate(cfg) if err != nil { - return fmt.Errorf("unable to authenticate %w", err) - } - url := "https://" + cfg.Server.API + "/api/nodes/" + cfg.Network + "/" + cfg.Node.ID - response, err := API("", http.MethodDelete, url, token) - if err != nil { - return fmt.Errorf("error deleting node on server %w", err) - } - if response.StatusCode == http.StatusOK { - logger.Log(0, "deleted node", cfg.Node.Name, " on network ", cfg.Network) + logger.Log(0, "unable to authenticate: "+err.Error()) } else { - bodybytes, _ := io.ReadAll(response.Body) - defer response.Body.Close() - return fmt.Errorf("error deleting node on server %s %s", response.Status, string(bodybytes)) + url := "https://" + cfg.Server.API + "/api/nodes/" + cfg.Network + "/" + cfg.Node.ID + response, err := API("", http.MethodDelete, url, token) + if err != nil { + logger.Log(0, "error deleting node on server: "+err.Error()) + } else { + if response.StatusCode == http.StatusOK { + logger.Log(0, "deleted node", cfg.Node.Name, " on network ", cfg.Network) + } else { + bodybytes, _ := io.ReadAll(response.Body) + defer response.Body.Close() + logger.Log(0, fmt.Sprintf("error deleting node on server %s %s", response.Status, string(bodybytes))) + } + } } } wgClient, wgErr := wgctrl.New() diff --git a/netclient/main.go b/netclient/main.go index 462b9df7..6293297a 100644 --- a/netclient/main.go +++ b/netclient/main.go @@ -1,4 +1,4 @@ -//go:generate goversioninfo -icon=windowsdata/resource/netmaker.ico -manifest=netclient.exe.manifest.xml -64=true -o=netclient.syso +//go:generate goversioninfo -icon=windowsdata/resource/netclient.ico -manifest=netclient.exe.manifest.xml -64=true -o=netclient.syso // -build gui package main diff --git a/netclient/netclient.exe.manifest.xml b/netclient/netclient.exe.manifest.xml index 739dbf89..8c744b0f 100644 --- a/netclient/netclient.exe.manifest.xml +++ b/netclient/netclient.exe.manifest.xml @@ -1,7 +1,7 @@