From 48611b22c978c332d509a603e70c308672a43494 Mon Sep 17 00:00:00 2001
From: Nathan Coad <nathan@thecoads.com>
Date: Tue, 9 Jan 2024 22:53:07 +1100
Subject: [PATCH] fix json fields for ListSecret

---
 controllers/retrieve_secrets.go | 10 +++++-----
 models/secret.go                |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/controllers/retrieve_secrets.go b/controllers/retrieve_secrets.go
index 8606dbd..5753aae 100644
--- a/controllers/retrieve_secrets.go
+++ b/controllers/retrieve_secrets.go
@@ -18,11 +18,11 @@ type RetrieveInput struct {
 }
 
 type ListSecret struct {
-	SecretId       int    `db:"SecretId"`
-	SafeId         int    `db:"SafeId"`
-	DeviceName     string `db:"DeviceName"`
-	DeviceCategory string `db:"DeviceCategory"`
-	UserName       string `db:"UserName"`
+	SecretId       int    `db:"SecretId" json:"secretId"`
+	SafeId         int    `db:"SafeId" json:"safeId"`
+	DeviceName     string `db:"DeviceName" json:"deviceName"`
+	DeviceCategory string `db:"DeviceCategory" json:"deviceCategory"`
+	UserName       string `db:"UserName" json:"userName"`
 	Secret         string `db:"Secret" json:"-"`
 }
 
diff --git a/models/secret.go b/models/secret.go
index 3457b5a..b902f15 100644
--- a/models/secret.go
+++ b/models/secret.go
@@ -116,11 +116,11 @@ func SecretsGetAllowed(s *Secret, userId int) ([]UserSecret, error) {
 	}
 
 	// Execute the query
-	log.Printf("SecretsGetAllowedForGroup query string : '%s'\nArguments:%+v\n", query, queryArgs)
+	log.Printf("SecretsGetAllowed query string : '%s'\nArguments:%+v\n", query, queryArgs)
 	rows, err := db.Queryx(query, queryArgs...)
 
 	if err != nil {
-		log.Printf("SecretsGetAllowedForGroup error executing sql record : '%s'\n", err)
+		log.Printf("SecretsGetAllowed error executing sql record : '%s'\n", err)
 		return secretResults, err
 	} else {
 		// parse all the results into a slice
@@ -128,7 +128,7 @@ func SecretsGetAllowed(s *Secret, userId int) ([]UserSecret, error) {
 			var r UserSecret
 			err = rows.StructScan(&r)
 			if err != nil {
-				log.Printf("SecretsGetAllowedForGroup error parsing sql record : '%s'\n", err)
+				log.Printf("SecretsGetAllowed error parsing sql record : '%s'\n", err)
 				return secretResults, err
 			}
 			//log.Printf("r: %v\n", r)
@@ -143,7 +143,7 @@ func SecretsGetAllowed(s *Secret, userId int) ([]UserSecret, error) {
 			// Append the secrets to the query output, don't decrypt the secrets (we didn't SELECT them anyway)
 			secretResults = append(secretResults, r)
 		}
-		log.Printf("SecretsGetAllowedForGroup retrieved '%d' results\n", len(secretResults))
+		log.Printf("SecretsGetAllowed retrieved '%d' results\n", len(secretResults))
 	}
 
 	return secretResults, nil