Browse Source

remove cfg.Registered

Matthew R. Kasun 3 years ago
parent
commit
38309aab20
3 changed files with 4 additions and 8 deletions
  1. 0 1
      netclient/config/config.go
  2. 3 5
      netclient/functions/join.go
  3. 1 2
      netclient/functions/register.go

+ 0 - 1
netclient/config/config.go

@@ -23,7 +23,6 @@ import (
 // ClientConfig - struct for dealing with client configuration
 type ClientConfig struct {
 	Server          ServerConfig   `yaml:"server"`
-	Registered      bool           `yaml:"registered"`
 	Node            models.Node    `yaml:"node"`
 	NetworkSettings models.Network `yaml:"networksettings"`
 	Network         string         `yaml:"network"`

+ 3 - 5
netclient/functions/join.go

@@ -186,12 +186,10 @@ func JoinNetwork(cfg *config.ClientConfig, privateKey string) error {
 	if err != nil {
 		return err
 	}
-	if !cfg.Registered {
-		if err := Register(cfg, privateKey); err != nil {
-			logger.Log(0, "registration failed", err.Error())
-		}
+	if err := Register(cfg, privateKey); err != nil {
+		logger.Log(0, "registration failed", err.Error())
 	}
-	if cfg.Daemon != "off" && cfg.Registered {
+	if cfg.Daemon != "off" {
 		err = daemon.InstallDaemon(cfg)
 		if err != nil {
 			return err

+ 1 - 2
netclient/functions/register.go

@@ -46,7 +46,6 @@ func Register(cfg *config.ClientConfig, key string) error {
 	} else if err != nil {
 		return err
 	}
-	cfg.Registered = true
 	return nil
 }
 
@@ -63,7 +62,7 @@ func RegisterWithServer(private *ed25519.PrivateKey, cfg *config.ClientConfig) e
 	if err != nil {
 		return err
 	}
-	response, err := API(data, http.MethodPut, url, token)
+	response, err := API(data, http.MethodPost, url, token)
 	if err != nil {
 		return err
 	}