removed APIConnString from accessToken

go.mod

@@ -46,10 +46,13 @@ require (
 	github.com/google/go-cmp v0.5.5 // indirect
 	github.com/gorilla/websocket v1.4.2 // indirect
 	github.com/josharian/native v0.0.0-20200817173448-b6b71def0850 // indirect
+	github.com/kr/pretty v0.3.0 // indirect
+	github.com/kr/text v0.2.0 // indirect
 	github.com/leodido/go-urn v1.2.1 // indirect
 	github.com/mdlayher/genetlink v1.0.0 // indirect
 	github.com/mdlayher/netlink v1.4.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/rogpeppe/go-internal v1.8.0 // indirect
 	github.com/russross/blackfriday/v2 v2.0.1 // indirect
 	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
 	github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c // indirect

logic/accesskeys.go

@@ -52,8 +52,8 @@ func CreateAccessKey(accesskey models.AccessKey, network models.Network) (models
 	var accessToken models.AccessToken
 	s := servercfg.GetServerConfig()
 	servervals := models.ServerConfig{
-		CoreDNSAddr:   s.CoreDNSAddr,
-		APIConnString: s.APIConnString,
+		CoreDNSAddr: s.CoreDNSAddr,
+		//APIConnString: s.APIConnString,
 		//APIHost:         s.APIHost,
 		//APIPort:         s.APIPort,
 		GRPCConnString: s.GRPCConnString,

models/accessToken.go

@@ -3,7 +3,7 @@ package models
 type AccessToken struct {
 	ServerConfig
 	ClientConfig
-	WG
+	//WG
 }
 
 type ClientConfig struct {
@@ -13,8 +13,8 @@ type ClientConfig struct {
 }
 
 type ServerConfig struct {
-	CoreDNSAddr   string `json:"corednsaddr"`
-	APIConnString string `json:"apiconn"`
+	CoreDNSAddr string `json:"corednsaddr"`
+	//APIConnString string `json:"apiconn"`
 	//APIHost         string `json:"apihost"`
 	//APIPort         string `json:"apiport"`
 	GRPCConnString string `json:"grpcconn"`

netclient/config/config.go

@@ -175,16 +175,17 @@ func GetCLIConfig(c *cli.Context) (ClientConfig, string, error) {
 			return cfg, "", err
 		}
 
-		if accesstoken.ServerConfig.APIConnString != "" {
-			cfg.Server.APIAddress = accesstoken.ServerConfig.APIConnString
-			//} else {
-			//	cfg.Server.APIAddress = accesstoken.ServerConfig.APIHost
-			//	if accesstoken.ServerConfig.APIPort != "" {
-			//		cfg.Server.APIAddress = cfg.Server.APIAddress + ":" + accesstoken.ServerConfig.APIPort
-			//	}
-		}
+		//if accesstoken.ServerConfig.APIConnString != "" {
+		//	cfg.Server.APIAddress = accesstoken.ServerConfig.APIConnString
+		//} else {
+		//	cfg.Server.APIAddress = accesstoken.ServerConfig.APIHost
+		//	if accesstoken.ServerConfig.APIPort != "" {
+		//		cfg.Server.APIAddress = cfg.Server.APIAddress + ":" + accesstoken.ServerConfig.APIPort
+		//	}
+		//}
 		if accesstoken.ServerConfig.GRPCConnString != "" {
 			cfg.Server.GRPCAddress = accesstoken.ServerConfig.GRPCConnString
+
 			//} else {
 			//	cfg.Server.GRPCAddress = accesstoken.ServerConfig.GRPCHost
 			//	if accesstoken.ServerConfig.GRPCPort != "" {
@@ -198,7 +199,7 @@ func GetCLIConfig(c *cli.Context) (ClientConfig, string, error) {
 		cfg.Node.LocalRange = accesstoken.ClientConfig.LocalRange
 		cfg.Server.GRPCSSL = accesstoken.ServerConfig.GRPCSSL
 		cfg.Server.CheckinInterval = accesstoken.ServerConfig.CheckinInterval
-		cfg.Server.GRPCWireGuard = accesstoken.WG.GRPCWireGuard
+		//cfg.Server.GRPCWireGuard = accesstoken.WG.GRPCWireGuard
 		cfg.Server.CoreDNSAddr = accesstoken.ServerConfig.CoreDNSAddr
 		if c.String("grpcserver") != "" {
 			cfg.Server.GRPCAddress = c.String("grpcserver")