Merge branch 'feature_v0.5_integration' of https://github.com/gravitl/netmaker into feature_v0.5_clientgrpc

controllers/intClientHttpController.go

@@ -147,6 +147,7 @@ func RegisterIntClient(client models.IntClient) (models.IntClient, error) {
   client.ServerAPIEndpoint = gcfg.APIHost + ":" + gcfg.APIPort
 	client.ServerAddress = server.ServerAddress
 	client.ServerPort = server.ServerPort
+	client.ServerGRPCPort = gcfg.GRPCPort
 	client.ServerKey = server.ServerKey
 
         if client.ClientID == "" {

controllers/networkHttpController.go

@@ -631,8 +631,9 @@ func CreateAccessKey(accesskey models.AccessKey, network models.Network) (models
 	netID := network.NetID
 	grpcaddress := servercfg.GetGRPCHost() + ":" + servercfg.GetGRPCPort()
 	apiaddress := servercfg.GetAPIHost() + ":" + servercfg.GetAPIPort()
+	wgport := servercfg.GetGRPCWGPort()
 
-	accessstringdec := grpcaddress + "|" + apiaddress + "|" + netID + "|" + accesskey.Value + "|" + privAddr
+	accessstringdec := wgport + "|" +grpcaddress + "|" + apiaddress + "|" + netID + "|" + accesskey.Value + "|" + privAddr
 	accesskey.AccessString = base64.StdEncoding.EncodeToString([]byte(accessstringdec))
 	//validate accesskey
 	v := validator.New()

functions/helpers.go

@@ -45,7 +45,7 @@ func CreateServerToken(netID string) (string, error) {
 		privAddr = network.LocalRange
 	}
 
-        accessstringdec := address + "|" + address + "|" + netID + "|" + accesskey.Value + "|" + privAddr
+        accessstringdec := " " + "|"+ address + "|" + address + "|" + netID + "|" + accesskey.Value + "|" + privAddr
 
 	accesskey.AccessString = base64.StdEncoding.EncodeToString([]byte(accessstringdec))
 

models/intclient.go

@@ -12,6 +12,7 @@ type IntClient struct {
 	ServerAPIEndpoint  string         `json:"serverapiendpoint" bson:"serverapiendpoint"`
 	ServerAddress  string             `json:"serveraddress" bson:"serveraddress"`
 	ServerPort     string             `json:"serverport" bson:"serverport"`
+	ServerGRPCPort     string             `json:"serverport" bson:"serverport"`
 	ServerKey      string             `json:"serverkey" bson:"serverkey"`
 	IsServer       string             `json:"isserver" bson:"isserver"`
 }

servercfg/serverconf.go

@@ -110,14 +110,10 @@ func GetGRPCHost() string {
 }
 func GetGRPCPort() string {
         grpcport := "50051"
-        if IsGRPCWireGuard() {
-                grpcport = GetGRPCWGPort()
-        } else {
-	        if os.Getenv("GRPC_PORT") != "" {
-	                grpcport = os.Getenv("GRPC_PORT")
-	        } else if  config.Config.Server.GRPCPort != "" {
-	                grpcport = config.Config.Server.GRPCPort
-	        }
+	if os.Getenv("GRPC_PORT") != "" {
+	        grpcport = os.Getenv("GRPC_PORT")
+	} else if  config.Config.Server.GRPCPort != "" {
+	        grpcport = config.Config.Server.GRPCPort
 	}
         return grpcport
 }