test3

models/secret.go

@@ -31,7 +31,6 @@ type UserSecret struct {
 	GroupId int `db:"GroupId" json:"groupId"`
 	Group
 	Permission
-	SafeName string `db:"SafeName"`
 	Secret
 }
 
@@ -103,7 +102,7 @@ func SecretsGetAllowed(s *Secret, userId int) ([]UserSecret, error) {
 
 	// Query for group access
 	queryArgs := []interface{}{}
-	query := `SELECT users.UserId, users.GroupId, permissions.ReadOnly,
+	query := `SELECT users.UserId, users.GroupId, permissions.ReadOnly, permissions.SafeId AS PermSafeId,
 	secrets.SecretId, secrets.SafeId, secrets.DeviceName, secrets.DeviceCategory, secrets.UserName, secrets.Secret
 	FROM users
 	INNER JOIN groups ON users.GroupId = groups.GroupId