This commit is contained in:
@@ -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)
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user