From ff79860487a642c58522ae438372be2c97362858 Mon Sep 17 00:00:00 2001
From: 0xdcarns <dillon.carns@gmail.com>
Date: Tue, 11 Jan 2022 11:59:26 -0500
Subject: [PATCH] updated routes to use uuid

---
 logic/nodes.go |  6 +-----
 logic/relay.go | 13 +++++--------
 logic/util.go  |  2 +-
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/logic/nodes.go b/logic/nodes.go
index 18bd3a1d..75e63036 100644
--- a/logic/nodes.go
+++ b/logic/nodes.go
@@ -76,12 +76,8 @@ func UncordonNode(nodeid string) (models.Node, error) {
 	if err != nil {
 		return node, err
 	}
-	key, err := GetRecordKey(node.MacAddress, node.Network)
-	if err != nil {
-		return node, err
-	}
 
-	err = database.Insert(key, string(data), database.NODES_TABLE_NAME)
+	err = database.Insert(node.ID, string(data), database.NODES_TABLE_NAME)
 	return node, err
 }
 
diff --git a/logic/relay.go b/logic/relay.go
index ea1e7cf4..30ea1ee9 100644
--- a/logic/relay.go
+++ b/logic/relay.go
@@ -13,12 +13,13 @@ import (
 // CreateRelay - creates a relay
 func CreateRelay(relay models.RelayRequest) (models.Node, error) {
 	node, err := GetNodeByID(relay.NodeID)
-	if node.OS == "macos" { // add in darwin later
-		return models.Node{}, errors.New(node.OS + " is unsupported for relay")
-	}
 	if err != nil {
 		return models.Node{}, err
 	}
+	if node.OS == "macos" { // add in darwin later
+		return models.Node{}, errors.New(node.OS + " is unsupported for relay")
+	}
+
 	err = ValidateRelay(relay)
 	if err != nil {
 		return models.Node{}, err
@@ -26,17 +27,13 @@ func CreateRelay(relay models.RelayRequest) (models.Node, error) {
 	node.IsRelay = "yes"
 	node.RelayAddrs = relay.RelayAddrs
 
-	key, err := GetRecordKey(relay.NodeID, relay.NetID)
-	if err != nil {
-		return node, err
-	}
 	node.SetLastModified()
 	node.PullChanges = "yes"
 	nodeData, err := json.Marshal(&node)
 	if err != nil {
 		return node, err
 	}
-	if err = database.Insert(key, string(nodeData), database.NODES_TABLE_NAME); err != nil {
+	if err = database.Insert(node.ID, string(nodeData), database.NODES_TABLE_NAME); err != nil {
 		return models.Node{}, err
 	}
 	err = SetRelayedNodes("yes", node.Network, node.RelayAddrs)
diff --git a/logic/util.go b/logic/util.go
index f202f68d..e06e80fa 100644
--- a/logic/util.go
+++ b/logic/util.go
@@ -105,7 +105,7 @@ func CreateNode(node *models.Node) error {
 		return err
 	}
 
-	if node.IsServer != "yes" || (node.IsServer == "yes" && servercfg.GetNodeID() == "") {
+	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)