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

fix json fields for ListSecret
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Nathan Coad
2024-01-09 22:53:07 +11:00
parent ed6966eab4
commit 48611b22c9
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
controllers/retrieve_secrets.go
View File

@@ -18,11 +18,11 @@ type RetrieveInput struct {
} }
type ListSecret struct { type ListSecret struct {
SecretId int `db:"SecretId"` SecretId int `db:"SecretId" json:"secretId"`
SafeId int `db:"SafeId"` SafeId int `db:"SafeId" json:"safeId"`
DeviceName string `db:"DeviceName"` DeviceName string `db:"DeviceName" json:"deviceName"`
DeviceCategory string `db:"DeviceCategory"` DeviceCategory string `db:"DeviceCategory" json:"deviceCategory"`
UserName string `db:"UserName"` UserName string `db:"UserName" json:"userName"`
Secret string `db:"Secret" json:"-"` Secret string `db:"Secret" json:"-"`
} }

8
models/secret.go
View File

@@ -116,11 +116,11 @@ func SecretsGetAllowed(s *Secret, userId int) ([]UserSecret, error) {
} }
// Execute the query // Execute the query
log.Printf("SecretsGetAllowedForGroup query string : '%s'\nArguments:%+v\n", query, queryArgs) log.Printf("SecretsGetAllowed query string : '%s'\nArguments:%+v\n", query, queryArgs)
rows, err := db.Queryx(query, queryArgs...) rows, err := db.Queryx(query, queryArgs...)
if err != nil { if err != nil {
log.Printf("SecretsGetAllowedForGroup error executing sql record : '%s'\n", err) log.Printf("SecretsGetAllowed error executing sql record : '%s'\n", err)
return secretResults, err return secretResults, err
} else { } else {
// parse all the results into a slice // parse all the results into a slice
@@ -128,7 +128,7 @@ func SecretsGetAllowed(s *Secret, userId int) ([]UserSecret, error) {
var r UserSecret var r UserSecret
err = rows.StructScan(&r) err = rows.StructScan(&r)
if err != nil { if err != nil {
log.Printf("SecretsGetAllowedForGroup error parsing sql record : '%s'\n", err) log.Printf("SecretsGetAllowed error parsing sql record : '%s'\n", err)
return secretResults, err return secretResults, err
} }
//log.Printf("r: %v\n", r) //log.Printf("r: %v\n", r)
@@ -143,7 +143,7 @@ func SecretsGetAllowed(s *Secret, userId int) ([]UserSecret, error) {
// Append the secrets to the query output, don't decrypt the secrets (we didn't SELECT them anyway) // Append the secrets to the query output, don't decrypt the secrets (we didn't SELECT them anyway)
secretResults = append(secretResults, r) secretResults = append(secretResults, r)
} }
log.Printf("SecretsGetAllowedForGroup retrieved '%d' results\n", len(secretResults)) log.Printf("SecretsGetAllowed retrieved '%d' results\n", len(secretResults))
} }
return secretResults, nil return secretResults, nil