test getting UserId

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