diff --git a/controllers/node.go b/controllers/node.go index 100b8efd..98259ef1 100644 --- a/controllers/node.go +++ b/controllers/node.go @@ -29,7 +29,7 @@ func nodeHandlers(r *mux.Router) { r.HandleFunc("/api/nodes/{network}/{nodeid}/createingress", securityCheck(false, http.HandlerFunc(createIngressGateway))).Methods("POST") r.HandleFunc("/api/nodes/{network}/{nodeid}/deleteingress", securityCheck(false, http.HandlerFunc(deleteIngressGateway))).Methods("DELETE") r.HandleFunc("/api/nodes/{network}/{nodeid}/approve", authorize(true, "user", http.HandlerFunc(uncordonNode))).Methods("POST") - // r.HandleFunc("/api/nodes/{network}", createNode).Methods("POST") + r.HandleFunc("/api/nodes/{network}", createNode).Methods("POST") r.HandleFunc("/api/nodes/adm/{network}/lastmodified", authorize(true, "network", http.HandlerFunc(getLastModified))).Methods("GET") r.HandleFunc("/api/nodes/adm/{network}/authenticate", authenticate).Methods("POST") diff --git a/logic/util.go b/logic/util.go index c4f6b6a5..173f1c89 100644 --- a/logic/util.go +++ b/logic/util.go @@ -105,10 +105,10 @@ func CreateNode(node *models.Node) error { return err } + // TODO: This covers legacy nodes, eventually want to remove legacy check if (node.IsServer != "yes" && (node.ID == "" || strings.Contains(node.ID, "###"))) || (node.IsServer == "yes" && servercfg.GetNodeID() == "") { node.ID = uuid.NewString() } - logger.Log(0, "server ID: ", node.ID) //Create a JWT for the node tokenString, _ := CreateJWT(node.ID, node.MacAddress, node.Network)