From c80ccd47bf875b0f79eb24508c46078dcf85b943 Mon Sep 17 00:00:00 2001 From: Nathan Coad Date: Tue, 9 Jan 2024 11:11:23 +1100 Subject: [PATCH] ambiguous column name: UserName --- controllers/store_secrets.go | 1 - models/secret.go | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/controllers/store_secrets.go b/controllers/store_secrets.go index 9b7e75e..07da1c2 100644 --- a/controllers/store_secrets.go +++ b/controllers/store_secrets.go @@ -13,7 +13,6 @@ import ( // bindings are validated by https://github.com/go-playground/validator type StoreInput struct { - //RoleId int `json:"roleId"` SafeId int `json:"safeId"` SafeName string `json:"safeName"` DeviceName string `json:"deviceName"` diff --git a/models/secret.go b/models/secret.go index 5de1da4..02f176c 100644 --- a/models/secret.go +++ b/models/secret.go @@ -60,7 +60,9 @@ func SecretsGetAllowedForGroup(s *Secret, userId int) ([]UserSecret, error) { var secretResults []UserSecret args := []interface{}{} - query := `SELECT users.UserId, users.GroupId, permissions.ReadOnly, permissions.SafeId, safes.SafeName, secrets.* FROM users + query := `SELECT users.UserId, users.GroupId, permissions.ReadOnly, permissions.SafeId, safes.SafeName, + secrets.SecretId, secrets.SafeId, secrets.DeviceName, secrets.DeviceCategory, secrets.UserName AS SecretUser, secrets.Secret + 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