From 143e402dd690175433d06975f4856e684d057c45 Mon Sep 17 00:00:00 2001 From: Nathan Coad Date: Tue, 9 Jan 2024 11:22:12 +1100 Subject: [PATCH] still trying --- models/secret.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/models/secret.go b/models/secret.go index 8facef6..d8b5530 100644 --- a/models/secret.go +++ b/models/secret.go @@ -66,10 +66,9 @@ func SecretsGetAllowedForGroup(s *Secret, userId int) ([]UserSecret, error) { var secretResults []UserSecret queryArgs := []interface{}{} - query := `SELECT permissions.ReadOnly, permissions.SafeId, safes.SafeName, - secrets.SecretId, secrets.SafeId, secrets.DeviceName, secrets.DeviceCategory, secrets.UserName AS SecretUser, secrets.Secret - FROM groups - INNER JOIN users ON users.GroupId = groups.GroupId + query := `SELECT users.UserId, users.GroupId, permissions.ReadOnly, permissions.SafeId, safes.SafeName, secrets.* + FROM users + INNER JOIN groups ON users.GroupId = groups.GroupId INNER JOIN permissions ON groups.GroupId = permissions.GroupId INNER JOIN safes on permissions.SafeId = safes.SafeId INNER JOIN secrets on secrets.SafeId = safes.SafeId @@ -95,7 +94,7 @@ func SecretsGetAllowedForGroup(s *Secret, userId int) ([]UserSecret, error) { } if s.UserName != "" { - query += " AND UserName LIKE ? " + query += " AND secrets.UserName LIKE ? " queryArgs = append(queryArgs, s.UserName) }