Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

fix: group binding (#20729)

ecmadao1ee3f72bcbca
diff --git a/backend/store/group.go b/backend/store/group.go
index 173086cca6..b7215395c2 100644
--- a/backend/store/group.go
+++ b/backend/store/group.go
@@ -113,7 +113,7 @@ func (s *Store) ListGroups(ctx context.Context, find *FindGroupMessage) ([]*Grou
project_members AS (
SELECT ARRAY_AGG(member) AS members FROM all_members WHERE role NOT LIKE 'roles/workspace%'
)`, storepb.Policy_PROJECT.String(), "projects/"+*v, storepb.Policy_WORKSPACE.String(), storepb.Policy_IAM.String(), find.Workspace)
- from.Space(`INNER JOIN project_members ON (CONCAT('groups/', user_group.email) = ANY(project_members.members) OR ? = ANY(project_members.members))`, common.AllUsers)
+ from.Space("INNER JOIN project_members ON ?", projectMembersGroupJoinCondition())
}
if filterQ := find.FilterQ; filterQ != nil {
@@ -196,6 +196,13 @@ func (s *Store) ListGroups(ctx context.Context, find *FindGroupMessage) ([]*Grou
return groups, nil
}
+func projectMembersGroupJoinCondition() *qb.Query {
+ return qb.Q().Space(
+ `((CONCAT('groups/', user_group.email) = ANY(project_members.members) OR CONCAT('groups/', user_group.id) = ANY(project_members.members)) OR ? = ANY(project_members.members))`,
+ common.AllUsers,
+ )
+}
+
// CreateGroup creates a group.
func (s *Store) CreateGroup(ctx context.Context, create *GroupMessage) (*GroupMessage, error) {
if create.Payload == nil {
diff --git a/backend/store/group_filter_test.go b/backend/store/group_filter_test.go
index 687cc3e053..51b47ee471 100644
--- a/backend/store/group_filter_test.go
+++ b/backend/store/group_filter_test.go
@@ -4,6 +4,8 @@ import (
"testing"
"github.com/stretchr/testify/require"
+
+ "github.com/bytebase/bytebase/backend/common"
)
func TestGetListGroupFilter(t *testing.T) {
@@ -142,3 +144,11 @@ func TestGetListGroupFilterProject(t *testing.T) {
require.NotNil(t, find.ProjectID)
require.Equal(t, "test-project", *find.ProjectID)
}
+
+func TestProjectMembersGroupJoinCondition(t *testing.T) {
+ sql, args, err := projectMembersGroupJoinCondition().ToSQL()
+ require.NoError(t, err)
+ require.Contains(t, sql, "user_group.email")
+ require.Contains(t, sql, "user_group.id")
+ require.Equal(t, []any{common.AllUsers}, args)
+}
diff --git a/frontend/src/react/components/AccountMultiSelect.tsx b/frontend/src/react/components/AccountMultiSelect.tsx
index 11eaf10040..ba717795a3 100644
--- a/frontend/src/react/components/AccountMultiSelect.tsx
+++ b/frontend/src/react/components/AccountMultiSelect.tsx
@@ -263,9 +263,8 @@ export function AccountMultiSelect({
return user?.title || user?.email;
}
if (fullname.startsWith(groupNamePrefix)) {
- const email = fullname.slice(groupNamePrefix.length);
- const group = groups.find((g) => g.email === email);
- return group?.title || email;
+ const group = groups.find((g) => g.name === fullname);
+ return group?.title || fullname;
}
return undefined;
};
@@ -460,8 +459,7 @@ export function AccountMultiSelect({
{t("common.groups")}
</div>
{groups.map((group) => {
- const fullname = `${groupNamePrefix}${group.email}`;
- const selected = selectedFullnames.has(fullname);
+ const selected = selectedFullnames.has(group.name);
return (
<div
key={group.name}
@@ -469,7 +467,7 @@ export function AccountMultiSelect({
"flex items-center gap-x-3 px-3 py-2 cursor-pointer hover:bg-control-bg",
selected && "bg-accent/5"
)}
- onClick={() => toggle(fullname)}
+ onClick={() => toggle(group.name)}
>
<SelectionCheckbox selected={selected} />
<div className="size-7 rounded-full bg-control-bg-hover flex items-center justify-center shrink-0">