From 77979b183951f5ddce149055d239a44783e1eb9c Mon Sep 17 00:00:00 2001 From: Nathan Coad Date: Tue, 9 Jan 2024 15:56:47 +1100 Subject: [PATCH] correct missing SafeId in listing --- models/secret.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/models/secret.go b/models/secret.go index 622514b..b09ec6e 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, users.GroupId, permissions.ReadOnly, permissions.SafeId, safes.SafeName, secrets.* + query := `SELECT users.UserId, users.GroupId, permissions.ReadOnly, safes.SafeName, secrets.* FROM users INNER JOIN groups ON users.GroupId = groups.GroupId INNER JOIN permissions ON groups.GroupId = permissions.GroupId @@ -100,7 +100,7 @@ func SecretsGetAllowed(s *Secret, userId int) ([]UserSecret, error) { // Query for user access query += ` UNION - SELECT users.UserId, users.GroupId, permissions.ReadOnly, permissions.SafeId, safes.SafeName, secrets.* + SELECT users.UserId, users.GroupId, permissions.ReadOnly, safes.SafeName, secrets.* FROM users INNER JOIN permissions ON users.UserId = permissions.UserId INNER JOIN safes on permissions.SafeId = safes.SafeId