This commit is contained in:
@@ -27,12 +27,10 @@ type Secret struct {
|
|||||||
|
|
||||||
// Used for querying all secrets the user has access to
|
// Used for querying all secrets the user has access to
|
||||||
type UserSecret struct {
|
type UserSecret struct {
|
||||||
UserId int `db:"UserId" json:"userId"`
|
User
|
||||||
GroupId int `db:"GroupId" json:"groupId"`
|
|
||||||
Secret
|
Secret
|
||||||
Group
|
Group
|
||||||
Permission
|
Permission
|
||||||
PermissionSafeId int `db:"PermSafeId"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const nonceSize = 12
|
const nonceSize = 12
|
||||||
@@ -103,7 +101,7 @@ func SecretsGetAllowed(s *Secret, userId int) ([]UserSecret, error) {
|
|||||||
|
|
||||||
// Query for group access
|
// Query for group access
|
||||||
queryArgs := []interface{}{}
|
queryArgs := []interface{}{}
|
||||||
query := `SELECT users.UserId, users.GroupId, permissions.ReadOnly, permissions.SafeId AS PermSafeId,
|
query := `SELECT users.*, permissions.ReadOnly,
|
||||||
secrets.SecretId, secrets.SafeId, secrets.DeviceName, secrets.DeviceCategory, secrets.UserName, secrets.Secret
|
secrets.SecretId, secrets.SafeId, secrets.DeviceName, secrets.DeviceCategory, secrets.UserName, secrets.Secret
|
||||||
FROM users
|
FROM users
|
||||||
INNER JOIN groups ON users.GroupId = groups.GroupId
|
INNER JOIN groups ON users.GroupId = groups.GroupId
|
||||||
|
Reference in New Issue
Block a user