From 1a2b6e5b4128e4c366852d88e61c32c814692a98 Mon Sep 17 00:00:00 2001
From: Nathan Coad <nathan@thecoads.com>
Date: Mon, 8 Jan 2024 15:45:08 +1100
Subject: [PATCH] fix RoleId in secrets table

---
 controllers/store_secrets.go |  7 +++++++
 models/secret.go             |  2 +-
 models/setup.go              | 10 ++++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/controllers/store_secrets.go b/controllers/store_secrets.go
index 72448b5..0b12a4d 100644
--- a/controllers/store_secrets.go
+++ b/controllers/store_secrets.go
@@ -30,6 +30,13 @@ func StoreSecret(c *gin.Context) {
 		return
 	}
 
+	if input.SafeId == 0 && len(input.SafeName) == 0 {
+		errString := "StoreSecret no safe specified\n"
+		log.Print(errString)
+		c.JSON(http.StatusBadRequest, gin.H{"error": errString})
+		return
+	}
+
 	// Don't log this since it contains plaintext secrets
 	//log.Printf("StoreSecret received JSON input '%v'\n", input)
 
diff --git a/models/secret.go b/models/secret.go
index 9e7eb62..fb26aa7 100644
--- a/models/secret.go
+++ b/models/secret.go
@@ -183,7 +183,7 @@ func GetSecrets(s *Secret, adminRole bool) ([]Secret, error) {
 		} else if s.UserName != "" {
 			rows, err = db.Queryx("SELECT * FROM secrets WHERE UserName LIKE ? AND SafeId = ?", s.UserName, s.SafeId)
 		} else {
-			rows, err = db.Queryx("SELECT * FROM secrets WHERE RoleId = ?", s.SafeId)
+			rows, err = db.Queryx("SELECT * FROM secrets WHERE SafeId = ?", s.SafeId)
 			//log.Printf("GetSecret no valid search options specified\n")
 			//err = errors.New("no valid search options specified")
 			//return secretResults, err
diff --git a/models/setup.go b/models/setup.go
index b4acdf9..8094e68 100644
--- a/models/setup.go
+++ b/models/setup.go
@@ -301,6 +301,16 @@ func CreateTables() {
 		}
 	}
 
+	// Remove RoleId column from secrets table
+	secretsRoleIdCheck, _ := CheckColumnExists("secrets", "RoleId")
+	if secretsRoleIdCheck {
+		_, err := db.Exec("ALTER TABLE secrets DROP COLUMN RoleId;")
+		if err != nil {
+			log.Printf("Error altering secrets table to renmove RoleId column : '%s'\n", err)
+			os.Exit(1)
+		}
+	}
+
 	// Add SafeId column to secrets table
 	safeIdCheck, _ := CheckColumnExists("secrets", "SafeId")
 	if !safeIdCheck {