Skip to content

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

feat: migrate user references from users/{id} to users/{email} format (#18425)

Danny Xu39e2bdfbf08a
diff --git a/backend/api/directory-sync/webhook.go b/backend/api/directory-sync/webhook.go
index 7d342ea4b0..7ff39fd6f4 100644
--- a/backend/api/directory-sync/webhook.go
+++ b/backend/api/directory-sync/webhook.go
@@ -550,7 +550,7 @@ func (s *Service) RegisterDirectorySyncRoutes(g *echo.Group) {
}
member := &storepb.GroupMember{
- Member: common.FormatUserUID(user.ID),
+ Member: common.FormatUserEmail(user.Email),
Role: storepb.GroupMember_MEMBER,
}
index := slices.IndexFunc(group.Payload.Members, func(m *storepb.GroupMember) bool {
diff --git a/backend/api/v1/audit.go b/backend/api/v1/audit.go
index f0e227dbc3..09eb844c28 100644
--- a/backend/api/v1/audit.go
+++ b/backend/api/v1/audit.go
@@ -151,7 +151,7 @@ func createAuditLogConnect(ctx context.Context, request, response any, method st
var user string
if u, ok := GetUserFromContext(ctx); ok {
- user = common.FormatUserUID(u.ID)
+ user = common.FormatUserEmail(u.Email)
} else {
// Try to get user from successful login response.
if loginResponse, ok := response.(*v1pb.LoginResponse); ok {
diff --git a/backend/api/v1/audit_log_service.go b/backend/api/v1/audit_log_service.go
index a8dcd70e59..c64f6a6478 100644
--- a/backend/api/v1/audit_log_service.go
+++ b/backend/api/v1/audit_log_service.go
@@ -39,7 +39,7 @@ func (s *AuditLogService) SearchAuditLogs(ctx context.Context, request *connect.
if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_AUDIT_LOG); err != nil {
return nil, connect.NewError(connect.CodePermissionDenied, err)
}
- filterQ, err := store.GetSearchAuditLogsFilter(ctx, s.store, request.Msg.Filter)
+ filterQ, err := store.GetSearchAuditLogsFilter(request.Msg.Filter)
if err != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
@@ -89,10 +89,7 @@ func (s *AuditLogService) SearchAuditLogs(ctx context.Context, request *connect.
}
}
- v1AuditLogs, err := convertToAuditLogs(ctx, s.store, auditLogs)
- if err != nil {
- return nil, err
- }
+ v1AuditLogs := convertToAuditLogs(ctx, s.store, auditLogs)
return connect.NewResponse(&v1pb.SearchAuditLogsResponse{
AuditLogs: v1AuditLogs,
NextPageToken: nextPageToken,
@@ -159,35 +156,19 @@ func (s *AuditLogService) ExportAuditLogs(ctx context.Context, request *connect.
return connect.NewResponse(&v1pb.ExportAuditLogsResponse{Content: content, NextPageToken: searchAuditLogsResult.Msg.NextPageToken}), nil
}
-func convertToAuditLogs(ctx context.Context, stores *store.Store, auditLogs []*store.AuditLog) ([]*v1pb.AuditLog, error) {
+func convertToAuditLogs(_ context.Context, _ *store.Store, auditLogs []*store.AuditLog) []*v1pb.AuditLog {
var ls []*v1pb.AuditLog
for _, log := range auditLogs {
- l, err := convertToAuditLog(ctx, stores, log)
- if err != nil {
- return nil, err
- }
- ls = append(ls, l)
+ ls = append(ls, convertToAuditLog(log))
}
- return ls, nil
+ return ls
}
-func convertToAuditLog(ctx context.Context, stores *store.Store, l *store.AuditLog) (*v1pb.AuditLog, error) {
- var user string
- if l.Payload.User != "" {
- uid, err := common.GetUserID(l.Payload.User)
- if err != nil {
- return nil, err
- }
- u, err := stores.GetUserByID(ctx, uid)
- if err != nil {
- return nil, err
- }
- user = common.FormatUserEmail(u.Email)
- }
+func convertToAuditLog(l *store.AuditLog) *v1pb.AuditLog {
return &v1pb.AuditLog{
Name: fmt.Sprintf("%s/%s%d", l.Payload.Parent, common.AuditLogPrefix, l.ID),
CreateTime: timestamppb.New(l.CreatedAt),
- User: user,
+ User: l.Payload.User,
Method: l.Payload.Method,
Severity: convertToAuditLogSeverity(l.Payload.Severity),
Resource: l.Payload.Resource,
@@ -196,7 +177,7 @@ func convertToAuditLog(ctx context.Context, stores *store.Store, l *store.AuditL
Status: l.Payload.Status,
Latency: l.Payload.Latency,
ServiceData: l.Payload.ServiceData,
- }, nil
+ }
}
func convertToAuditLogSeverity(s storepb.AuditLog_Severity) v1pb.AuditLog_Severity {
diff --git a/backend/api/v1/auth_service.go b/backend/api/v1/auth_service.go
index 24eaa0544d..f73c003636 100644
--- a/backend/api/v1/auth_service.go
+++ b/backend/api/v1/auth_service.go
@@ -636,7 +636,7 @@ func (s *AuthService) syncUserGroups(ctx context.Context, user *store.UserMessag
}
var isBBGroupMember bool
for _, member := range bbGroup.Payload.Members {
- if member.Member == common.FormatUserUID(user.ID) {
+ if member.Member == common.FormatUserEmail(user.Email) {
isBBGroupMember = true
break
}
@@ -646,12 +646,12 @@ func (s *AuthService) syncUserGroups(ctx context.Context, user *store.UserMessag
// Add the user to the group.
bbGroup.Payload.Members = append(bbGroup.Payload.Members, &storepb.GroupMember{
Role: storepb.GroupMember_MEMBER,
- Member: common.FormatUserUID(user.ID),
+ Member: common.FormatUserEmail(user.Email),
})
} else {
// Remove the user from the group.
bbGroup.Payload.Members = slices.DeleteFunc(bbGroup.Payload.Members, func(member *storepb.GroupMember) bool {
- return member.Member == common.FormatUserUID(user.ID)
+ return member.Member == common.FormatUserEmail(user.Email)
})
}
if _, err := s.store.UpdateGroup(ctx, &store.UpdateGroupMessage{
diff --git a/backend/api/v1/group_service.go b/backend/api/v1/group_service.go
index 2f09f120d6..95b198b8ab 100644
--- a/backend/api/v1/group_service.go
+++ b/backend/api/v1/group_service.go
@@ -46,7 +46,7 @@ func (s *GroupService) GetGroup(ctx context.Context, req *connect.Request[v1pb.G
return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("cannot found the group %v", req.Msg.Name))
}
- result, err := s.convertToV1Group(ctx, group)
+ result, err := s.convertToV1Group(group)
if err != nil {
return nil, err
}
@@ -106,7 +106,7 @@ func (s *GroupService) ListGroups(ctx context.Context, request *connect.Request[
NextPageToken: nextPageToken,
}
for _, groupMessage := range groups {
- group, err := s.convertToV1Group(ctx, groupMessage)
+ group, err := s.convertToV1Group(groupMessage)
if err != nil {
return nil, err
}
@@ -138,7 +138,7 @@ func (s *GroupService) CreateGroup(ctx context.Context, req *connect.Request[v1p
return nil, err
}
- result, err := s.convertToV1Group(ctx, group)
+ result, err := s.convertToV1Group(group)
if err != nil {
return nil, err
}
@@ -216,7 +216,7 @@ func (s *GroupService) UpdateGroup(ctx context.Context, req *connect.Request[v1p
return nil, err
}
- result, err := s.convertToV1Group(ctx, groupMessage)
+ result, err := s.convertToV1Group(groupMessage)
if err != nil {
return nil, err
}
@@ -254,7 +254,7 @@ func (s *GroupService) DeleteGroup(ctx context.Context, req *connect.Request[v1p
}
func (s *GroupService) checkPermission(ctx context.Context, group *store.GroupMessage, user *store.UserMessage, permission string) error {
- userName := common.FormatUserUID(user.ID)
+ userName := common.FormatUserEmail(user.Email)
ok, err := func() (bool, error) {
for _, member := range group.Payload.GetMembers() {
@@ -292,7 +292,7 @@ func (s *GroupService) convertToGroupPayload(ctx context.Context, group *v1pb.Gr
}
m := &storepb.GroupMember{
- Member: common.FormatUserUID(user.ID),
+ Member: common.FormatUserEmail(user.Email),
}
switch member.Role {
case v1pb.GroupMember_MEMBER:
@@ -327,7 +327,7 @@ func (s *GroupService) convertToGroupMessage(ctx context.Context, request *v1pb.
return groupMessage, nil
}
-func (s *GroupService) convertToV1Group(ctx context.Context, groupMessage *store.GroupMessage) (*v1pb.Group, error) {
+func (*GroupService) convertToV1Group(groupMessage *store.GroupMessage) (*v1pb.Group, error) {
if groupMessage == nil {
return nil, connect.NewError(connect.CodeNotFound, errors.New("cannot found group"))
}
@@ -347,20 +347,8 @@ func (s *GroupService) convertToV1Group(ctx context.Context, groupMessage *store
}
for _, member := range groupMessage.Payload.Members {
- uid, err := common.GetUserID(member.Member)
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to get member id"))
- }
- user, err := s.store.GetUserByID(ctx, uid)
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to get member"))
- }
- if user == nil {
- continue
- }
-
m := &v1pb.GroupMember{
- Member: common.FormatUserEmail(user.Email),
+ Member: member.Member,
Role: v1pb.GroupMember_ROLE_UNSPECIFIED,
}
switch member.Role {
diff --git a/backend/api/v1/issue_service_converter.go b/backend/api/v1/issue_service_converter.go
index c2479197e2..3cdbda373c 100644
--- a/backend/api/v1/issue_service_converter.go
+++ b/backend/api/v1/issue_service_converter.go
@@ -56,9 +56,16 @@ func (s *IssueService) getUserRoleMap(ctx context.Context, projectResourceID str
return map[string]bool{}
}
- return utils.GetUserFormattedRolesMap(ctx, s.store, &store.UserMessage{
- ID: principalUID,
- }, policy.Policy, workspacePolicy.Policy)
+ user, err := s.store.GetUserByID(ctx, principalUID)
+ if err != nil {
+ slog.Error("failed to get user", log.BBError(err), slog.Int("user_id", principalUID))
+ return map[string]bool{}
+ }
+ if user == nil {
+ return map[string]bool{}
+ }
+
+ return utils.GetUserFormattedRolesMap(ctx, s.store, user, policy.Policy, workspacePolicy.Policy)
}
func (s *IssueService) isIssueNextApprover(ctx context.Context, issue *v1pb.Issue, projectResourceID string, principalUID int) bool {
@@ -75,10 +82,7 @@ func (s *IssueService) isIssueNextApprover(ctx context.Context, issue *v1pb.Issu
func (s *IssueService) convertToIssue(ctx context.Context, issue *store.IssueMessage) (*v1pb.Issue, error) {
issuePayload := issue.Payload
- convertedGrantRequest, err := convertToGrantRequest(ctx, s.store, issuePayload.GrantRequest)
- if err != nil {
- return nil, errors.Wrapf(err, "failed to convert GrantRequest")
- }
+ convertedGrantRequest := convertToGrantRequest(issuePayload.GrantRequest)
releasers, err := s.convertToIssueReleasers(ctx, issue)
if err != nil {
@@ -301,27 +305,16 @@ func convertToApprovalFlow(flow *storepb.ApprovalFlow) *v1pb.ApprovalFlow {
}
}
-func convertToGrantRequest(ctx context.Context, s *store.Store, v *storepb.GrantRequest) (*v1pb.GrantRequest, error) {
+func convertToGrantRequest(v *storepb.GrantRequest) *v1pb.GrantRequest {
if v == nil {
- return nil, nil
- }
- uid, err := common.GetUserID(v.User)
- if err != nil {
- return nil, errors.Wrapf(err, "failed to get user uid from %q", v.User)
- }
- user, err := s.GetUserByID(ctx, uid)
- if err != nil {
- return nil, errors.Wrapf(err, "failed to get user by uid %q", uid)
- }
- if user == nil {
- return nil, errors.Errorf("user %q not found", v.User)
+ return nil
}
return &v1pb.GrantRequest{
Role: v.Role,
- User: common.FormatUserEmail(user.Email),
+ User: v.User,
Condition: v.Condition,
Expiration: v.Expiration,
- }, nil
+ }
}
func convertGrantRequest(ctx context.Context, s *store.Store, v *v1pb.GrantRequest) (*storepb.GrantRequest, error) {
@@ -341,7 +334,7 @@ func convertGrantRequest(ctx context.Context, s *store.Store, v *v1pb.GrantReque
}
return &storepb.GrantRequest{
Role: v.Role,
- User: common.FormatUserUID(user.ID),
+ User: common.FormatUserEmail(user.Email),
Condition: v.Condition,
Expiration: v.Expiration,
}, nil
diff --git a/backend/api/v1/project_service_converter.go b/backend/api/v1/project_service_converter.go
index 6691144cde..ae9ab7d379 100644
--- a/backend/api/v1/project_service_converter.go
+++ b/backend/api/v1/project_service_converter.go
@@ -159,22 +159,14 @@ func convertToV1WebhookType(tp storepb.WebhookType) v1pb.WebhookType {
}
}
-func convertToV1MemberInBinding(ctx context.Context, stores *store.Store, member string) string {
+func convertToV1MemberInBinding(_ context.Context, _ *store.Store, member string) string {
if strings.HasPrefix(member, common.UserNamePrefix) {
- userUID, err := common.GetUserID(member)
+ email, err := common.GetUserEmail(member)
if err != nil {
- slog.Error("failed to user id from member", slog.String("member", member), log.BBError(err))
+ slog.Error("failed to get user email from member", slog.String("member", member), log.BBError(err))
return ""
}
- user, err := stores.GetUserByID(ctx, userUID)
- if err != nil {
- slog.Error("failed to get user", slog.String("member", member), log.BBError(err))
- return ""
- }
- if user == nil {
- return ""
- }
- return fmt.Sprintf("%s%s", common.UserBindingPrefix, user.Email)
+ return fmt.Sprintf("%s%s", common.UserBindingPrefix, email)
} else if strings.HasPrefix(member, common.GroupPrefix) {
email, err := common.GetGroupEmail(member)
if err != nil {
@@ -280,7 +272,7 @@ func convertToStoreIamPolicyMember(ctx context.Context, stores *store.Store, mem
if user == nil {
return "", connect.NewError(connect.CodeNotFound, errors.Errorf("user %q not found", member))
}
- return common.FormatUserUID(user.ID), nil
+ return common.FormatUserEmail(user.Email), nil
} else if strings.HasPrefix(member, common.GroupBindingPrefix) {
email := strings.TrimPrefix(member, common.GroupBindingPrefix)
return common.FormatGroupEmail(email), nil
diff --git a/backend/api/v1/user_service.go b/backend/api/v1/user_service.go
index 318b79238c..be5f85497f 100644
--- a/backend/api/v1/user_service.go
+++ b/backend/api/v1/user_service.go
@@ -301,7 +301,7 @@ func (s *UserService) CreateUser(ctx context.Context, request *connect.Request[v
if firstEndUser {
// The first end user should be workspace admin.
updateRole := &store.PatchIamPolicyMessage{
- Member: common.FormatUserUID(user.ID),
+ Member: common.FormatUserEmail(user.Email),
Roles: []string{common.FormatRole(common.WorkspaceAdmin)},
}
if _, err := s.store.PatchWorkspaceIamPolicy(ctx, updateRole); err != nil {
@@ -581,7 +581,7 @@ func (s *UserService) DeleteUser(ctx context.Context, request *connect.Request[v
if err != nil {
return nil, err
}
- hasExtraWorkspaceAdmin, err := s.hasExtraWorkspaceAdmin(ctx, policy.Policy, user.ID)
+ hasExtraWorkspaceAdmin, err := s.hasExtraWorkspaceAdmin(ctx, policy.Policy, user)
if err != nil {
return nil, err
}
@@ -610,9 +610,9 @@ func (s *UserService) getActiveUserCount(ctx context.Context) (int, error) {
return activeEndUserCount, nil
}
-func (s *UserService) hasExtraWorkspaceAdmin(ctx context.Context, policy *storepb.IamPolicy, userID int) (bool, error) {
+func (s *UserService) hasExtraWorkspaceAdmin(ctx context.Context, policy *storepb.IamPolicy, user *store.UserMessage) (bool, error) {
workspaceAdminRole := common.FormatRole(common.WorkspaceAdmin)
- userMember := common.FormatUserUID(userID)
+ userMember := common.FormatUserEmail(user.Email)
for _, binding := range policy.GetBindings() {
if binding.GetRole() != workspaceAdminRole {
diff --git a/backend/component/iam/manager.go b/backend/component/iam/manager.go
index 0d59cdeec9..e60b3370b4 100644
--- a/backend/component/iam/manager.go
+++ b/backend/component/iam/manager.go
@@ -56,7 +56,7 @@ func (m *Manager) CheckPermission(ctx context.Context, p Permission, user *store
if err != nil {
return false, err
}
- if ok := check(user.ID, p, policyMessage.Policy, m.rolePermissions, m.groupMembers); ok {
+ if ok := check(user, p, policyMessage.Policy, m.rolePermissions, m.groupMembers); ok {
return true, nil
}
@@ -77,7 +77,7 @@ func (m *Manager) CheckPermission(ctx context.Context, p Permission, user *store
if err != nil {
return false, err
}
- if ok := check(user.ID, p, policyMessage.Policy, m.rolePermissions, m.groupMembers); !ok {
+ if ok := check(user, p, policyMessage.Policy, m.rolePermissions, m.groupMembers); !ok {
allOK = false
break
}
@@ -127,8 +127,9 @@ func (m *Manager) GetPermissions(role string) (map[Permission]bool, error) {
return permissions, nil
}
-func check(userID int, p Permission, policy *storepb.IamPolicy, rolePermissions map[string]map[Permission]bool, groupMembers map[string]map[string]bool) bool {
- userName := common.FormatUserUID(userID)
+func check(user *store.UserMessage, p Permission, policy *storepb.IamPolicy, rolePermissions map[string]map[Permission]bool, groupMembers map[string]map[string]bool) bool {
+ userName := common.FormatUserEmail(user.Email)
+
for _, binding := range policy.GetBindings() {
permissions, ok := rolePermissions[binding.GetRole()]
if !ok {
diff --git a/backend/component/iam/manager_test.go b/backend/component/iam/manager_test.go
index b7311ff013..b89f908265 100644
--- a/backend/component/iam/manager_test.go
+++ b/backend/component/iam/manager_test.go
@@ -7,10 +7,14 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
+ "github.com/bytebase/bytebase/backend/store"
)
func TestCheck(t *testing.T) {
- userID := 123
+ testUser := &store.UserMessage{
+ ID: 123,
+ Email: "[email protected]",
+ }
roles, err := loadPredefinedRoles()
require.NoError(t, err)
@@ -31,7 +35,7 @@ func TestCheck(t *testing.T) {
Bindings: []*storepb.Binding{
{
Role: "roles/workspaceMember",
- Members: []string{"users/123"},
+ Members: []string{"users/[email protected]"},
},
},
},
@@ -44,7 +48,7 @@ func TestCheck(t *testing.T) {
Bindings: []*storepb.Binding{
{
Role: "roles/workspaceAdmin",
- Members: []string{"users/123"},
+ Members: []string{"users/[email protected]"},
},
},
},
@@ -57,7 +61,7 @@ func TestCheck(t *testing.T) {
Bindings: []*storepb.Binding{
{
Role: "roles/workspaceAdmin",
- Members: []string{"users/321"},
+ Members: []string{"users/[email protected]"},
},
},
},
@@ -70,7 +74,7 @@ func TestCheck(t *testing.T) {
Bindings: []*storepb.Binding{
{
Role: "roles/workspaceAdmin",
- Members: []string{"users/321", common.AllUsers},
+ Members: []string{"users/[email protected]", common.AllUsers},
},
},
},
@@ -89,14 +93,14 @@ func TestCheck(t *testing.T) {
},
groupMembers: map[string]map[string]bool{
"groups/[email protected]": {
- "users/123": true,
+ "users/[email protected]": true,
},
},
want: true,
}}
for i, test := range tests {
- got := check(userID, test.permission, test.policy, rolePermissions, test.groupMembers)
+ got := check(testUser, test.permission, test.policy, rolePermissions, test.groupMembers)
if got != test.want {
require.Equal(t, test.want, got, i)
}
diff --git a/backend/generated-go/store/audit_log.pb.go b/backend/generated-go/store/audit_log.pb.go
index bfdf3bc4b8..2b392d216b 100644
--- a/backend/generated-go/store/audit_log.pb.go
+++ b/backend/generated-go/store/audit_log.pb.go
@@ -103,7 +103,7 @@ type AuditLog struct {
// The resource name.
// Example: projects/{project}
Resource string `protobuf:"bytes,3,opt,name=resource,proto3" json:"resource,omitempty"`
- // Format: users/{userUID}.
+ // Format: users/{email}.
User string `protobuf:"bytes,4,opt,name=user,proto3" json:"user,omitempty"`
Severity AuditLog_Severity `protobuf:"varint,5,opt,name=severity,proto3,enum=bytebase.store.AuditLog_Severity" json:"severity,omitempty"`
// Marshalled request.
diff --git a/backend/generated-go/store/group.pb.go b/backend/generated-go/store/group.pb.go
index f6b74402d3..bad0143a32 100644
--- a/backend/generated-go/store/group.pb.go
+++ b/backend/generated-go/store/group.pb.go
@@ -74,7 +74,7 @@ type GroupMember struct {
state protoimpl.MessageState `protogen:"open.v1"`
// Member is the principal who belongs to this group.
//
- // Format: users/{userUID}.
+ // Format: users/{email}.
Member string `protobuf:"bytes,1,opt,name=member,proto3" json:"member,omitempty"`
Role GroupMember_Role `protobuf:"varint,2,opt,name=role,proto3,enum=bytebase.store.GroupMember_Role" json:"role,omitempty"`
unknownFields protoimpl.UnknownFields
diff --git a/backend/generated-go/store/issue.pb.go b/backend/generated-go/store/issue.pb.go
index 4fe6b240e6..9e34f61369 100644
--- a/backend/generated-go/store/issue.pb.go
+++ b/backend/generated-go/store/issue.pb.go
@@ -215,7 +215,7 @@ type GrantRequest struct {
// Format: roles/EXPORTER.
Role string `protobuf:"bytes,1,opt,name=role,proto3" json:"role,omitempty"`
// The user who will receive the role.
- // Format: users/{userUID}.
+ // Format: users/{email}.
User string `protobuf:"bytes,2,opt,name=user,proto3" json:"user,omitempty"`
// Optional conditional expression that limits when the grant applies.
Condition *expr.Expr `protobuf:"bytes,3,opt,name=condition,proto3" json:"condition,omitempty"`
diff --git a/backend/generated-go/store/policy.pb.go b/backend/generated-go/store/policy.pb.go
index 276d81326c..df8cf305df 100644
--- a/backend/generated-go/store/policy.pb.go
+++ b/backend/generated-go/store/policy.pb.go
@@ -579,7 +579,7 @@ type Binding struct {
// Format: roles/{role}
Role string `protobuf:"bytes,1,opt,name=role,proto3" json:"role,omitempty"`
// Specifies the principals requesting access for a Bytebase resource.
- // For users, the member should be: users/{userUID}
+ // For users, the member should be: users/{email}
// For groups, the member should be: groups/{email}
Members []string `protobuf:"bytes,2,rep,name=members,proto3" json:"members,omitempty"`
// The condition that is associated with this binding.
@@ -992,7 +992,7 @@ type MaskingExceptionPolicy_MaskingException struct {
Action MaskingExceptionPolicy_MaskingException_Action `protobuf:"varint,1,opt,name=action,proto3,enum=bytebase.store.MaskingExceptionPolicy_MaskingException_Action" json:"action,omitempty"`
// Member is the principal who binds to this exception policy instance.
//
- // Format: users/{userUID} or groups/{group email}
+ // Format: users/{email} or groups/{group email}
Member string `protobuf:"bytes,4,opt,name=member,proto3" json:"member,omitempty"`
// The condition that is associated with this exception policy instance.
Condition *expr.Expr `protobuf:"bytes,5,opt,name=condition,proto3" json:"condition,omitempty"`
diff --git a/backend/migrator/migration/3.13/0021##migrate_user_id_to_email.sql b/backend/migrator/migration/3.13/0021##migrate_user_id_to_email.sql
new file mode 100644
index 0000000000..1710d79fda
--- /dev/null
+++ b/backend/migrator/migration/3.13/0021##migrate_user_id_to_email.sql
@@ -0,0 +1,240 @@
+-- OPTIMIZED VERSION
+-- Migrate user references from users/{id} format to users/{email} format
+--
+-- Key optimizations:
+-- 1. Pre-build id->email lookup table (eliminates correlated subqueries)
+-- 2. O(1) hash lookups instead of O(n×m) correlated subqueries
+
+-- ============================================================================
+-- Build temporary lookup table for O(1) id->email conversion
+-- ============================================================================
+CREATE TEMP TABLE user_id_to_email AS
+SELECT
+ id,
+ 'users/' || email AS email_format,
+ email
+FROM principal
+WHERE email IS NOT NULL;
+
+-- Index for fast lookups
+CREATE INDEX idx_temp_user_id ON user_id_to_email(id);
+
+-- ============================================================================
+-- 1. Update policy table - IAM bindings members
+-- ============================================================================
+UPDATE policy
+SET payload = (
+ SELECT jsonb_set(
+ policy.payload,
+ '{bindings}',
+ COALESCE(
+ (
+ SELECT jsonb_agg(
+ jsonb_set(
+ binding,
+ '{members}',
+ COALESCE(
+ (
+ SELECT jsonb_agg(
+ CASE
+ WHEN member LIKE 'users/%' AND member NOT LIKE 'users/%@%' THEN
+ COALESCE(
+ (
+ SELECT u.email_format
+ FROM user_id_to_email u
+ WHERE u.id = CAST(SUBSTRING(member FROM 7) AS INTEGER)
+ ),
+ member -- Keep original if not found
+ )
+ ELSE member
+ END
+ )
+ FROM jsonb_array_elements_text(binding->'members') AS member
+ ),
+ '[]'::jsonb
+ )
+ )
+ )
+ FROM jsonb_array_elements(policy.payload->'bindings') AS binding
+ ),
+ '[]'::jsonb
+ )
+ )
+)
+WHERE type = 'IAM'
+ AND payload ? 'bindings'
+ AND EXISTS (
+ SELECT 1
+ FROM jsonb_array_elements(payload->'bindings') AS binding,
+ jsonb_array_elements_text(binding->'members') AS member
+ WHERE member LIKE 'users/%' AND member NOT LIKE 'users/%@%'
+ );
+
+-- ============================================================================
+-- 2. Update policy table - Masking exception members
+-- ============================================================================
+UPDATE policy
+SET payload = (
+ SELECT jsonb_set(
+ policy.payload,
+ '{maskingExceptions}',
+ COALESCE(
+ (
+ SELECT jsonb_agg(
+ CASE
+ WHEN exception->>'member' LIKE 'users/%' AND exception->>'member' NOT LIKE 'users/%@%' THEN
+ jsonb_set(
+ exception,
+ '{member}',
+ to_jsonb(COALESCE(
+ (
+ SELECT u.email_format
+ FROM user_id_to_email u
+ WHERE u.id = CAST(SUBSTRING(exception->>'member' FROM 7) AS INTEGER)
+ ),
+ exception->>'member'
+ ))
+ )
+ ELSE exception
+ END
+ )
+ FROM jsonb_array_elements(policy.payload->'maskingExceptions') AS exception
+ ),
+ '[]'::jsonb
+ )
+ )
+)
+WHERE type = 'MASKING_EXCEPTION'
+ AND payload ? 'maskingExceptions'
+ AND EXISTS (
+ SELECT 1
+ FROM jsonb_array_elements(payload->'maskingExceptions') AS exception
+ WHERE exception->>'member' LIKE 'users/%' AND exception->>'member' NOT LIKE 'users/%@%'
+ );
+
+-- ============================================================================
+-- 3. Update user_group table - Group members
+-- ============================================================================
+UPDATE user_group
+SET payload = (
+ SELECT jsonb_set(
+ user_group.payload,
+ '{members}',
+ COALESCE(
+ (
+ SELECT jsonb_agg(
+ CASE
+ WHEN member->>'member' LIKE 'users/%' AND member->>'member' NOT LIKE 'users/%@%' THEN
+ jsonb_set(
+ member,
+ '{member}',
+ to_jsonb(COALESCE(
+ (
+ SELECT u.email_format
+ FROM user_id_to_email u
+ WHERE u.id = CAST(SUBSTRING(member->>'member' FROM 7) AS INTEGER)
+ ),
+ member->>'member'
+ ))
+ )
+ ELSE member
+ END
+ )
+ FROM jsonb_array_elements(user_group.payload->'members') AS member
+ ),
+ '[]'::jsonb
+ )
+ )
+)
+WHERE payload ? 'members'
+ AND EXISTS (
+ SELECT 1
+ FROM jsonb_array_elements(payload->'members') AS member
+ WHERE member->>'member' LIKE 'users/%' AND member->>'member' NOT LIKE 'users/%@%'
+ );
+
+-- ============================================================================
+-- 4. Update issue table - Grant request user
+-- ============================================================================
+UPDATE issue
+SET payload = (
+ SELECT jsonb_set(
+ issue.payload,
+ '{grantRequest,user}',
+ to_jsonb(COALESCE(
+ (
+ SELECT u.email_format
+ FROM user_id_to_email u
+ WHERE u.id = CAST(SUBSTRING(issue.payload->'grantRequest'->>'user' FROM 7) AS INTEGER)
+ ),
+ issue.payload->'grantRequest'->>'user'
+ ))
+ )
+)
+WHERE payload->'grantRequest'->>'user' LIKE 'users/%'
+ AND payload->'grantRequest'->>'user' NOT LIKE 'users/%@%';
+
+-- ============================================================================
+-- 5. Update issue table - Approval approvers (principalId field)
+-- ============================================================================
+UPDATE issue
+SET payload = (
+ SELECT jsonb_set(
+ issue.payload,
+ '{approval,approvers}',
+ COALESCE(
+ (
+ SELECT jsonb_agg(
+ CASE
+ WHEN approver->>'principalId' ~ '^\d+$' THEN
+ jsonb_set(
+ approver,
+ '{principalId}',
+ to_jsonb(COALESCE(
+ (
+ SELECT u.email_format
+ FROM user_id_to_email u
+ WHERE u.id = CAST(approver->>'principalId' AS INTEGER)
+ ),
+ 'users/' || (approver->>'principalId')
+ ))
+ )
+ ELSE approver
+ END
+ )
+ FROM jsonb_array_elements(issue.payload->'approval'->'approvers') AS approver
+ ),
+ '[]'::jsonb
+ )
+ )
+)
+WHERE payload->'approval' ? 'approvers'
+ AND EXISTS (
+ SELECT 1
+ FROM jsonb_array_elements(payload->'approval'->'approvers') AS approver
+ WHERE approver->>'principalId' ~ '^\d+$'
+ );
+
+-- ============================================================================
+-- 6. Update audit_log table - User field
+-- ============================================================================
+UPDATE audit_log
+SET payload = (
+ SELECT jsonb_set(
+ audit_log.payload,
+ '{user}',
+ to_jsonb(COALESCE(
+ (
+ SELECT u.email_format
+ FROM user_id_to_email u
+ WHERE u.id = CAST(SUBSTRING(audit_log.payload->>'user' FROM 7) AS INTEGER)
+ ),
+ audit_log.payload->>'user'
+ ))
+ )
+)
+WHERE payload->>'user' LIKE 'users/%'
+ AND payload->>'user' NOT LIKE 'users/%@%';
+
+-- Cleanup temp table
+DROP TABLE user_id_to_email;
diff --git a/backend/migrator/migrator_test.go b/backend/migrator/migrator_test.go
index fed6ea7cd7..6663ce02a5 100644
--- a/backend/migrator/migrator_test.go
+++ b/backend/migrator/migrator_test.go
@@ -12,7 +12,7 @@ import (
func TestLatestVersion(t *testing.T) {
files, err := getSortedVersionedFiles()
require.NoError(t, err)
- require.Equal(t, semver.MustParse("3.13.20"), *files[len(files)-1].version)
+ require.Equal(t, semver.MustParse("3.13.21"), *files[len(files)-1].version)
}
func TestVersionUnique(t *testing.T) {
diff --git a/backend/store/audit_log.go b/backend/store/audit_log.go
index 3a172aba2b..bff82ca87d 100644
--- a/backend/store/audit_log.go
+++ b/backend/store/audit_log.go
@@ -131,7 +131,7 @@ func (s *Store) SearchAuditLogs(ctx context.Context, find *AuditLogFind) ([]*Aud
return logs, nil
}
-func GetSearchAuditLogsFilter(ctx context.Context, s *Store, filter string) (*qb.Query, error) {
+func GetSearchAuditLogsFilter(filter string) (*qb.Query, error) {
if filter == "" {
return nil, nil
}
@@ -182,22 +182,6 @@ func GetSearchAuditLogsFilter(ctx context.Context, s *Store, filter string) (*qb
default:
return nil, errors.Errorf("unknown variable %s", variable)
}
- if variable == "user" {
- // Convert user email to user id.
- // e.g. users/[email protected] -> users/101
- email := strings.TrimPrefix(value, "users/")
- if email == "" {
- return nil, errors.New("invalid empty creator identifier")
- }
- user, err := s.GetUserByEmail(ctx, email)
- if err != nil {
- return nil, errors.Wrapf(err, `failed to find user "%s"`, email)
- }
- if user == nil {
- return nil, errors.Errorf("cannot found user %s", email)
- }
- value = fmt.Sprintf("%s%d", common.UserNamePrefix, user.ID)
- }
return qb.Q().Space(fmt.Sprintf("payload->>'%s' = ?", variable), value), nil
case celoperators.GreaterEquals, celoperators.LessEquals:
diff --git a/backend/store/audit_log_filter_test.go b/backend/store/audit_log_filter_test.go
index 15b3066379..fdcccc1629 100644
--- a/backend/store/audit_log_filter_test.go
+++ b/backend/store/audit_log_filter_test.go
@@ -1,7 +1,6 @@
package store
import (
- "context"
"testing"
"time"
@@ -139,10 +138,7 @@ func TestGetSearchAuditLogsFilter_WithoutUserLookup(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- // Create a mock store for testing without database
- // For tests that don't require user lookup, we use context.TODO()
- s := &Store{}
- q, err := GetSearchAuditLogsFilter(context.TODO(), s, tt.filter)
+ q, err := GetSearchAuditLogsFilter(tt.filter)
if tt.wantErr {
require.Error(t, err)
@@ -209,8 +205,7 @@ func TestGetSearchAuditLogsFilter_EdgeCases(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- s := &Store{}
- q, err := GetSearchAuditLogsFilter(context.TODO(), s, tt.filter)
+ q, err := GetSearchAuditLogsFilter(tt.filter)
if tt.wantErr {
require.Error(t, err, tt.description)
diff --git a/backend/store/principal.go b/backend/store/principal.go
index 5885ae40fa..6d80131afc 100644
--- a/backend/store/principal.go
+++ b/backend/store/principal.go
@@ -225,13 +225,13 @@ func listUserImpl(ctx context.Context, txn *sql.Tx, find *FindUserMessage) ([]*U
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())
- from.Space(`INNER JOIN project_members ON (CONCAT('users/', principal.id) = ANY(project_members.members) OR ? = ANY(project_members.members))`, common.AllUsers)
+ from.Space(`INNER JOIN project_members ON (CONCAT('users/', principal.email) = ANY(project_members.members) OR ? = ANY(project_members.members))`, common.AllUsers)
} else {
with.Space(`WITH`)
}
// Join the user_group table to find groups for each user.
- // The user will be stored in the user_group.payload.members.member field, the member is in the "users/{id}" format
+ // The user will be stored in the user_group.payload.members.member field, the member is in the "users/{email}" format
with.Space(`user_groups AS (
SELECT
principal.id AS user_id,
@@ -239,7 +239,7 @@ func listUserImpl(ctx context.Context, txn *sql.Tx, find *FindUserMessage) ([]*U
FROM principal
LEFT JOIN user_group ON EXISTS (
SELECT 1 FROM jsonb_array_elements(user_group.payload->'members') AS m
- WHERE m->>'member' = CONCAT('users/', principal.id)
+ WHERE m->>'member' = CONCAT('users/', principal.email)
)
GROUP BY principal.id
)`)
diff --git a/backend/store/project.go b/backend/store/project.go
index 4da60b81e6..71e4e695d3 100644
--- a/backend/store/project.go
+++ b/backend/store/project.go
@@ -210,7 +210,7 @@ func (s *Store) CreateProject(ctx context.Context, create *ProjectMessage, creat
{
Role: common.FormatRole(common.ProjectOwner),
Members: []string{
- common.FormatUserUID(user.ID),
+ common.FormatUserEmail(user.Email),
},
Condition: &expr.Expr{},
},
diff --git a/backend/utils/member.go b/backend/utils/member.go
index 1dab4325a6..098aede236 100644
--- a/backend/utils/member.go
+++ b/backend/utils/member.go
@@ -93,7 +93,7 @@ func GetGroupByName(ctx context.Context, stores *store.Store, name string) (*sto
}
// GetUsersByMember gets user messages by member.
-// The member should in users/{uid} or groups/{email} format.
+// The member should be in users/{email} or groups/{email} format.
func GetUsersByMember(ctx context.Context, stores *store.Store, member string) []*store.UserMessage {
var users []*store.UserMessage
if strings.HasPrefix(member, common.UserNamePrefix) {
@@ -122,16 +122,16 @@ func GetUsersByMember(ctx context.Context, stores *store.Store, member string) [
}
// getUserByIdentifier gets user message by identifier.
-// The identifier should in users/{uid} format.
+// The identifier should be in users/{email} format.
func getUserByIdentifier(ctx context.Context, stores *store.Store, identifier string) *store.UserMessage {
- userUID, err := common.GetUserID(identifier)
+ email, err := common.GetUserEmail(identifier)
if err != nil {
- slog.Error("failed to parse user id", slog.String("user", identifier), log.BBError(err))
+ slog.Error("failed to parse user email", slog.String("user", identifier), log.BBError(err))
return nil
}
- user, err := stores.GetUserByID(ctx, userUID)
+ user, err := stores.GetUserByEmail(ctx, email)
if err != nil {
- slog.Error("failed to get user", slog.String("user", identifier), log.BBError(err))
+ slog.Error("failed to get user by email", slog.String("user", identifier), log.BBError(err))
return nil
}
return user
@@ -139,7 +139,7 @@ func getUserByIdentifier(ctx context.Context, stores *store.Store, identifier st
// GetUserIAMPolicyBindings return the valid bindings for the user.
func GetUserIAMPolicyBindings(ctx context.Context, stores *store.Store, user *store.UserMessage, policies ...*storepb.IamPolicy) []*storepb.Binding {
- userIDFullName := common.FormatUserUID(user.ID)
+ userEmailFullName := common.FormatUserEmail(user.Email)
var bindings []*storepb.Binding
@@ -155,7 +155,7 @@ func GetUserIAMPolicyBindings(ctx context.Context, stores *store.Store, user *st
hasUser = true
break
}
- if userIDFullName == member {
+ if userEmailFullName == member {
hasUser = true
break
}
@@ -170,7 +170,7 @@ func GetUserIAMPolicyBindings(ctx context.Context, stores *store.Store, user *st
continue
}
for _, member := range group.Payload.Members {
- if userIDFullName == member.Member {
+ if userEmailFullName == member.Member {
hasUser = true
break
}
@@ -189,7 +189,7 @@ func GetUserIAMPolicyBindings(ctx context.Context, stores *store.Store, user *st
}
// MemberContainsUser checks if a member (user or group) contains the specified user.
-// The member should be in users/{uid} or groups/{email} format.
+// The member should be in users/{email} or groups/{email} format.
func MemberContainsUser(ctx context.Context, stores *store.Store, member string, user *store.UserMessage) bool {
if member == common.AllUsers {
return true
@@ -197,12 +197,12 @@ func MemberContainsUser(ctx context.Context, stores *store.Store, member string,
// Check if member is a user
if strings.HasPrefix(member, common.UserNamePrefix) {
- memberUID, err := common.GetUserID(member)
+ memberEmail, err := common.GetUserEmail(member)
if err != nil {
- slog.Error("failed to parse user id", slog.String("member", member), log.BBError(err))
+ slog.Error("failed to parse user email", slog.String("member", member), log.BBError(err))
return false
}
- return memberUID == user.ID
+ return memberEmail == user.Email
}
// Check if member is a group
@@ -216,9 +216,9 @@ func MemberContainsUser(ctx context.Context, stores *store.Store, member string,
slog.Error("cannot find group", slog.String("group", member))
return false
}
- userIDFullName := common.FormatUserUID(user.ID)
+ userEmailFullName := common.FormatUserEmail(user.Email)
for _, groupMember := range group.Payload.Members {
- if userIDFullName == groupMember.Member {
+ if userEmailFullName == groupMember.Member {
return true
}
}
diff --git a/backend/utils/utils.go b/backend/utils/utils.go
index 988b68762d..9dba1984a6 100644
--- a/backend/utils/utils.go
+++ b/backend/utils/utils.go
@@ -111,7 +111,7 @@ func UpdateProjectPolicyFromGrantIssue(ctx context.Context, stores *store.Store,
continue
}
// Append
- binding.Members = append(binding.Members, common.FormatUserUID(newUser.ID))
+ binding.Members = append(binding.Members, common.FormatUserEmail(newUser.Email))
updated = true
break
}
@@ -123,7 +123,7 @@ func UpdateProjectPolicyFromGrantIssue(ctx context.Context, stores *store.Store,
condition.Description = fmt.Sprintf("#%d", issue.UID)
policyMessage.Policy.Bindings = append(policyMessage.Policy.Bindings, &storepb.Binding{
Role: grantRequest.Role,
- Members: []string{common.FormatUserUID(newUser.ID)},
+ Members: []string{common.FormatUserEmail(newUser.Email)},
Condition: condition,
})
}
diff --git a/proto/gen/grpc-doc/store/README.md b/proto/gen/grpc-doc/store/README.md
index c6f12e0277..548780ec1e 100644
--- a/proto/gen/grpc-doc/store/README.md
+++ b/proto/gen/grpc-doc/store/README.md
@@ -698,7 +698,7 @@ Status represents the approver's decision state.
| parent | [string](#string) | | The project or workspace the audit log belongs to. Formats: - projects/{project} - workspaces/{workspace} |
| method | [string](#string) | | Example: /bytebase.v1.SQLService/Query |
| resource | [string](#string) | | The resource name. Example: projects/{project} |
-| user | [string](#string) | | Format: users/{userUID}. |
+| user | [string](#string) | | Format: users/{email}. |
| severity | [AuditLog.Severity](#bytebase-store-AuditLog-Severity) | | |
| request | [string](#string) | | Marshalled request. |
| response | [string](#string) | | Marshalled response. Some fields are omitted because they are too large or contain sensitive information. |
@@ -2058,7 +2058,7 @@ LIST, HASH (https://www.postgresql.org/docs/current/ddl-partitioning.html)
| ----- | ---- | ----- | ----------- |
| member | [string](#string) | | Member is the principal who belongs to this group.
-Format: users/{userUID}. |
+Format: users/{email}. |
| role | [GroupMember.Role](#bytebase-store-GroupMember-Role) | | |
@@ -2723,7 +2723,7 @@ GrantRequest contains details for requesting database access permissions.
| Field | Type | Label | Description |
| ----- | ---- | ----- | ----------- |
| role | [string](#string) | | The role being requested for the user. Format: roles/EXPORTER. |
-| user | [string](#string) | | The user who will receive the role. Format: users/{userUID}. |
+| user | [string](#string) | | The user who will receive the role. Format: users/{email}. |
| condition | [google.type.Expr](#google-type-Expr) | | Optional conditional expression that limits when the grant applies. |
| expiration | [google.protobuf.Duration](#google-protobuf-Duration) | | Duration after which the grant automatically expires. |
@@ -3386,7 +3386,7 @@ Type is the database change type.
| Field | Type | Label | Description |
| ----- | ---- | ----- | ----------- |
| role | [string](#string) | | The role that is assigned to the members. Format: roles/{role} |
-| members | [string](#string) | repeated | Specifies the principals requesting access for a Bytebase resource. For users, the member should be: users/{userUID} For groups, the member should be: groups/{email} |
+| members | [string](#string) | repeated | Specifies the principals requesting access for a Bytebase resource. For users, the member should be: users/{email} For groups, the member should be: groups/{email} |
| condition | [google.type.Expr](#google-type-Expr) | | The condition that is associated with this binding. If the condition evaluates to true, then this binding applies to the current request. If the condition evaluates to false, then this binding does not apply to the current request. However, a different role binding might grant the same role to one or more of the principals in this binding. |
@@ -3468,7 +3468,7 @@ MaskingExceptionPolicy is the allowlist of users who can access sensitive data.
| action | [MaskingExceptionPolicy.MaskingException.Action](#bytebase-store-MaskingExceptionPolicy-MaskingException-Action) | | action is the action by which the user can access sensitive data. |
| member | [string](#string) | | Member is the principal who binds to this exception policy instance.
-Format: users/{userUID} or groups/{group email} |
+Format: users/{email} or groups/{group email} |
| condition | [google.type.Expr](#google-type-Expr) | | The condition that is associated with this exception policy instance. |
diff --git a/proto/gen/grpc-doc/store/index.html b/proto/gen/grpc-doc/store/index.html
index 9217d33b46..7c719123ff 100644
--- a/proto/gen/grpc-doc/store/index.html
+++ b/proto/gen/grpc-doc/store/index.html
@@ -2376,7 +2376,7 @@ Example: projects/{project} </p></td>
<td>user</td>
<td><a href="#string">string</a></td>
<td></td>
- <td><p>Format: users/{userUID}. </p></td>
+ <td><p>Format: users/{email}. </p></td>
</tr>
<tr>
@@ -6168,7 +6168,7 @@ Examples: GEOMETRY_GRID, GEOGRAPHY_GRID, GEOMETRY_AUTO_GRID, GEOGRAPHY_AUTO_GRID
<td></td>
<td><p>Member is the principal who belongs to this group.
-Format: users/{userUID}. </p></td>
+Format: users/{email}. </p></td>
</tr>
<tr>
@@ -8042,7 +8042,7 @@ Format: roles/EXPORTER. </p></td>
<td><a href="#string">string</a></td>
<td></td>
<td><p>The user who will receive the role.
-Format: users/{userUID}. </p></td>
+Format: users/{email}. </p></td>
</tr>
<tr>
@@ -9541,7 +9541,7 @@ Format: roles/{role} </p></td>
<td><a href="#string">string</a></td>
<td>repeated</td>
<td><p>Specifies the principals requesting access for a Bytebase resource.
-For users, the member should be: users/{userUID}
+For users, the member should be: users/{email}
For groups, the member should be: groups/{email} </p></td>
</tr>
@@ -9702,7 +9702,7 @@ A binding binds one or more members or groups to a single role. </p></td>
<td></td>
<td><p>Member is the principal who binds to this exception policy instance.
-Format: users/{userUID} or groups/{group email} </p></td>
+Format: users/{email} or groups/{group email} </p></td>
</tr>
<tr>
diff --git a/proto/store/store/audit_log.proto b/proto/store/store/audit_log.proto
index f48dc45e45..dcdd0553b8 100644
--- a/proto/store/store/audit_log.proto
+++ b/proto/store/store/audit_log.proto
@@ -22,7 +22,7 @@ message AuditLog {
// Example: projects/{project}
string resource = 3;
- // Format: users/{userUID}.
+ // Format: users/{email}.
string user = 4;
Severity severity = 5;
diff --git a/proto/store/store/group.proto b/proto/store/store/group.proto
index 6adb3797ab..1e6afbb16e 100644
--- a/proto/store/store/group.proto
+++ b/proto/store/store/group.proto
@@ -7,7 +7,7 @@ option go_package = "generated-go/store";
message GroupMember {
// Member is the principal who belongs to this group.
//
- // Format: users/{userUID}.
+ // Format: users/{email}.
string member = 1;
enum Role {
diff --git a/proto/store/store/issue.proto b/proto/store/store/issue.proto
index 12cf45f3fe..0f3e002ab9 100644
--- a/proto/store/store/issue.proto
+++ b/proto/store/store/issue.proto
@@ -49,7 +49,7 @@ message GrantRequest {
// Format: roles/EXPORTER.
string role = 1;
// The user who will receive the role.
- // Format: users/{userUID}.
+ // Format: users/{email}.
string user = 2;
// Optional conditional expression that limits when the grant applies.
google.type.Expr condition = 3;
diff --git a/proto/store/store/policy.proto b/proto/store/store/policy.proto
index cde582de68..42ad8f6ad0 100644
--- a/proto/store/store/policy.proto
+++ b/proto/store/store/policy.proto
@@ -72,7 +72,7 @@ message MaskingExceptionPolicy {
// Member is the principal who binds to this exception policy instance.
//
- // Format: users/{userUID} or groups/{group email}
+ // Format: users/{email} or groups/{group email}
string member = 4;
// The condition that is associated with this exception policy instance.
@@ -106,7 +106,7 @@ message Binding {
string role = 1;
// Specifies the principals requesting access for a Bytebase resource.
- // For users, the member should be: users/{userUID}
+ // For users, the member should be: users/{email}
// For groups, the member should be: groups/{email}
repeated string members = 2;