Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
chore: show invited badge and hit (#20052)
ecmadao2eaac750c8ba
diff --git a/backend/api/v1/auth_service.go b/backend/api/v1/auth_service.goindex 1d972481c9..57b1e6dc14 100644--- a/backend/api/v1/auth_service.go+++ b/backend/api/v1/auth_service.go@@ -389,24 +389,6 @@ func (s *AuthService) provisionWorkspaceForNewUser(ctx context.Context, email streturn "", errors.Wrapf(err, "failed to create workspace")}- // TODO(ed): check this later.- // When EMAIL_CONFIG is set, enable email code signin for the new workspace.- if os.Getenv("EMAIL_CONFIG") != "" {- profile, err := s.store.GetWorkspaceProfileSetting(ctx, ws.ResourceID)- if err != nil {- slog.Warn("failed to get workspace profile for email code signin patch", log.BBError(err))- } else {- profile.AllowEmailCodeSignin = true- if _, err := s.store.UpsertSetting(ctx, &store.SettingMessage{- Name: storepb.SettingName_WORKSPACE_PROFILE,- Workspace: ws.ResourceID,- Value: profile,- }); err != nil {- slog.Warn("failed to enable allow_email_code_signin for new workspace", log.BBError(err))- }- }- }-return ws.ResourceID, nil}diff --git a/backend/api/v1/setting_service.go b/backend/api/v1/setting_service.goindex 0a2d41807c..3dd5a4bc66 100644--- a/backend/api/v1/setting_service.go+++ b/backend/api/v1/setting_service.go@@ -624,6 +624,9 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.ReqstoreSettingValue = environmentSettingcase storepb.SettingName_EMAIL:+ if s.profile.SaaS {+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("email setting cannot be changed in SaaS mode"))+ }if request.Msg.UpdateMask == nil {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("update mask is required"))}@@ -833,15 +836,12 @@ var disallowedDomains = map[string]bool{"yeah.net": true,}-func (s *SettingService) isSettingDisallowed(name storepb.SettingName) bool {+func (*SettingService) isSettingDisallowed(name storepb.SettingName) bool {// Backend-only settings that should never be exposed via the API.switch name {case storepb.SettingName_SYSTEM:// SYSTEM: Internal system settings (auth secret, workspace ID, enterprise license)return true- case storepb.SettingName_EMAIL:- // EMAIL: not exposed in the SaaS mode.- return s.profile.SaaSdefault:return false}diff --git a/backend/api/v1/workspace_service.go b/backend/api/v1/workspace_service.goindex 9f6f46c448..c300bb44b8 100644--- a/backend/api/v1/workspace_service.go+++ b/backend/api/v1/workspace_service.go@@ -298,13 +298,8 @@ func (s *WorkspaceService) SetIamPolicy(ctx context.Context, req *connect.Reques// sendInviteEmails sends invite emails to newly added members. Errors are logged, never returned.func (s *WorkspaceService) sendInviteEmails(ctx context.Context, workspaceID string, oldPolicy *storepb.IamPolicy, deltas []*v1pb.BindingDelta) {- // Load email config.- emailSettingMsg, err := s.store.GetSetting(ctx, workspaceID, storepb.SettingName_EMAIL)- if err != nil || emailSettingMsg == nil {- return- }- emailSetting, ok := emailSettingMsg.Value.(*storepb.EmailSetting)- if !ok || emailSetting == nil {+ emailSetting, err := resolvePreLoginEmailSetting(ctx, s.store, workspaceID)+ if err != nil || emailSetting == nil {return}diff --git a/frontend/src/components/Member/types.ts b/frontend/src/components/Member/types.tsindex 85535d9292..2741f6b7bd 100644--- a/frontend/src/components/Member/types.ts+++ b/frontend/src/components/Member/types.ts@@ -19,4 +19,8 @@ export interface MemberBinding extends MemberRole {type: "users" | "groups";user?: User;group?: GroupBinding;+ // True when the email is in the IAM policy but has no principal (user hasn't+ // signed up yet). Only set when the current user has permission to list/get+ // users — otherwise we can't tell and this stays undefined.+ pending?: boolean;}diff --git a/frontend/src/components/Member/utils.ts b/frontend/src/components/Member/utils.tsindex b96459a30d..1eaa5db4f3 100644--- a/frontend/src/components/Member/utils.ts+++ b/frontend/src/components/Member/utils.ts@@ -23,7 +23,7 @@ import {import { GroupSchema } from "@/types/proto-es/v1/group_service_pb";import type { IamPolicy } from "@/types/proto-es/v1/iam_policy_pb";import { type User, UserSchema } from "@/types/proto-es/v1/user_service_pb";-import { convertMemberToFullname } from "@/utils";+import { convertMemberToFullname, hasWorkspacePermissionV2 } from "@/utils";import type { GroupBinding, MemberBinding } from "./types";const getMemberBinding = (@@ -65,6 +65,7 @@ const getMemberBinding = (};} else {let user: User | undefined = unknownUser(member);+ let isPending = false;const fullname = convertMemberToFullname(member);if (fullname.startsWith(serviceAccountNamePrefix)) {const sa = serviceAccountStore.getServiceAccount(fullname);@@ -73,8 +74,10 @@ const getMemberBinding = (const wi = workloadIdentityStore.getWorkloadIdentity(fullname);user = workloadIdentityToUser(wi);} else {- user = userStore.getUserByIdentifier(member);- if (!user) {+ const realUser = userStore.getUserByIdentifier(member);+ if (realUser) {+ user = realUser;+ } else {const email = extractUserEmail(member);user = create(UserSchema, {title: email,@@ -82,6 +85,12 @@ const getMemberBinding = (email: email,});}+ // Mark as pending (no principal) only when we can trust the lookup —+ // i.e. the current user has permission to list or get users.+ isPending =+ !realUser &&+ (hasWorkspacePermissionV2("bb.users.list") ||+ hasWorkspacePermissionV2("bb.users.get"));}memberBinding = {@@ -91,6 +100,7 @@ const getMemberBinding = (binding: member,workspaceLevelRoles: new Set<string>(),projectRoleBindings: [],+ pending: isPending,};}diff --git a/frontend/src/react/locales/en-US.json b/frontend/src/react/locales/en-US.jsonindex 0ff3d27b5c..926bed7130 100644--- a/frontend/src/react/locales/en-US.json+++ b/frontend/src/react/locales/en-US.json@@ -1850,6 +1850,8 @@"inactive-service-accounts": "Inactive service accounts","inactive-users": "Inactive users","inactive-workload-identities": "Inactive workload identities",+ "invite-email-hint": "Invitation emails will be sent to new members.",+ "pending-invite": "Invited","reset-service-key": "Reset Service Key","reset-service-key-alert": "This action cannot be undone. The old key will stop working immediately. Are you sure you want to reset this service key?","revoke-access": "Revoke Access",diff --git a/frontend/src/react/locales/es-ES.json b/frontend/src/react/locales/es-ES.jsonindex 6423c0ad62..329e52d1fe 100644--- a/frontend/src/react/locales/es-ES.json+++ b/frontend/src/react/locales/es-ES.json@@ -1850,6 +1850,8 @@"inactive-service-accounts": "Cuentas de servicio inactivas","inactive-users": "Usuarios inactivos","inactive-workload-identities": "Identidades de carga de trabajo inactivas",+ "invite-email-hint": "Se enviarán correos de invitación a los nuevos miembros.",+ "pending-invite": "Invitado","reset-service-key": "Restablecer Clave de Servicio","reset-service-key-alert": "Esta acción no se puede deshacer. La clave antigua dejará de funcionar de inmediato. ¿Está seguro de que desea restablecer esta clave de servicio?","revoke-access": "Revocar acceso",diff --git a/frontend/src/react/locales/ja-JP.json b/frontend/src/react/locales/ja-JP.jsonindex 7e6e169e23..bf8df4fb73 100644--- a/frontend/src/react/locales/ja-JP.json+++ b/frontend/src/react/locales/ja-JP.json@@ -1850,6 +1850,8 @@"inactive-service-accounts": "非アクティブサービスアカウント","inactive-users": "非アクティブユーザー","inactive-workload-identities": "非アクティブワークロードID",+ "invite-email-hint": "新しいメンバーに招待メールが送信されます。",+ "pending-invite": "招待済み","reset-service-key": "サービスキーのリセット","reset-service-key-alert": "古いサービス キーはすぐにリセットされ、この操作は元に戻すことはできません。サービス キーをリセットしてもよろしいですか?","revoke-access": "アクセスを取り消す",diff --git a/frontend/src/react/locales/vi-VN.json b/frontend/src/react/locales/vi-VN.jsonindex c45161cb93..7eb866bfc1 100644--- a/frontend/src/react/locales/vi-VN.json+++ b/frontend/src/react/locales/vi-VN.json@@ -1850,6 +1850,8 @@"inactive-service-accounts": "Tài khoản dịch vụ không hoạt động","inactive-users": "Người dùng không hoạt động","inactive-workload-identities": "Danh tính Workload không hoạt động",+ "invite-email-hint": "Email mời sẽ được gửi đến các thành viên mới.",+ "pending-invite": "Đã mời","reset-service-key": "Đặt lại Khóa Dịch vụ","reset-service-key-alert": "Hành động này không thể hoàn tác. Khóa cũ sẽ ngừng hoạt động ngay lập tức. Bạn có chắc chắn muốn đặt lại khóa dịch vụ này?","revoke-access": "Thu hồi Quyền truy cập",diff --git a/frontend/src/react/locales/zh-CN.json b/frontend/src/react/locales/zh-CN.jsonindex 282c99b214..0f48f3d44f 100644--- a/frontend/src/react/locales/zh-CN.json+++ b/frontend/src/react/locales/zh-CN.json@@ -1850,6 +1850,8 @@"inactive-service-accounts": "未激活服务账号","inactive-users": "未激活用户","inactive-workload-identities": "未激活工作负载身份",+ "invite-email-hint": "将向新成员发送邀请邮件。",+ "pending-invite": "已邀请","reset-service-key": "重置 Service Key","reset-service-key-alert": "旧 Service Key 将立即被重置,该操作不可逆。确定要重置 Service Key 吗?","revoke-access": "撤销访问权限",diff --git a/frontend/src/react/pages/settings/MembersPage.tsx b/frontend/src/react/pages/settings/MembersPage.tsxindex 2452b02b3f..9b377b704e 100644--- a/frontend/src/react/pages/settings/MembersPage.tsx+++ b/frontend/src/react/pages/settings/MembersPage.tsx@@ -110,6 +110,7 @@ import {RoleGrantSchema,} from "@/types/proto-es/v1/issue_service_pb";import type { Project } from "@/types/proto-es/v1/project_service_pb";+import { Setting_SettingName } from "@/types/proto-es/v1/setting_service_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";import { AccountType, getAccountTypeByEmail } from "@/types/v1/user";import {@@ -173,6 +174,8 @@ function MemberTable({}) {const { t } = useTranslation();const currentUser = useVueState(() => useCurrentUserV1().value);+ const actuatorStore = useActuatorV1Store();+ const isSaaSMode = useVueState(() => actuatorStore.isSaaSMode);const selectableBindings = useMemo(() =>@@ -286,6 +289,11 @@ function MemberTable({mb.user?.name === currentUser.name && (<Badge className="text-xs">{t("common.you")}</Badge>)}+ {isSaaSMode && mb.type === "users" && mb.pending && (+ <Badge variant="warning" className="text-xs">+ {t("settings.members.pending-invite")}+ </Badge>+ )}{mb.type === "users" &&mb.user?.email &&getAccountTypeByEmail(mb.user.email) ===@@ -404,6 +412,8 @@ function MemberTableByRole({}) {const { t } = useTranslation();const currentUser = useVueState(() => useCurrentUserV1().value);+ const actuatorStore = useActuatorV1Store();+ const isSaaSMode = useVueState(() => actuatorStore.isSaaSMode);const [expandedRoles, setExpandedRoles] = useState<Set<string>>(new Set());const initializedRef = useRef(false);@@ -509,6 +519,13 @@ function MemberTableByRole({{t("common.you")}</Badge>)}+ {isSaaSMode &&+ mb.type === "users" &&+ mb.pending && (+ <Badge variant="warning" className="text-xs">+ {t("settings.members.pending-invite")}+ </Badge>+ )}{mb.type === "users" &&mb.user?.email &&getAccountTypeByEmail(mb.user.email) ===@@ -1050,6 +1067,13 @@ function EditMemberRoleDrawer({const workspaceStore = useWorkspaceV1Store();const projectIamPolicyStore = useProjectIamPolicyStore();const isSaaSMode = useVueState(() => useActuatorV1Store().isSaaSMode);+ const settingV1Store = useSettingV1Store();+ const hasEmailSetting = useVueState(+ () => !!settingV1Store.getSettingByName(Setting_SettingName.EMAIL)+ );+ useEffect(() => {+ settingV1Store.getOrFetchSettingByName(Setting_SettingName.EMAIL, true);+ }, [settingV1Store]);const isEditMode = !!member;const isProjectCreateMode = !!projectName && !isEditMode;@@ -1600,6 +1624,13 @@ function EditMemberRoleDrawer({<div className="flex-1 overflow-auto px-6 py-6"><div className="flex flex-col gap-y-6">+ {!isEditMode && !projectName && hasEmailSetting && (+ <Alert variant="info">+ <AlertDescription>+ {t("settings.members.invite-email-hint")}+ </AlertDescription>+ </Alert>+ )}{/* Member input */}<div className="flex flex-col gap-y-2"><label className="block text-sm font-medium text-control">