From 5a87ecebfcb503ea65d2ff4a9466c44382656563 Mon Sep 17 00:00:00 2001
From: Nathan Coad <nathan@thecoads.com>
Date: Tue, 9 Jan 2024 21:38:33 +1100
Subject: [PATCH] test

---
 models/key.go    | 2 ++
 models/secret.go | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/models/key.go b/models/key.go
index 2b5259b..c627ebd 100644
--- a/models/key.go
+++ b/models/key.go
@@ -83,6 +83,8 @@ func ReceiveKey(key string) error {
 		}
 		if !compare {
 			return errors.New("secret key is not correct")
+		} else {
+			log.Printf("ReceiveKey successfully verified supplied key\n")
 		}
 	} else if filePath != "" {
 		log.Printf("ReceiveKey storing key into file '%s'\n", filePath)
diff --git a/models/secret.go b/models/secret.go
index 1ba3417..bf0dcfd 100644
--- a/models/secret.go
+++ b/models/secret.go
@@ -72,7 +72,7 @@ func SecretsGetAllowed(s *Secret, userId int) ([]UserSecret, error) {
 	// Query for group access
 	queryArgs := []interface{}{}
 	query := `
-		SELECT users.UserId, permissions.ReadOnly,
+		SELECT users.UserId, permissions.*,
 		secrets.SecretId, secrets.SafeId, secrets.DeviceName, secrets.DeviceCategory, secrets.UserName
 		FROM users
 		INNER JOIN groups ON users.GroupId = groups.GroupId
@@ -100,7 +100,7 @@ func SecretsGetAllowed(s *Secret, userId int) ([]UserSecret, error) {
 	// Query for user access
 	query += `
 		UNION
-		SELECT users.UserId, permissions.ReadOnly,
+		SELECT users.UserId, permissions.*,
 		secrets.SecretId, secrets.SafeId, secrets.DeviceName, secrets.DeviceCategory, secrets.UserName
 		FROM users
 		INNER JOIN permissions ON users.UserId = permissions.UserId