From 391d806c13504f88801681f72184b3f6795a1308 Mon Sep 17 00:00:00 2001 From: Nathan Coad Date: Tue, 9 Jan 2024 21:58:38 +1100 Subject: [PATCH] test getting UserId --- models/secret.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/models/secret.go b/models/secret.go index b68e3b7..85c2c9f 100644 --- a/models/secret.go +++ b/models/secret.go @@ -31,6 +31,7 @@ type Secret struct { // Since there are some ambiguous column names (eg UserName is present in both users and secrets table), the order of fields in this struct matters type UserSecret struct { Secret + UserId int `db:"UserUserId"` User //Group Permission @@ -62,7 +63,7 @@ func SecretsGetAllowed(s *Secret, userId int) ([]UserSecret, error) { // Query for group access queryArgs := []interface{}{} query := ` - SELECT users.UserId, permissions.*, + SELECT users.UserId AS UserUserId, permissions.*, secrets.SecretId, secrets.SafeId, secrets.DeviceName, secrets.DeviceCategory, secrets.UserName FROM users INNER JOIN groups ON users.GroupId = groups.GroupId @@ -90,7 +91,7 @@ func SecretsGetAllowed(s *Secret, userId int) ([]UserSecret, error) { // Query for user access query += ` UNION - SELECT users.UserId, permissions.*, + SELECT users.UserId AS UserUserId, permissions.*, secrets.SecretId, secrets.SafeId, secrets.DeviceName, secrets.DeviceCategory, secrets.UserName FROM users INNER JOIN permissions ON users.UserId = permissions.UserId