set gw field on relay and ingress creation

controllers/gateway.go

@@ -50,8 +50,8 @@ func createGateway(w http.ResponseWriter, r *http.Request) {
 		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
-	req.RelayRequest.NetID = params["network"]
-	req.RelayRequest.NodeID = params["nodeid"]
+	req.RelayRequest.NetID = netid
+	req.RelayRequest.NodeID = nodeid
 	_, relayNode, err := logic.CreateRelay(req.RelayRequest)
 	if err != nil {
 		logger.Log(
@@ -76,8 +76,6 @@ func createGateway(w http.ResponseWriter, r *http.Request) {
 
 		}
 	}
-	node.IsGw = true
-	logic.UpsertNode(&node)
 	logger.Log(
 		1,
 		r.Header.Get("user"),

logic/gateway.go

@@ -156,6 +156,7 @@ func CreateIngressGateway(netid string, nodeid string, ingress models.IngressReq
 		return models.Node{}, err
 	}
 	node.IsIngressGateway = true
+	node.IsGw = true
 	if !servercfg.IsPro {
 		node.IsInternetGateway = ingress.IsInternetGateway
 	}

logic/relay.go

@@ -47,6 +47,7 @@ func CreateRelay(relay models.RelayRequest) ([]models.Node, models.Node, error)
 		return returnnodes, models.Node{}, err
 	}
 	node.IsRelay = true
+	node.IsGw = true
 	node.RelayedNodes = relay.RelayedNodes
 	node.SetLastModified()
 	err = UpsertNode(&node)