nathan/smt
1
0
Fork 0
Code Issues 4 Pull Requests Packages Projects Releases 2 Wiki Activity

ambiguous column name: UserName
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Nathan Coad
2024-01-09 11:11:23 +11:00
parent bc3591a690
commit c80ccd47bf
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
controllers/store_secrets.go
View File

@@ -13,7 +13,6 @@ import (
// bindings are validated by https://github.com/go-playground/validator // bindings are validated by https://github.com/go-playground/validator
type StoreInput struct { type StoreInput struct {
//RoleId int `json:"roleId"`
SafeId int `json:"safeId"` SafeId int `json:"safeId"`
SafeName string `json:"safeName"` SafeName string `json:"safeName"`
DeviceName string `json:"deviceName"` DeviceName string `json:"deviceName"`

4
models/secret.go
View File

@@ -60,7 +60,9 @@ func SecretsGetAllowedForGroup(s *Secret, userId int) ([]UserSecret, error) {
var secretResults []UserSecret var secretResults []UserSecret
args := []interface{}{} 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 groups ON users.GroupId = groups.GroupId
INNER JOIN permissions ON groups.GroupId = permissions.GroupId INNER JOIN permissions ON groups.GroupId = permissions.GroupId
INNER JOIN safes on permissions.SafeId = safes.SafeId INNER JOIN safes on permissions.SafeId = safes.SafeId