Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
refactor(iam): support service account and workload identity (#19117)
ecmadao0aaf5ffb136b
diff --git a/backend/api/v1/auth_service.go b/backend/api/v1/auth_service.goindex dcd8c87753..23a7880895 100644--- a/backend/api/v1/auth_service.go+++ b/backend/api/v1/auth_service.go@@ -808,7 +808,7 @@ func (s *AuthService) ExchangeToken(ctx context.Context, req *connect.Request[v1// Validate email formatif !common.IsWorkloadIdentityEmail(request.Email) {return nil, connect.NewError(connect.CodeInvalidArgument,- errors.Errorf("email must end with %s", common.WorkloadIdentityEmailSuffix))+ errors.Errorf("email must end with %s", common.WorkloadIdentitySuffix))}// Find workload identity by emaildiff --git a/backend/common/const.go b/backend/common/const.goindex b6c0638f0a..45d1881c83 100644--- a/backend/common/const.go+++ b/backend/common/const.go@@ -14,11 +14,11 @@ const (// ServiceAccountAccessKeyPrefix is the prefix for service account access key.ServiceAccountAccessKeyPrefix = "bbs_"- // WorkloadIdentityEmailSuffix is the email suffix for workload identities.- WorkloadIdentityEmailSuffix = "@workload.bytebase.com"+ // WorkloadIdentitySuffix is the email suffix for workload identities.+ WorkloadIdentitySuffix = "workload.bytebase.com"- // ServiceAccountEmailSuffix is the email suffix for workspace-level service accounts.- ServiceAccountEmailSuffix = "@service.bytebase.com"+ // ServiceAccountSuffix is the email suffix for service accounts.+ ServiceAccountSuffix = "service.bytebase.com")const (diff --git a/backend/common/resource_name.go b/backend/common/resource_name.goindex 5ed6694289..cbc660c5c8 100644--- a/backend/common/resource_name.go+++ b/backend/common/resource_name.go@@ -519,18 +519,18 @@ func FormatGroupEmail(email string) string {// IsWorkloadIdentityEmail checks if the email is a workload identity email.func IsWorkloadIdentityEmail(email string) bool {- return strings.HasSuffix(email, WorkloadIdentityEmailSuffix) || isProjectWorkloadIdentityEmail(email)+ return strings.HasSuffix(email, fmt.Sprintf("@%s", WorkloadIdentitySuffix)) || isProjectLevelEmail(email, WorkloadIdentitySuffix)}-// isProjectWorkloadIdentityEmail checks if the email is a project-level workload identity email.-func isProjectWorkloadIdentityEmail(email string) bool {- // Format: {name}@{project-id}.workload.bytebase.com+// isProjectLevelEmail checks if the email is a project-level email.+func isProjectLevelEmail(email, suffix string) bool {+ // Format: {name}@{project-id}.{suffix}parts := strings.Split(email, "@")if len(parts) != 2 {return false}domain := parts[1]- return strings.HasSuffix(domain, ".workload.bytebase.com") && domain != WorkloadIdentityEmailSuffix+ return strings.HasSuffix(domain, fmt.Sprintf(".%s", suffix))}func FormatReviewConfig(id string) string {@@ -655,18 +655,7 @@ func GetPolicyResourceTypeAndResource(requestName string) (storepb.Policy_Resour// IsServiceAccountEmail checks if the email is a service account email.func IsServiceAccountEmail(email string) bool {- return strings.HasSuffix(email, ServiceAccountEmailSuffix) || isProjectServiceAccountEmail(email)-}--// isProjectServiceAccountEmail checks if the email is a project-level service account email.-func isProjectServiceAccountEmail(email string) bool {- // Format: {name}@{project-id}.service.bytebase.com- parts := strings.Split(email, "@")- if len(parts) != 2 {- return false- }- domain := parts[1]- return strings.HasSuffix(domain, ".service.bytebase.com")+ return strings.HasSuffix(email, fmt.Sprintf("@%s", ServiceAccountSuffix)) || isProjectLevelEmail(email, ServiceAccountSuffix)}// FormatServiceAccountEmail formats a service account email from email.@@ -700,15 +689,15 @@ func GetWorkloadIdentityEmail(name string) (string, error) {// BuildServiceAccountEmail constructs a full email from name and optional project ID.func BuildServiceAccountEmail(name, projectID string) string {if projectID == "" {- return fmt.Sprintf("%s%s", name, ServiceAccountEmailSuffix)+ return fmt.Sprintf("%s@%s", name, ServiceAccountSuffix)}- return fmt.Sprintf("%s@%s.service.bytebase.com", name, projectID)+ return fmt.Sprintf("%s@%s.%s", name, projectID, ServiceAccountSuffix)}// BuildWorkloadIdentityEmail constructs a full email from name and optional project ID.func BuildWorkloadIdentityEmail(name, projectID string) string {if projectID == "" {- return fmt.Sprintf("%s%s", name, WorkloadIdentityEmailSuffix)+ return fmt.Sprintf("%s@%s", name, WorkloadIdentitySuffix)}- return fmt.Sprintf("%s@%s.workload.bytebase.com", name, projectID)+ return fmt.Sprintf("%s@%s.%s", name, projectID, WorkloadIdentitySuffix)}diff --git a/frontend/src/components/EmailInput.vue b/frontend/src/components/EmailInput.vueindex 178427436f..5bd50047f2 100644--- a/frontend/src/components/EmailInput.vue+++ b/frontend/src/components/EmailInput.vue@@ -1,10 +1,10 @@<template><div class="flex flex-col">- <NInputGroup v-if="enforceDomain && !readonly">+ <NInputGroup v-if="enforceDomain && !disabled"><NInputv-model:value="state.shortValue":size="size"- :disabled="readonly"+ :disabled="disabled":status="hasEmailError ? 'error' : undefined"/><NInputGroupLabel :size="size"> @ </NInputGroupLabel>@@ -12,14 +12,14 @@:size="size"v-model:value="state.domain":options="domainSelectOptions"- :disabled="readonly"+ :disabled="disabled"/></NInputGroup><NInputv-elsev-model:value="state.value":size="size"- :disabled="readonly"+ :disabled="disabled":status="hasEmailError ? 'error' : undefined"/><span v-if="hasEmailError" class="text-error text-sm mt-1">@@ -57,17 +57,14 @@ const props = withDefaults(defineProps<{size?: "small" | "medium" | "large";value?: string;- readonly?: boolean;- domainPrefix?: string;- fallbackDomain?: string;+ disabled?: boolean;+ domain?: string;showDomain?: boolean;}>(),{size: "medium",value: "",- readonly: false,- domainPrefix: "",- fallbackDomain: "",+ disabled: false,showDomain: false,});@@ -90,16 +87,19 @@ const enforceDomain = computed(() => {});const domainSelectOptions = computed(() => {+ if (props.domain) {+ return [+ {+ label: props.domain,+ value: props.domain,+ },+ ];+ }const domains = settingV1Store.workspaceProfile.domains.filter((domain) => domain && domain.trim() !== "");- if (domains.length === 0 && props.fallbackDomain) {- domains.push(props.fallbackDomain);- }return domains.map((domain) => {- const value = props.domainPrefix- ? `${props.domainPrefix}.${domain.trim()}`- : domain.trim();+ const value = domain.trim();return {label: value,value,diff --git a/frontend/src/components/IAMRemindModal.vue b/frontend/src/components/IAMRemindModal.vueindex cfce3f37da..a26496bf6c 100644--- a/frontend/src/components/IAMRemindModal.vue+++ b/frontend/src/components/IAMRemindModal.vue@@ -50,8 +50,8 @@ import {import type { Role } from "@/types/proto-es/v1/role_service_pb";import {autoProjectRoute,- bindingListInIAM,displayRoleTitle,+ filterBindingsByUserName,useDynamicLocalStorage,} from "@/utils";import { convertFromExpr } from "@/utils/issue/cel";@@ -95,9 +95,9 @@ const pendingExpireRoles = computed(expiration: dayjs.Dayjs;}[] => {const policy = projectIamPolicyStore.getProjectIamPolicy(props.projectName);- const bindings = bindingListInIAM({+ const bindings = filterBindingsByUserName({policy,- email: me.value.email,+ name: me.value.name,ignoreGroup: true,});diff --git a/frontend/src/components/Member/EditMemberRoleDrawer.vue b/frontend/src/components/Member/EditMemberRoleDrawer.vueindex 367b3e0caf..fe03424441 100644--- a/frontend/src/components/Member/EditMemberRoleDrawer.vue+++ b/frontend/src/components/Member/EditMemberRoleDrawer.vue@@ -16,10 +16,10 @@/><div v-else class="w-full flex flex-col gap-y-2"><div class="flex items-center gap-x-1">- {{ $t("common.email") }}+ {{ $t("common.members") }}<RequiredStar /></div>- <EmailInput :readonly="true" :value="email" />+ <NInput :disabled="true" :value="props.member?.binding" /></div><div class="w-full flex flex-col gap-y-2">@@ -68,21 +68,15 @@<script setup lang="ts">import { isEqual } from "lodash-es";-import { NButton, useDialog } from "naive-ui";+import { NButton, NInput, useDialog } from "naive-ui";import { computed, reactive, ref } from "vue";import { useI18n } from "vue-i18n";import { BBButtonConfirm } from "@/bbkit";-import EmailInput from "@/components/EmailInput.vue";import RequiredStar from "@/components/RequiredStar.vue";import { Drawer, DrawerContent } from "@/components/v2";import { RoleSelect } from "@/components/v2/Select";-import {- extractGroupEmail,- extractUserId,- pushNotification,- useWorkspaceV1Store,-} from "@/store";-import { ALL_USERS_USER_EMAIL, groupBindingPrefix } from "@/types";+import { pushNotification, useWorkspaceV1Store } from "@/store";+import { ALL_USERS_USER_EMAIL } from "@/types";import MembersBindingSelect from "./MembersBindingSelect.vue";import { type MemberBinding } from "./types";@@ -120,16 +114,6 @@ const dialog = useDialog();const isCreating = computed(() => !props.member);-const email = computed(() => {- if (!props.member) {- return "";- }- if (props.member.type === "users") {- return extractUserId(props.member.binding);- }- return extractGroupEmail(props.member.binding);-});-const allowConfirm = computed(() => {if (state.memberList.length === 0) {return false;@@ -163,11 +147,7 @@ const updateRoleBinding = async () => {});} else {for (const member of memberListInBinding.value) {- const isGroup = member.startsWith(groupBindingPrefix);- const existedRoles = workspaceStore.findRolesByMember({- member,- ignoreGroup: !isGroup,- });+ const existedRoles = workspaceStore.findRolesByMember(member);batchPatch.push({member,roles: [...new Set([...state.roles, ...existedRoles])],diff --git a/frontend/src/components/Member/MemberDataTableByRole.vue b/frontend/src/components/Member/MemberDataTableByRole.vueindex b52c274c31..7e4f1bc20e 100644--- a/frontend/src/components/Member/MemberDataTableByRole.vue+++ b/frontend/src/components/Member/MemberDataTableByRole.vue@@ -62,7 +62,7 @@ const columns = computed(() => {return [{key: "role-members",- title: `${t("common.role.self")} / ${t("common.members")}`,+ title: `${t("common.role.self")} / ${t("common.members", 2 /* multiply*/)}`,className: "flex items-center",render: (row: RoleRowData | BindingRowData) => {if (row.type === "role") {diff --git a/frontend/src/components/Member/MembersBindingSelect.vue b/frontend/src/components/Member/MembersBindingSelect.vueindex 85d7c0e4ee..90f9d85f64 100644--- a/frontend/src/components/Member/MembersBindingSelect.vue+++ b/frontend/src/components/Member/MembersBindingSelect.vue@@ -79,23 +79,33 @@ import { computed, ref } from "vue";import RequiredStar from "@/components/RequiredStar.vue";import { GroupSelect, UserSelect } from "@/components/v2";import {- ensureGroupIdentifier,extractGroupEmail,+ extractServiceAccountId,extractUserId,+ extractWorkloadIdentityId,+ groupNamePrefix,+ serviceAccountNamePrefix,+ workloadIdentityNamePrefix,} from "@/store";-import { groupNamePrefix } from "@/store/modules/v1/common";import {getGroupEmailInBinding,+ getServiceAccountNameInBinding,getUserEmailInBinding,+ getWorkloadIdentityNameInBinding,groupBindingPrefix,} from "@/types";+import { convertMemberToFullname } from "@/utils";type MemberType = "USERS" | "GROUPS";const props = withDefaults(defineProps<{- // member binding list, for users, should be user:{email}, for groups, should be group:{email}- // We don't support mixed data.+ // member binding list, could be+ // - user:{email}+ // - group:{email}+ // - serviceAccount:{email}+ // - workloadIdentity:{email}+ // We don't support mix group with other data.value: string[];required: boolean;projectName?: string;@@ -137,34 +147,29 @@ const onTypeChange = (type: MemberType) => {};const memberList = computed(() => {- const list = [];+ return props.value.map(convertMemberToFullname);+});- for (const binding of props.value) {- if (binding.startsWith(groupBindingPrefix)) {- list.push(ensureGroupIdentifier(binding));- } else {- // For users, extract email from binding format "user:{email}"- const email = extractUserId(binding);- if (email) {- list.push(email);- }- }+const convertNameToMember = (fullname: string) => {+ if (fullname.startsWith(groupNamePrefix)) {+ const email = extractGroupEmail(fullname);+ return getGroupEmailInBinding(email);+ } else if (fullname.startsWith(serviceAccountNamePrefix)) {+ const email = extractServiceAccountId(fullname);+ return getServiceAccountNameInBinding(email);+ } else if (fullname.startsWith(workloadIdentityNamePrefix)) {+ const email = extractWorkloadIdentityId(fullname);+ return getWorkloadIdentityNameInBinding(email);+ } else {+ const email = extractUserId(fullname);+ return getUserEmailInBinding(email);}+};- return list;-});--const onMemberListUpdate = (memberList: string[]) => {- const memberListInBinding = uniq(memberList)- .map((member) => {- if (member.startsWith(groupNamePrefix)) {- const email = extractGroupEmail(member);- return getGroupEmailInBinding(email);- }- // UserSelect now returns email directly- return getUserEmailInBinding(member);- })- .filter((binding) => binding);+const onMemberListUpdate = (fullnameList: string[]) => {+ const memberListInBinding = uniq(fullnameList)+ .map(convertNameToMember)+ .filter((member) => !!member);emit("update:value", memberListInBinding);};diff --git a/frontend/src/components/Member/utils.ts b/frontend/src/components/Member/utils.tsindex bf4e58c040..49671b36f1 100644--- a/frontend/src/components/Member/utils.ts+++ b/frontend/src/components/Member/utils.ts@@ -1,21 +1,36 @@import { create } from "@bufbuild/protobuf";import { orderBy } from "lodash-es";-import { extractGroupEmail, useGroupStore, useUserStore } from "@/store";import {+ extractGroupEmail,+ serviceAccountToUser,+ useGroupStore,+ useServiceAccountStore,+ useUserStore,+ useWorkloadIdentityStore,+ workloadIdentityToUser,+} from "@/store";+import {+ extractServiceAccountId,extractUserId,+ extractWorkloadIdentityId,groupNamePrefix,- userNamePrefix,+ serviceAccountNamePrefix,+ workloadIdentityNamePrefix,} from "@/store/modules/v1/common";import {getGroupEmailInBinding,- getUserEmailInBinding,groupBindingPrefix,unknownUser,} from "@/types";import { State } from "@/types/proto-es/v1/common_pb";import { GroupSchema } from "@/types/proto-es/v1/group_service_pb";import type { IamPolicy } from "@/types/proto-es/v1/iam_policy_pb";-import { UserSchema, UserType } from "@/types/proto-es/v1/user_service_pb";+import {+ type User,+ UserSchema,+ UserType,+} from "@/types/proto-es/v1/user_service_pb";+import { convertMemberToFullname } from "@/utils";import type { GroupBinding, MemberBinding } from "./types";const getMemberBinding = (@@ -24,6 +39,8 @@ const getMemberBinding = (): MemberBinding | undefined => {const groupStore = useGroupStore();const userStore = useUserStore();+ const serviceAccountStore = useServiceAccountStore();+ const workloadIdentityStore = useWorkloadIdentityStore();let memberBinding: MemberBinding | undefined = undefined;if (member.startsWith(groupBindingPrefix)) {@@ -55,22 +72,55 @@ const getMemberBinding = (projectRoleBindings: [],};} else {- let user = userStore.getUserByIdentifier(member) ?? unknownUser(member);- if (!user) {- const email = extractUserId(member);- user = create(UserSchema, {- title: email,- name: `${userNamePrefix}${email}`,- email: email,- userType: UserType.USER,- state: State.DELETED,- });+ let user: User | undefined = unknownUser(member);+ const fullname = convertMemberToFullname(member);+ if (fullname.startsWith(serviceAccountNamePrefix)) {+ const sa = serviceAccountStore.getServiceAccount(fullname);+ if (sa) {+ user = serviceAccountToUser(sa);+ } else {+ const email = extractServiceAccountId(fullname);+ user = create(UserSchema, {+ title: email,+ name: fullname,+ email: email,+ userType: UserType.SERVICE_ACCOUNT,+ state: State.DELETED,+ });+ }+ } else if (fullname.startsWith(workloadIdentityNamePrefix)) {+ const wi = workloadIdentityStore.getWorkloadIdentity(fullname);+ if (wi) {+ user = workloadIdentityToUser(wi);+ } else {+ const email = extractWorkloadIdentityId(fullname);+ user = create(UserSchema, {+ title: email,+ name: fullname,+ email: email,+ userType: UserType.WORKLOAD_IDENTITY,+ state: State.DELETED,+ });+ }+ } else {+ user = userStore.getUserByIdentifier(member);+ if (!user) {+ const email = extractUserId(member);+ user = create(UserSchema, {+ title: email,+ name: fullname,+ email: email,+ userType: UserType.USER,+ state: State.DELETED,+ });+ }}+memberBinding = {type: "users",title: user.title,user: user,- binding: getUserEmailInBinding(user.email),+ binding: member,workspaceLevelRoles: new Set<string>(),projectRoleBindings: [],};diff --git a/frontend/src/components/Project/useProjectSidebar.ts b/frontend/src/components/Project/useProjectSidebar.tsindex 6c4ce32dc3..063282ec86 100644--- a/frontend/src/components/Project/useProjectSidebar.ts+++ b/frontend/src/components/Project/useProjectSidebar.ts@@ -121,7 +121,7 @@ export const useProjectSidebar = (project: MaybeRef<Project>) => {expand: true,children: [{- title: t("common.members"),+ title: t("common.members", 2 /* multiply*/),path: PROJECT_V1_ROUTE_MEMBERS,type: "div",},diff --git a/frontend/src/components/RolloutV1/components/taskPermissions.ts b/frontend/src/components/RolloutV1/components/taskPermissions.tsindex f46fcd1183..89648407e4 100644--- a/frontend/src/components/RolloutV1/components/taskPermissions.ts+++ b/frontend/src/components/RolloutV1/components/taskPermissions.ts@@ -5,7 +5,7 @@ import {usePolicyV1Store,useProjectIamPolicyStore,} from "@/store";-import { roleNamePrefix, userNamePrefix } from "@/store/modules/v1/common";+import { roleNamePrefix } from "@/store/modules/v1/common";import { isValidDatabaseName } from "@/types";import type { Issue } from "@/types/proto-es/v1/issue_service_pb";import { Issue_Type } from "@/types/proto-es/v1/issue_service_pb";@@ -35,8 +35,7 @@ export const canRolloutTasks = (tasks: Task[], issue?: Issue): boolean => {// Special check for data export issues: only the creator can run tasksif (issue && issue.type === Issue_Type.DATABASE_EXPORT) {- const formattedCurrentUser = `${userNamePrefix}${currentUser.value.email}`;- return issue.creator === formattedCurrentUser;+ return issue.creator === currentUser.value.name;}const { project } = useCurrentProjectV1();@@ -53,7 +52,6 @@ export const canRolloutTasks = (tasks: Task[], issue?: Issue): boolean => {const projectIamPolicyStore = useProjectIamPolicyStore();const databaseStore = useDatabaseV1Store();const policyStore = usePolicyV1Store();- const formatedCurrentUser = `${userNamePrefix}${currentUser.value.email}`;return tasks.every((task) => {// Get database from task target@@ -89,7 +87,7 @@ export const canRolloutTasks = (tasks: Task[], issue?: Issue): boolean => {project.value.name);const memberRoles = memberMapToRolesInProjectIAM(projectIamPolicy);- const userRoles = memberRoles.get(formatedCurrentUser);+ const userRoles = memberRoles.get(currentUser.value.name);if (userRoles?.has(requiredRole)) {return true;}diff --git a/frontend/src/components/SensitiveData/GrantAccessForm.vue b/frontend/src/components/SensitiveData/GrantAccessForm.vueindex 638047f162..360b2195e0 100644--- a/frontend/src/components/SensitiveData/GrantAccessForm.vue+++ b/frontend/src/components/SensitiveData/GrantAccessForm.vue@@ -51,6 +51,7 @@:required="true":include-all-users="false":include-service-account="false"+ :include-workload-identity="false"/></div></template>diff --git a/frontend/src/components/User/Settings/CreateGroupDrawer.vue b/frontend/src/components/User/Settings/CreateGroupDrawer.vueindex 7dd5f117ae..c579bacf5f 100644--- a/frontend/src/components/User/Settings/CreateGroupDrawer.vue+++ b/frontend/src/components/User/Settings/CreateGroupDrawer.vue@@ -22,7 +22,7 @@</div><EmailInputv-model:value="state.group.email"- :readonly="!isCreating"+ :disabled="!isCreating":show-domain="true"/></div>@@ -58,7 +58,7 @@class="w-full flex items-center gap-x-3"><UserSelect- :value="extractUserId(member.member)"+ :value="member.member":multiple="false":size="'medium'":include-all="false"@@ -152,11 +152,7 @@ import EmailInput from "@/components/EmailInput.vue";import RequiredStar from "@/components/RequiredStar.vue";import { Drawer, DrawerContent, UserSelect } from "@/components/v2";import { pushNotification, useCurrentUserV1, useGroupStore } from "@/store";-import {- extractUserId,- groupNamePrefix,- userNamePrefix,-} from "@/store/modules/v1/common";+import { extractUserId, groupNamePrefix } from "@/store/modules/v1/common";import type { Group, GroupMember } from "@/types/proto-es/v1/group_service_pb";import {GroupMember_Role,@@ -202,7 +198,7 @@ const state = reactive<LocalState>({props.group?.members ?? [create(GroupMemberSchema, {role: GroupMember_Role.OWNER,- member: `${userNamePrefix}${currentUserV1.value.email}`,+ member: currentUserV1.value.name,}),]),@@ -213,9 +209,7 @@ const userFilter = (user: User, member: string) => {if (extractUserId(member) === user.email) {return true;}- return !state.group.members.find(- (member) => member.member === `${userNamePrefix}${user.email}`- );+ return !state.group.members.find((member) => member.member === user.name);};const isCreating = computed(() => !props.group);@@ -296,13 +290,13 @@ const addMember = () => {state.group.members.push(member);};-const updateMemberEmail = (index: number, email: string | undefined) => {- if (!email) {+const updateMemberEmail = (index: number, fullname: string | undefined) => {+ if (!fullname) {return;}state.group.members[index] = {...state.group.members[index],- member: `${userNamePrefix}${email}`,+ member: fullname,};};diff --git a/frontend/src/components/User/Settings/CreateUserDrawer.vue b/frontend/src/components/User/Settings/CreateUserDrawer.vueindex c7c48d2a72..12a398e26d 100644--- a/frontend/src/components/User/Settings/CreateUserDrawer.vue+++ b/frontend/src/components/User/Settings/CreateUserDrawer.vue@@ -2,7 +2,11 @@<Drawer @close="$emit('close')"><DrawerContentclass="w-[40rem] max-w-[100vw]"- :title="$t('settings.members.add-user')"+ :title="+ isEditMode+ ? $t('settings.members.update-user')+ : $t('settings.members.add-user')+ "><template #default><div class="flex flex-col gap-y-6">@@ -16,7 +20,10 @@<heroicons-outline:question-mark-circle class="w-4 h-4" /></a></div>- <NRadioGroup v-model:value="state.user.userType">+ <NRadioGroup+ v-model:value="state.user.userType"+ :disabled="isEditMode"+ ><NRadio :value="UserType.USER" :label="$t('common.user')" /><NRadio:value="UserType.SERVICE_ACCOUNT"@@ -50,16 +57,12 @@{{ $t("common.email") }}<RequiredStar class="ml-0.5" /></label>- <div class="flex items-center">- <NInput- v-model:value="state.wif.emailPrefix"- :input-props="{ type: 'text', autocomplete: 'off' }"- placeholder="github-deploy"- :maxlength="100"- class="flex-1"- />- <span class="ml-1 text-gray-500">@workload.bytebase.com</span>- </div>+ <EmailInput+ v-model:value="state.user.email"+ domain="workload.bytebase.com"+ :show-domain="true"+ :disabled="isEditMode"+ /></div><!-- Platform -->@@ -78,7 +81,12 @@<!-- Owner / Group --><div class="flex flex-col gap-y-2"><label class="block text-sm font-medium leading-5 text-control">- <template v-if="state.wif.providerType === WorkloadIdentityConfig_ProviderType.GITLAB">+ <template+ v-if="+ state.wif.providerType ===+ WorkloadIdentityConfig_ProviderType.GITLAB+ "+ >{{ $t("settings.members.workload-identity-group") }}</template><template v-else>@@ -89,7 +97,12 @@<NInputv-model:value="state.wif.owner":input-props="{ type: 'text', autocomplete: 'off' }"- :placeholder="state.wif.providerType === WorkloadIdentityConfig_ProviderType.GITLAB ? 'my-group' : 'my-org'"+ :placeholder="+ state.wif.providerType ===+ WorkloadIdentityConfig_ProviderType.GITLAB+ ? 'my-group'+ : 'my-org'+ ":maxlength="200"/></div>@@ -97,7 +110,12 @@<!-- Repository / Project --><div class="flex flex-col gap-y-2"><label class="block text-sm font-medium leading-5 text-control">- <template v-if="state.wif.providerType === WorkloadIdentityConfig_ProviderType.GITLAB">+ <template+ v-if="+ state.wif.providerType ===+ WorkloadIdentityConfig_ProviderType.GITLAB+ "+ >{{ $t("settings.members.workload-identity-project") }}</template><template v-else>@@ -107,12 +125,24 @@<NInputv-model:value="state.wif.repo":input-props="{ type: 'text', autocomplete: 'off' }"- :placeholder="state.wif.providerType === WorkloadIdentityConfig_ProviderType.GITLAB ? 'my-project' : 'my-repo'"+ :placeholder="+ state.wif.providerType ===+ WorkloadIdentityConfig_ProviderType.GITLAB+ ? 'my-project'+ : 'my-repo'+ ":maxlength="200"/><span class="text-xs text-gray-500">- <template v-if="state.wif.providerType === WorkloadIdentityConfig_ProviderType.GITLAB">- {{ $t("settings.members.workload-identity-project-hint") }}+ <template+ v-if="+ state.wif.providerType ===+ WorkloadIdentityConfig_ProviderType.GITLAB+ "+ >+ {{+ $t("settings.members.workload-identity-project-hint")+ }}</template><template v-else>{{ $t("settings.members.workload-identity-repo-hint") }}@@ -122,11 +152,18 @@<!-- Allowed Branches/Tags (GitLab only) --><div- v-if="state.wif.providerType === WorkloadIdentityConfig_ProviderType.GITLAB"+ v-if="+ state.wif.providerType ===+ WorkloadIdentityConfig_ProviderType.GITLAB+ "class="flex flex-col gap-y-2"><label class="block text-sm font-medium leading-5 text-control">- {{ $t("settings.members.workload-identity-allowed-branches-tags") }}+ {{+ $t(+ "settings.members.workload-identity-allowed-branches-tags"+ )+ }}</label><NSelectv-model:value="state.wif.refType"@@ -136,11 +173,21 @@<!-- Branch (GitHub) or Branch/Tag (GitLab when specific is selected) --><div- v-if="state.wif.providerType === WorkloadIdentityConfig_ProviderType.GITHUB || state.wif.refType !== 'all'"+ v-if="+ state.wif.providerType ===+ WorkloadIdentityConfig_ProviderType.GITHUB ||+ state.wif.refType !== 'all'+ "class="flex flex-col gap-y-2"><label class="block text-sm font-medium leading-5 text-control">- <template v-if="state.wif.providerType === WorkloadIdentityConfig_ProviderType.GITLAB && state.wif.refType === 'tag'">+ <template+ v-if="+ state.wif.providerType ===+ WorkloadIdentityConfig_ProviderType.GITLAB &&+ state.wif.refType === 'tag'+ "+ >{{ $t("settings.members.workload-identity-tag") }}</template><template v-else>@@ -154,7 +201,13 @@:maxlength="200"/><span class="text-xs text-gray-500">- <template v-if="state.wif.providerType === WorkloadIdentityConfig_ProviderType.GITLAB && state.wif.refType === 'tag'">+ <template+ v-if="+ state.wif.providerType ===+ WorkloadIdentityConfig_ProviderType.GITLAB &&+ state.wif.refType === 'tag'+ "+ >{{ $t("settings.members.workload-identity-tag-hint") }}</template><template v-else>@@ -171,8 +224,15 @@<labelclass="block text-sm font-medium leading-5 text-control">- <template v-if="state.wif.providerType === WorkloadIdentityConfig_ProviderType.GITLAB">- {{ $t("settings.members.workload-identity-gitlab-url") }}+ <template+ v-if="+ state.wif.providerType ===+ WorkloadIdentityConfig_ProviderType.GITLAB+ "+ >+ {{+ $t("settings.members.workload-identity-gitlab-url")+ }}</template><template v-else>{{ $t("settings.members.workload-identity-issuer") }}@@ -184,10 +244,17 @@:maxlength="500"/><span- v-if="state.wif.providerType === WorkloadIdentityConfig_ProviderType.GITLAB"+ v-if="+ state.wif.providerType ===+ WorkloadIdentityConfig_ProviderType.GITLAB+ "class="text-xs text-gray-500">- {{ $t("settings.members.workload-identity-gitlab-url-hint") }}+ {{+ $t(+ "settings.members.workload-identity-gitlab-url-hint"+ )+ }}</span></div>@@ -221,7 +288,10 @@</div></NCollapseTransition>- <NButton text @click="state.wif.showAdvanced = !state.wif.showAdvanced">+ <NButton+ text+ @click="state.wif.showAdvanced = !state.wif.showAdvanced"+ >{{ $t("settings.members.workload-identity-advanced") }}<template #icon><heroicons-outline:chevron-down@@ -254,17 +324,13 @@</label><EmailInputv-model:value="state.user.email"- :domain-prefix="- state.user.userType === UserType.SERVICE_ACCOUNT- ? 'service'- : ''- "- :fallback-domain="+ :domain="state.user.userType === UserType.SERVICE_ACCOUNT- ? 'bytebase.com'- : ''+ ? 'service.bytebase.com'+ : ''":show-domain="state.user.userType === UserType.SERVICE_ACCOUNT"+ :disabled="isEditMode"/></div></template>@@ -316,9 +382,11 @@type="primary":disabled="!allowConfirm":loading="state.isRequesting"- @click="tryCreateOrUpdateUser"+ @click="createOrUpdateUser">- {{ $t("common.confirm") }}+ {{+ isEditMode ? $t("common.update") : $t("common.confirm")+ }}</NButton></div></template>@@ -328,6 +396,8 @@<script lang="ts" setup>import { create } from "@bufbuild/protobuf";+import { FieldMaskSchema } from "@bufbuild/protobuf/wkt";+import { isEqual } from "lodash-es";import {NButton,NCollapseTransition,@@ -343,15 +413,26 @@ import RequiredStar from "@/components/RequiredStar.vue";import { Drawer, DrawerContent } from "@/components/v2";import { RoleSelect } from "@/components/v2/Select";import {+ getUserFullNameByType,pushNotification,+ serviceAccountToUser,+ useServiceAccountStore,useSettingV1Store,useUserStore,+ useWorkloadIdentityStore,useWorkspaceV1Store,+ workloadIdentityToUser,} from "@/store";-import { unknownUser } from "@/types";+import {+ getServiceAccountNameInBinding,+ getUserEmailInBinding,+ getWorkloadIdentityNameInBinding,+ unknownUser,+} from "@/types";import { PresetRoleType } from "@/types/iam";import type { User } from "@/types/proto-es/v1/user_service_pb";import {+ UpdateUserRequestSchema,UserSchema,UserType,WorkloadIdentityConfig_ProviderType,@@ -380,15 +461,22 @@ interface LocalState {wif: WifState;}+const props = defineProps<{+ user?: User;+}>();+const emit = defineEmits<{(event: "close"): void;(event: "created", user: User): void;+ (event: "updated", user: User): void;}>();const workspaceStore = useWorkspaceV1Store();const { t } = useI18n();const userStore = useUserStore();+const serviceAccountStore = useServiceAccountStore();+const workloadIdentityStore = useWorkloadIdentityStore();const userPasswordRef = ref<InstanceType<typeof UserPassword>>();const state = reactive<LocalState>({@@ -410,6 +498,121 @@ const state = reactive<LocalState>({},});+const isEditMode = computed(() => !!props.user);++const initialRoles = computed(() => {+ if (!props.user) {+ return [PresetRoleType.WORKSPACE_MEMBER];+ }++ const roles = workspaceStore.userMapToRoles.get(+ getUserFullNameByType(props.user)+ );+ return roles ? [...roles] : [];+});++// Parse subject pattern and extract owner/repo/branch/refType+const parseSubjectPattern = (pattern: string) => {+ const { providerType } = state.wif;++ if (providerType === WorkloadIdentityConfig_ProviderType.GITHUB) {+ // GitHub patterns:+ // repo:owner/*+ // repo:owner/repo:*+ // repo:owner/repo:ref:refs/heads/branch+ const match = pattern.match(/^repo:([^/]+)\/(.*)$/);+ if (match) {+ const owner = match[1];+ const rest = match[2];+ if (rest === "*") {+ return { owner, repo: "", branch: "" };+ }+ const repoMatch = rest.match(/^([^:]+):(.*)$/);+ if (repoMatch) {+ const repo = repoMatch[1];+ const refPart = repoMatch[2];+ if (refPart === "*") {+ return { owner, repo, branch: "" };+ }+ const branchMatch = refPart.match(/^ref:refs\/heads\/(.+)$/);+ if (branchMatch) {+ return { owner, repo, branch: branchMatch[1] };+ }+ }+ }+ }++ if (providerType === WorkloadIdentityConfig_ProviderType.GITLAB) {+ // GitLab patterns:+ // project_path:group/*+ // project_path:group/project:*+ // project_path:group/project:ref_type:branch:ref:main+ // project_path:group/project:ref_type:tag:ref:v1.0.0+ const match = pattern.match(/^project_path:([^/]+)\/(.*)$/);+ if (match) {+ const owner = match[1];+ const rest = match[2];+ if (rest === "*") {+ return { owner, repo: "", branch: "", refType: "all" as const };+ }+ const projectMatch = rest.match(/^([^:]+):(.*)$/);+ if (projectMatch) {+ const repo = projectMatch[1];+ const refPart = projectMatch[2];+ if (refPart === "*") {+ return { owner, repo, branch: "", refType: "all" as const };+ }+ const refTypeMatch = refPart.match(/^ref_type:(branch|tag):ref:(.+)$/);+ if (refTypeMatch) {+ return {+ owner,+ repo,+ branch: refTypeMatch[2],+ refType: refTypeMatch[1] as "branch" | "tag",+ };+ }+ }+ }+ }++ return null;+};++watch(+ () => props.user,+ (user) => {+ if (!user) {+ return;+ }+ state.user = create(UserSchema, user);+ state.roles = [...initialRoles.value];++ if (user.userType === UserType.WORKLOAD_IDENTITY) {+ const config = user.workloadIdentityConfig;+ if (config) {+ state.wif.emailPrefix = user.email.split("@")[0];+ state.wif.providerType = config.providerType;+ state.wif.issuerUrl = config.issuerUrl;+ state.wif.audience = config.allowedAudiences[0] || "";+ state.wif.subjectPattern = config.subjectPattern;++ const parsed = parseSubjectPattern(config.subjectPattern);+ if (parsed) {+ state.wif.owner = parsed.owner;+ state.wif.repo = parsed.repo;+ state.wif.branch = parsed.branch;+ if ("refType" in parsed && parsed.refType) {+ state.wif.refType = parsed.refType;+ }+ }+ }+ }+ },+ {+ immediate: true,+ }+);+const platformOptions = [{label: "GitHub Actions",@@ -494,73 +697,6 @@ const computedSubjectPattern = computed(() => {return "";});-// Parse subject pattern and extract owner/repo/branch/refType-const parseSubjectPattern = (pattern: string) => {- const { providerType } = state.wif;-- if (providerType === WorkloadIdentityConfig_ProviderType.GITHUB) {- // GitHub patterns:- // repo:owner/*- // repo:owner/repo:*- // repo:owner/repo:ref:refs/heads/branch- const match = pattern.match(/^repo:([^/]+)\/(.*)$/);- if (match) {- const owner = match[1];- const rest = match[2];- if (rest === "*") {- return { owner, repo: "", branch: "" };- }- const repoMatch = rest.match(/^([^:]+):(.*)$/);- if (repoMatch) {- const repo = repoMatch[1];- const refPart = repoMatch[2];- if (refPart === "*") {- return { owner, repo, branch: "" };- }- const branchMatch = refPart.match(/^ref:refs\/heads\/(.+)$/);- if (branchMatch) {- return { owner, repo, branch: branchMatch[1] };- }- }- }- }-- if (providerType === WorkloadIdentityConfig_ProviderType.GITLAB) {- // GitLab patterns:- // project_path:group/*- // project_path:group/project:*- // project_path:group/project:ref_type:branch:ref:main- // project_path:group/project:ref_type:tag:ref:v1.0.0- const match = pattern.match(/^project_path:([^/]+)\/(.*)$/);- if (match) {- const owner = match[1];- const rest = match[2];- if (rest === "*") {- return { owner, repo: "", branch: "", refType: "all" as const };- }- const projectMatch = rest.match(/^([^:]+):(.*)$/);- if (projectMatch) {- const repo = projectMatch[1];- const refPart = projectMatch[2];- if (refPart === "*") {- return { owner, repo, branch: "", refType: "all" as const };- }- const refTypeMatch = refPart.match(/^ref_type:(branch|tag):ref:(.+)$/);- if (refTypeMatch) {- return {- owner,- repo,- branch: refTypeMatch[2],- refType: refTypeMatch[1] as "branch" | "tag",- };- }- }- }- }-- return null;-};-// Flag to prevent circular updateslet isUpdatingFromPattern = false;let isUpdatingFromFields = false;@@ -642,61 +778,174 @@ const extractUserTitle = (email: string): string => {return email;};-const getMemberPrefix = (_userType: UserType): string => {- return "user:";-};--const tryCreateOrUpdateUser = async () => {+const createOrUpdateUser = async () => {state.isRequesting = true;try {- let createdUser: User;-- if (state.user.userType === UserType.WORKLOAD_IDENTITY) {- const email = `${state.wif.emailPrefix}@workload.bytebase.com`;- createdUser = await userStore.createUser(- create(UserSchema, {- name: "",- email,+ if (isEditMode.value) {+ await updateUser();+ } else {+ await createUser();+ }+ } catch {+ // nothing+ } finally {+ state.isRequesting = false;+ }+};++const convertUserToMember = (user: User) => {+ switch (user.userType) {+ case UserType.SERVICE_ACCOUNT:+ return getServiceAccountNameInBinding(user.email);+ case UserType.WORKLOAD_IDENTITY:+ return getWorkloadIdentityNameInBinding(user.email);+ default:+ return getUserEmailInBinding(user.email);+ }+};++const createUser = async () => {+ let createdUser: User;++ switch (state.user.userType) {+ case UserType.WORKLOAD_IDENTITY: {+ const wi = await workloadIdentityStore.createWorkloadIdentity(+ state.wif.emailPrefix,+ {title: state.user.title || state.wif.emailPrefix,- userType: UserType.WORKLOAD_IDENTITY,- password: "",- phone: "",- mfaEnabled: false,workloadIdentityConfig: create(WorkloadIdentityConfigSchema, {providerType: state.wif.providerType,issuerUrl: state.wif.issuerUrl,allowedAudiences: state.wif.audience ? [state.wif.audience] : [],subjectPattern: state.wif.subjectPattern,}),- })+ });- } else {+ createdUser = workloadIdentityToUser(wi);+ break;+ }+ case UserType.SERVICE_ACCOUNT: {+ const serviceAccountId = state.user.email.split("@")[0];+ const sa = await serviceAccountStore.createServiceAccount(+ serviceAccountId,+ {+ title: state.user.title,+ }+ );+ createdUser = serviceAccountToUser(sa);+ break;+ }+ default: {createdUser = await userStore.createUser({...state.user,title: state.user.title || extractUserTitle(state.user.email),password: state.user.password,});}+ }++ if (state.roles.length > 0) {+ await workspaceStore.patchIamPolicy([+ {+ member: convertUserToMember(createdUser),+ roles: state.roles,+ },+ ]);+ }+ emit("created", createdUser);+ pushNotification({+ module: "bytebase",+ style: "SUCCESS",+ title: t("common.created"),+ });+ emit("close");+};++const updateUser = async () => {+ const user = props.user;+ if (!user) {+ return;+ }- if (state.roles.length > 0) {- await workspaceStore.patchIamPolicy([+ const updateMask: string[] = [];+ const payload = create(UserSchema, state.user);+ if (payload.title !== user.title) {+ updateMask.push("title");+ }++ let updatedUser: User = user;++ switch (payload.userType) {+ case UserType.WORKLOAD_IDENTITY: {+ const wi = await workloadIdentityStore.updateWorkloadIdentity({- member: `${getMemberPrefix(state.user.userType)}${createdUser.email}`,- roles: state.roles,+ name: payload.name,+ title: payload.title,+ workloadIdentityConfig: create(WorkloadIdentityConfigSchema, {+ providerType: state.wif.providerType,+ issuerUrl: state.wif.issuerUrl,+ allowedAudiences: state.wif.audience ? [state.wif.audience] : [],+ subjectPattern: state.wif.subjectPattern,+ }),},- ]);+ create(FieldMaskSchema, {+ paths: [...updateMask, "workload_identity_config"],+ })+ );+ updatedUser = workloadIdentityToUser(wi);+ break;}- emit("created", createdUser);- pushNotification({- module: "bytebase",- style: "SUCCESS",- title: t("common.created"),- });- emit("close");- } catch {- // nothing- } finally {- state.isRequesting = false;+ case UserType.SERVICE_ACCOUNT: {+ if (updateMask.length > 0) {+ const se = await serviceAccountStore.updateServiceAccount(+ {+ name: payload.name,+ title: payload.title,+ },+ create(FieldMaskSchema, {+ paths: [...updateMask],+ })+ );+ updatedUser = serviceAccountToUser(se);+ }+ break;+ }+ default: {+ if (payload.phone !== user.phone) {+ updateMask.push("phone");+ }+ if (payload.password) {+ updateMask.push("password");+ }++ if (updateMask.length > 0) {+ updatedUser = await userStore.updateUser(+ create(UpdateUserRequestSchema, {+ user: payload,+ updateMask: create(FieldMaskSchema, {+ paths: updateMask,+ }),+ })+ );+ }+ }+ }++ if (!isEqual([...initialRoles.value].sort(), [...state.roles].sort())) {+ await workspaceStore.patchIamPolicy([+ {+ member: convertUserToMember(updatedUser),+ roles: state.roles,+ },+ ]);}++ emit("updated", updatedUser);+ pushNotification({+ module: "bytebase",+ style: "SUCCESS",+ title: t("common.updated"),+ });+ emit("close");};</script>diff --git a/frontend/src/components/User/Settings/UserDataTable/cells/GroupsCell.vue b/frontend/src/components/User/Settings/UserDataTable/cells/GroupsCell.vueindex 1a8ced399a..afbf0ce075 100644--- a/frontend/src/components/User/Settings/UserDataTable/cells/GroupsCell.vue+++ b/frontend/src/components/User/Settings/UserDataTable/cells/GroupsCell.vue@@ -4,7 +4,7 @@v-for="group in groups":key="group.name"class="cursor-pointer! hover:bg-gray-200"- @click="$emit('select-group', group)"+ @click="$emit('group-selected', group)">{{ group.title }}</NTag>@@ -24,7 +24,7 @@ const props = defineProps<{}>();defineEmits<{- (event: "select-group", group: Group): void;+ (event: "group-selected", group: Group): void;}>();const groupStore = useGroupStore();diff --git a/frontend/src/components/User/Settings/UserDataTable/cells/UserOperationsCell.vue b/frontend/src/components/User/Settings/UserDataTable/cells/UserOperationsCell.vueindex 0059a34a7c..476ccdfabb 100644--- a/frontend/src/components/User/Settings/UserDataTable/cells/UserOperationsCell.vue+++ b/frontend/src/components/User/Settings/UserDataTable/cells/UserOperationsCell.vue@@ -23,9 +23,10 @@<MiniActionButtonv-if="allowUpdateUser"- @click="(e) => $emit('click-user', user, e)"+ @click="(e) => $emit('user-selected', user, e)">- <PencilIcon />+ <PencilIcon v-if="user.userType === UserType.WORKLOAD_IDENTITY || user.userType === UserType.SERVICE_ACCOUNT" />+ <EyeIcon v-else /></MiniActionButton><NPopconfirm@@ -49,12 +50,21 @@</template><script lang="ts" setup>-import { PencilIcon, Trash2Icon, Undo2Icon } from "lucide-vue-next";+import { EyeIcon, PencilIcon, Trash2Icon, Undo2Icon } from "lucide-vue-next";import { NPopconfirm } from "naive-ui";import { computed } from "vue";import { useI18n } from "vue-i18n";import { MiniActionButton } from "@/components/v2";-import { pushNotification, useCurrentUserV1, useUserStore } from "@/store";+import {+ getUserFullNameByType,+ pushNotification,+ serviceAccountToUser,+ useCurrentUserV1,+ useServiceAccountStore,+ useUserStore,+ useWorkloadIdentityStore,+ workloadIdentityToUser,+} from "@/store";import { State } from "@/types/proto-es/v1/common_pb";import { type User, UserType } from "@/types/proto-es/v1/user_service_pb";import { hasWorkspacePermissionV2 } from "@/utils";@@ -64,11 +74,13 @@ const props = defineProps<{}>();const emit = defineEmits<{- (event: "click-user", user: User, e: MouseEvent): void;- (event: "update-user", user: User): void;+ (event: "user-selected", user: User, e: MouseEvent): void;+ (event: "user-updated", user: User): void;}>();const userStore = useUserStore();+const serviceAccountStore = useServiceAccountStore();+const workloadIdentityStore = useWorkloadIdentityStore();const { t } = useI18n();const me = useCurrentUserV1();@@ -101,14 +113,52 @@ const allowReactiveUser = computed(() => {return allowUndelete.value && props.user.state === State.DELETED;});+const archiveUser = async (user: User): Promise<User> => {+ const fullname = getUserFullNameByType(user);+ switch (user.userType) {+ case UserType.SERVICE_ACCOUNT: {+ await serviceAccountStore.deleteServiceAccount(fullname);+ break;+ }+ case UserType.WORKLOAD_IDENTITY: {+ await workloadIdentityStore.deleteWorkloadIdentity(fullname);+ break;+ }+ default: {+ await userStore.archiveUser(fullname);+ }+ }+ return {+ ...user,+ state: State.DELETED,+ };+};++const restoreUser = async (user: User): Promise<User> => {+ const fullname = getUserFullNameByType(user);+ switch (user.userType) {+ case UserType.SERVICE_ACCOUNT: {+ const sa = await serviceAccountStore.undeleteServiceAccount(fullname);+ return serviceAccountToUser(sa);+ }+ case UserType.WORKLOAD_IDENTITY: {+ const wi = await workloadIdentityStore.undeleteWorkloadIdentity(fullname);+ return workloadIdentityToUser(wi);+ }+ default: {+ return await userStore.restoreUser(fullname);+ }+ }+};+const changeRowStatus = async (state: State) => {let user = props.user;if (state === State.ACTIVE) {- user = await userStore.restoreUser(props.user);+ user = await restoreUser(props.user);} else {- user = await userStore.archiveUser(props.user);+ user = await archiveUser(props.user);}- emit("update-user", user);+ emit("user-updated", user);pushNotification({module: "bytebase",style: "INFO",diff --git a/frontend/src/components/User/Settings/UserDataTable/index.vue b/frontend/src/components/User/Settings/UserDataTable/index.vueindex db2d9e497a..3b3e9bd1b8 100644--- a/frontend/src/components/User/Settings/UserDataTable/index.vue+++ b/frontend/src/components/User/Settings/UserDataTable/index.vue@@ -31,16 +31,15 @@ import { useI18n } from "vue-i18n";import { BBAlert } from "@/bbkit";import { UserNameCell } from "@/components/v2/Model/cells";import {+ getUserFullNameByType,pushNotification,+ serviceAccountToUser,useGroupStore,- useUserStore,+ useServiceAccountStore,useWorkspaceV1Store,} from "@/store";import type { Group } from "@/types/proto-es/v1/group_service_pb";-import {- UpdateUserRequestSchema,- type User,-} from "@/types/proto-es/v1/user_service_pb";+import { type User } from "@/types/proto-es/v1/user_service_pb";import GroupsCell from "./cells/GroupsCell.vue";import UserOperationsCell from "./cells/UserOperationsCell.vue";import UserRolesCell from "./cells/UserRolesCell.vue";@@ -61,14 +60,15 @@ const props = defineProps<{}>();const emit = defineEmits<{- (event: "update-user", user: User): void;- (event: "select-group", group: Group): void;+ (event: "user-updated", user: User): void;+ (event: "user-selected", user: User): void;+ (event: "group-selected", group: Group): void;}>();const { t } = useI18n();-const userStore = useUserStore();const workspaceStore = useWorkspaceV1Store();const groupStore = useGroupStore();+const serviceAccountStore = useServiceAccountStore();const { copy: copyTextToClipboard, isSupported } = useClipboard({legacy: true,@@ -107,7 +107,11 @@ const columns = computed(() => {hide: !props.showRoles,render: (user: User) => {return h(UserRolesCell, {- roles: [...workspaceStore.getWorkspaceRolesByEmail(user.email)],+ roles: [+ ...workspaceStore.getWorkspaceRolesByName(+ getUserFullNameByType(user)+ ),+ ],});},},@@ -118,7 +122,7 @@ const columns = computed(() => {render: (user: User) => {return h(GroupsCell, {user,- "onSelect-group": (group) => emit("select-group", group),+ "onGroup-selected": (group) => emit("group-selected", group),});},},@@ -129,9 +133,8 @@ const columns = computed(() => {render: (user: User) => {return h(UserOperationsCell, {user,- "onUpdate-user": (user: User) => {- emit("update-user", user);- },+ "onUser-updated": (user: User) => emit("user-updated", user),+ "onUser-selected": (user: User) => emit("user-selected", user),});},},@@ -151,19 +154,19 @@ const resetServiceKey = () => {if (!user) {return;}- userStore- .updateUser(- create(UpdateUserRequestSchema, {- user,- updateMask: create(FieldMaskSchema, {- paths: ["service_key"],- }),- regenerateRecoveryCodes: false,- regenerateTempMfaSecret: false,++ serviceAccountStore+ .updateServiceAccount(+ {+ name: user.name,+ },+ create(FieldMaskSchema, {+ paths: ["service_key"],}))- .then((updatedUser) => {- emit("update-user", updatedUser);+ .then((sa) => {+ const updatedUser = serviceAccountToUser(sa);+ emit("user-updated", updatedUser);if (updatedUser.serviceKey && isSupported.value) {copyTextToClipboard(updatedUser.serviceKey).then(() => {pushNotification({diff --git a/frontend/src/components/User/Settings/UserDataTableByGroup/cells/GroupOperationsCell.vue b/frontend/src/components/User/Settings/UserDataTableByGroup/cells/GroupOperationsCell.vueindex 3ad245407c..8455780cb9 100644--- a/frontend/src/components/User/Settings/UserDataTableByGroup/cells/GroupOperationsCell.vue+++ b/frontend/src/components/User/Settings/UserDataTableByGroup/cells/GroupOperationsCell.vue@@ -1,12 +1,12 @@<template><div class="flex justify-end gap-x-2">- <RemoveGroupButton v-if="allowDeleteGroup" :group="group" @removed="$emit('remove-group')">+ <RemoveGroupButton v-if="allowDeleteGroup" :group="group" @removed="$emit('group-removed')"><Trash2Icon class="w-4 h-auto" /></RemoveGroupButton><MiniActionButtonv-if="allowEditGroup"- @click="$emit('update-group')"+ @click="$emit('group-selected')"><PencilIcon /></MiniActionButton>@@ -29,8 +29,8 @@ const props = defineProps<{}>();defineEmits<{- (event: "update-group"): void;- (event: "remove-group"): void;+ (event: "group-selected"): void;+ (event: "group-removed"): void;}>();const currentUser = useCurrentUserV1();diff --git a/frontend/src/components/User/Settings/UserDataTableByGroup/index.vue b/frontend/src/components/User/Settings/UserDataTableByGroup/index.vueindex 73dea29b0d..98766b56a1 100644--- a/frontend/src/components/User/Settings/UserDataTableByGroup/index.vue+++ b/frontend/src/components/User/Settings/UserDataTableByGroup/index.vue@@ -60,8 +60,8 @@ const props = withDefaults();const emit = defineEmits<{- (event: "update-group", group: Group): void;- (event: "remove-group", group: Group): void;+ (event: "group-selected", group: Group): void;+ (event: "group-removed", group: Group): void;(event: "update:expanded-keys", keys: string[]): void;}>();@@ -129,11 +129,11 @@ const columns = computed(() => {if (row.type === "group") {return h(GroupOperationsCell, {group: row.group,- "onUpdate-group": () => {- emit("update-group", row.group);+ "onGroup-selected": () => {+ emit("group-selected", row.group);},- "onRemove-group": () => {- emit("remove-group", row.group);+ "onGroup-removed": () => {+ emit("group-removed", row.group);},});} else {diff --git a/frontend/src/components/v2/Select/UserSelect.vue b/frontend/src/components/v2/Select/UserSelect.vueindex 1906731944..08d62a9d69 100644--- a/frontend/src/components/v2/Select/UserSelect.vue+++ b/frontend/src/components/v2/Select/UserSelect.vue@@ -21,7 +21,12 @@ import { computedAsync } from "@vueuse/core";import { computed } from "vue";import { HighlightLabelText } from "@/components/v2";import { UserNameCell } from "@/components/v2/Model/cells";-import { type UserFilter, userNamePrefix, useUserStore } from "@/store";+import {+ getUserFullNameByType,+ type UserFilter,+ userNamePrefix,+ useUserStore,+} from "@/store";import { allUsersUser } from "@/types";import { type User, UserType } from "@/types/proto-es/v1/user_service_pb";import { hasWorkspacePermissionV2 } from "@/utils";@@ -39,7 +44,7 @@ const props = defineProps<{multiple?: boolean;disabled?: boolean;size?: SelectSize;- value?: string | string[] | undefined; // email or emails+ value?: string | string[] | undefined; // user fullnameprojectName?: string;// allUsers is a special user that represents all users in the project.includeAllUsers?: boolean;@@ -50,6 +55,7 @@ const props = defineProps<{}>();defineEmits<{+ // the value is user fullname(event: "update:value", value: string[] | string | undefined): void;}>();@@ -82,7 +88,7 @@ const getFilter = (search: string): UserFilter => {const getOption = (user: User): ResourceSelectOption<User> => ({resource: user,- value: user.email,+ value: getUserFullNameByType(user),label: user.title,});diff --git a/frontend/src/locales/en-US.json b/frontend/src/locales/en-US.jsonindex f6319dab2b..094406a6df 100644--- a/frontend/src/locales/en-US.json+++ b/frontend/src/locales/en-US.json@@ -198,7 +198,7 @@"configure": "Configure","groups": "Groups","database-group": "Database Group | Database Groups",- "members": "Members",+ "members": "Member | Members","warehouse": "Warehouse","schedule": "Schedule","state": "State",@@ -513,6 +513,7 @@"view-by-roles": "View by roles","add-member": "Add member","add-user": "Add user",+ "update-user": "Update User","entra-sync": {"self": "Sync from SCIM","description": "Sync users and groups from Entra ID (formerly Azure AD) or Okta to your Bytebase instance.",diff --git a/frontend/src/locales/es-ES.json b/frontend/src/locales/es-ES.jsonindex b215275c39..cb1bff6c45 100644--- a/frontend/src/locales/es-ES.json+++ b/frontend/src/locales/es-ES.json@@ -198,7 +198,7 @@"configure": "Configurar","groups": "Grupos","database-group": "Grupo de bases de datos | Grupos de bases de datos",- "members": "Miembros",+ "members": "Miembro | Miembros","warehouse": "Almacén","schedule": "Horario","state": "Estado",@@ -513,6 +513,7 @@"view-by-roles": "Ver por roles","add-member": "Agregar miembro","add-user": "Agregar usuario",+ "update-user": "Actualizar usuario","entra-sync": {"self": "Sincronización desde SCIM","description": "Sincronice usuarios y grupos de Entra ID (anteriormente Azure AD) u Okta con su instancia de Bytebase.",diff --git a/frontend/src/locales/ja-JP.json b/frontend/src/locales/ja-JP.jsonindex 8038cb4e9d..e312ac8882 100644--- a/frontend/src/locales/ja-JP.json+++ b/frontend/src/locales/ja-JP.json@@ -198,7 +198,7 @@"configure": "設定","groups": "グループ","database-group": "データベースグループ | データベースグループ",- "members": "メンバー",+ "members": "メンバー | メンバー","warehouse": "倉庫","schedule": "プラン","state": "州",@@ -513,6 +513,7 @@"view-by-roles": "役割ごとに表示","add-member": "メンバーを追加","add-user": "ユーザーを追加",+ "update-user": "ユーザーを更新","entra-sync": {"self": "SCIM から同期","description": "Entra ID (旧 Azure AD) または Okta のユーザーとグループを Bytebase インスタンスに同期します。",diff --git a/frontend/src/locales/vi-VN.json b/frontend/src/locales/vi-VN.jsonindex d0cf1c2c31..e0b66c065d 100644--- a/frontend/src/locales/vi-VN.json+++ b/frontend/src/locales/vi-VN.json@@ -198,7 +198,7 @@"configure": "Cấu hình","groups": "Nhóm","database-group": "Nhóm cơ sở dữ liệu | Nhóm cơ sở dữ liệu",- "members": "Thành viên",+ "members": "Thành viên | Thành viên","warehouse": "Kho","schedule": "Lịch trình","state": "Trạng thái",@@ -513,6 +513,7 @@"view-by-roles": "Xem theo vai trò","add-member": "Thêm thành viên","add-user": "Thêm người dùng",+ "update-user": "Cập nhật người dùng","entra-sync": {"self": "Đồng bộ từ SCIM","description": "Đồng bộ người dùng và nhóm từ Entra ID (trước đây là Azure AD) hoặc Okta sang phiên bản Bytebase của bạn.",diff --git a/frontend/src/locales/zh-CN.json b/frontend/src/locales/zh-CN.jsonindex 08e31f82bf..c99ba2bbfb 100644--- a/frontend/src/locales/zh-CN.json+++ b/frontend/src/locales/zh-CN.json@@ -198,7 +198,7 @@"configure": "配置","groups": "分组","database-group": "数据库分组",- "members": "成员",+ "members": "成员 | 成员","warehouse": "仓库","schedule": "计划","state": "状态",@@ -513,6 +513,7 @@"view-by-roles": "按角色查看","add-member": "添加成员","add-user": "添加用户",+ "update-user": "更新用户","entra-sync": {"self": "从 SCIM 同步","description": "将 Entra ID(前 Azure AD)或 Okta 中的用户和组同步到您的 Bytebase 实例。",diff --git a/frontend/src/router/dashboard/projectV1.ts b/frontend/src/router/dashboard/projectV1.tsindex 4bbe2491b2..f2de59ef8e 100644--- a/frontend/src/router/dashboard/projectV1.ts+++ b/frontend/src/router/dashboard/projectV1.ts@@ -323,7 +323,7 @@ const projectV1Routes: RouteRecordRaw[] = [path: "members",name: PROJECT_V1_ROUTE_MEMBERS,meta: {- title: () => t("common.members"),+ title: () => t("common.members", 2 /* multiply*/),requiredPermissionList: () => ["bb.projects.getIamPolicy"],},component: () => import("@/views/project/ProjectMemberDashboard.vue"),diff --git a/frontend/src/store/modules/index.ts b/frontend/src/store/modules/index.tsindex fe1c3863bb..588d1875f0 100644--- a/frontend/src/store/modules/index.ts+++ b/frontend/src/store/modules/index.ts@@ -7,6 +7,8 @@ export * from "./uistate";export * from "./sqlReview";export * from "./idp";export * from "./user";+export * from "./serviceAccount";+export * from "./workloadIdentity";export * from "./workspaceApprovalSetting";export * from "./role";export * from "./dbGroup";diff --git a/frontend/src/store/modules/serviceAccount.ts b/frontend/src/store/modules/serviceAccount.tsnew file mode 100644index 0000000000..fd138d5249--- /dev/null+++ b/frontend/src/store/modules/serviceAccount.ts@@ -0,0 +1,143 @@+import { create } from "@bufbuild/protobuf";+import { createContextValues } from "@connectrpc/connect";+import { defineStore } from "pinia";+import { ref } from "vue";+import { serviceAccountServiceClientConnect } from "@/connect";+import { silentContextKey } from "@/connect/context-key";+import { State } from "@/types/proto-es/v1/common_pb";+import type { ServiceAccount } from "@/types/proto-es/v1/service_account_service_pb";+import {+ CreateServiceAccountRequestSchema,+ DeleteServiceAccountRequestSchema,+ GetServiceAccountRequestSchema,+ ListServiceAccountsRequestSchema,+ ServiceAccountSchema,+ UndeleteServiceAccountRequestSchema,+ UpdateServiceAccountRequestSchema,+} from "@/types/proto-es/v1/service_account_service_pb";+import {+ type User,+ UserSchema,+ UserType,+} from "@/types/proto-es/v1/user_service_pb";+import { useActuatorV1Store } from "./v1/actuator";++export const useServiceAccountStore = defineStore("serviceAccount", () => {+ const actuatorStore = useActuatorV1Store();+ const cacheByName = ref<Map<string, ServiceAccount>>(new Map());++ const listServiceAccounts = async (+ pageSize: number,+ pageToken: string | undefined,+ showDeleted: boolean+ ) => {+ const request = create(ListServiceAccountsRequestSchema, {+ pageSize,+ pageToken,+ showDeleted,+ });+ return serviceAccountServiceClientConnect.listServiceAccounts(request);+ };++ const fetchServiceAccount = async (name: string, silent = false) => {+ const request = create(GetServiceAccountRequestSchema, {+ name,+ });+ return serviceAccountServiceClientConnect.getServiceAccount(request, {+ contextValues: createContextValues().set(silentContextKey, silent),+ });+ };++ const getServiceAccount = (name: string) => {+ return cacheByName.value.get(name);+ };++ const getOrFetchServiceAccount = async (name: string, silent = false) => {+ const cached = getServiceAccount(name);+ if (cached) {+ return cached;+ }+ const sa = await fetchServiceAccount(name, silent);+ cacheByName.value.set(name, sa);+ return sa;+ };++ const createServiceAccount = async (+ serviceAccountId: string,+ serviceAccount: Partial<ServiceAccount>+ ) => {+ const request = create(CreateServiceAccountRequestSchema, {+ serviceAccountId,+ serviceAccount: create(+ ServiceAccountSchema,+ serviceAccount as ServiceAccount+ ),+ });+ const sa =+ await serviceAccountServiceClientConnect.createServiceAccount(request);+ cacheByName.value.set(sa.name, sa);+ await actuatorStore.fetchServerInfo();+ return sa;+ };++ const updateServiceAccount = async (+ serviceAccount: Partial<ServiceAccount>,+ updateMask: { paths: string[] }+ ) => {+ const request = create(UpdateServiceAccountRequestSchema, {+ serviceAccount: create(+ ServiceAccountSchema,+ serviceAccount as ServiceAccount+ ),+ updateMask,+ });+ const sa =+ await serviceAccountServiceClientConnect.updateServiceAccount(request);+ cacheByName.value.set(sa.name, sa);+ return sa;+ };++ const deleteServiceAccount = async (name: string) => {+ const request = create(DeleteServiceAccountRequestSchema, {+ name,+ });+ await serviceAccountServiceClientConnect.deleteServiceAccount(request);+ const sa = cacheByName.value.get(name);+ if (sa) {+ sa.state = State.DELETED;+ }+ await actuatorStore.fetchServerInfo();+ };++ const undeleteServiceAccount = async (name: string) => {+ const request = create(UndeleteServiceAccountRequestSchema, {+ name,+ });+ const sa =+ await serviceAccountServiceClientConnect.undeleteServiceAccount(request);+ cacheByName.value.set(sa.name, sa);+ await actuatorStore.fetchServerInfo();+ return sa;+ };++ return {+ listServiceAccounts,+ getServiceAccount,+ getOrFetchServiceAccount,+ createServiceAccount,+ updateServiceAccount,+ deleteServiceAccount,+ undeleteServiceAccount,+ };+});++export const serviceAccountToUser = (sa: ServiceAccount): User => {+ return create(UserSchema, {+ name: `users/${sa.email}`,+ email: sa.email,+ title: sa.title,+ state: sa.state,+ userType: UserType.SERVICE_ACCOUNT,+ serviceKey: sa.serviceKey,+ });+};diff --git a/frontend/src/store/modules/user.ts b/frontend/src/store/modules/user.tsindex fe0194ff2a..c97bb468bf 100644--- a/frontend/src/store/modules/user.ts+++ b/frontend/src/store/modules/user.ts@@ -4,11 +4,7 @@ import { computedAsync } from "@vueuse/core";import { isEqual, isUndefined, uniq } from "lodash-es";import { defineStore } from "pinia";import { computed, ref } from "vue";-import {- serviceAccountServiceClientConnect,- userServiceClientConnect,- workloadIdentityServiceClientConnect,-} from "@/connect";+import { userServiceClientConnect } from "@/connect";import { silentContextKey } from "@/connect/context-key";import {allUsersUser,@@ -19,16 +15,6 @@ import {userBindingPrefix,} from "@/types";import { State } from "@/types/proto-es/v1/common_pb";-import type { ServiceAccount } from "@/types/proto-es/v1/service_account_service_pb";-import {- CreateServiceAccountRequestSchema,- DeleteServiceAccountRequestSchema,- GetServiceAccountRequestSchema,- ListServiceAccountsRequestSchema,- ServiceAccountSchema,- UndeleteServiceAccountRequestSchema,- UpdateServiceAccountRequestSchema,-} from "@/types/proto-es/v1/service_account_service_pb";import type {UpdateUserRequest,User,@@ -41,23 +27,22 @@ import {ListUsersRequestSchema,UndeleteUserRequestSchema,UpdateUserRequestSchema,- UserSchema,UserType,} from "@/types/proto-es/v1/user_service_pb";-import type { WorkloadIdentity } from "@/types/proto-es/v1/workload_identity_service_pb";-import {- CreateWorkloadIdentityRequestSchema,- DeleteWorkloadIdentityRequestSchema,- GetWorkloadIdentityRequestSchema,- ListWorkloadIdentitiesRequestSchema,- UndeleteWorkloadIdentityRequestSchema,- UpdateWorkloadIdentityRequestSchema,- WorkloadIdentitySchema,-} from "@/types/proto-es/v1/workload_identity_service_pb";import { ensureUserFullName, hasWorkspacePermissionV2 } from "@/utils";+import { serviceAccountToUser, useServiceAccountStore } from "./serviceAccount";import { useActuatorV1Store } from "./v1/actuator";-import { extractUserId, userNamePrefix } from "./v1/common";+import {+ extractUserId,+ serviceAccountNamePrefix,+ userNamePrefix,+ workloadIdentityNamePrefix,+} from "./v1/common";import { usePermissionStore } from "./v1/permission";+import {+ useWorkloadIdentityStore,+ workloadIdentityToUser,+} from "./workloadIdentity";export interface UserFilter {query?: string;@@ -87,37 +72,10 @@ const getListUserFilter = (params: UserFilter) => {return filter.join(" && ");};-const serviceAccountToUser = (sa: ServiceAccount): User => {- return create(UserSchema, {- name: `users/${sa.email}`,- email: sa.email,- title: sa.title,- state: sa.state,- userType: UserType.SERVICE_ACCOUNT,- serviceKey: sa.serviceKey,- });-};--const workloadIdentityToUser = (wi: WorkloadIdentity): User => {- return create(UserSchema, {- name: `users/${wi.email}`,- email: wi.email,- title: wi.title,- state: wi.state,- userType: UserType.WORKLOAD_IDENTITY,- workloadIdentityConfig: wi.workloadIdentityConfig,- });-};--const extractEmailPrefix = (email: string, suffix: string): string => {- if (email.endsWith(suffix)) {- return email.slice(0, -suffix.length);- }- return email.split("@")[0];-};-export const useUserStore = defineStore("user", () => {const actuatorStore = useActuatorV1Store();+ const serviceAccountStore = useServiceAccountStore();+ const workloadIdentityStore = useWorkloadIdentityStore();const allUser = computed(() => allUsersUser());const userRequestCache = new Map<string, Promise<User>>();@@ -192,13 +150,11 @@ export const useUserStore = defineStore("user", () => {if (needsServiceAccountService) {const saPromise = (async () => {- const request = create(ListServiceAccountsRequestSchema, {- pageSize: params.pageSize,- pageToken: params.pageToken,- showDeleted,- });- const response =- await serviceAccountServiceClientConnect.listServiceAccounts(request);+ const response = await serviceAccountStore.listServiceAccounts(+ params.pageSize,+ params.pageToken,+ showDeleted+ );for (const sa of response.serviceAccounts) {const user = serviceAccountToUser(sa);setUser(user);@@ -210,15 +166,11 @@ export const useUserStore = defineStore("user", () => {if (needsWorkloadIdentityService) {const wiPromise = (async () => {- const request = create(ListWorkloadIdentitiesRequestSchema, {- pageSize: params.pageSize,- pageToken: params.pageToken,- showDeleted,- });- const response =- await workloadIdentityServiceClientConnect.listWorkloadIdentities(- request- );+ const response = await workloadIdentityStore.listWorkloadIdentities(+ params.pageSize,+ params.pageToken,+ showDeleted+ );for (const wi of response.workloadIdentities) {const user = workloadIdentityToUser(wi);setUser(user);@@ -243,13 +195,10 @@ export const useUserStore = defineStore("user", () => {email.endsWith("@service.bytebase.com") ||email.includes(".service.bytebase.com")) {- const request = create(GetServiceAccountRequestSchema, {- name: `serviceAccounts/${email}`,- });- const response =- await serviceAccountServiceClientConnect.getServiceAccount(request, {- contextValues: createContextValues().set(silentContextKey, silent),- });+ const response = await serviceAccountStore.getOrFetchServiceAccount(+ `${serviceAccountNamePrefix}${email}`,+ silent+ );return setUser(serviceAccountToUser(response));}@@ -257,16 +206,10 @@ export const useUserStore = defineStore("user", () => {email.endsWith("@workload.bytebase.com") ||email.includes(".workload.bytebase.com")) {- const request = create(GetWorkloadIdentityRequestSchema, {- name: `workloadIdentities/${email}`,- });- const response =- await workloadIdentityServiceClientConnect.getWorkloadIdentity(- request,- {- contextValues: createContextValues().set(silentContextKey, silent),- }- );+ const response = await workloadIdentityStore.getOrFetchWorkloadIdentity(+ `${workloadIdentityNamePrefix}${email}`,+ silent+ );return setUser(workloadIdentityToUser(response));}@@ -280,46 +223,10 @@ export const useUserStore = defineStore("user", () => {};const createUser = async (user: User) => {- let response: User;-- if (user.userType === UserType.SERVICE_ACCOUNT) {- const serviceAccountId = extractEmailPrefix(- user.email,- "@service.bytebase.com"- );- const request = create(CreateServiceAccountRequestSchema, {- serviceAccountId,- serviceAccount: create(ServiceAccountSchema, {- title: user.title,- }),- });- const sa =- await serviceAccountServiceClientConnect.createServiceAccount(request);- response = serviceAccountToUser(sa);- } else if (user.userType === UserType.WORKLOAD_IDENTITY) {- const workloadIdentityId = extractEmailPrefix(- user.email,- "@workload.bytebase.com"- );- const request = create(CreateWorkloadIdentityRequestSchema, {- workloadIdentityId,- workloadIdentity: create(WorkloadIdentitySchema, {- title: user.title,- workloadIdentityConfig: user.workloadIdentityConfig,- }),- });- const wi =- await workloadIdentityServiceClientConnect.createWorkloadIdentity(- request- );- response = workloadIdentityToUser(wi);- } else {- const request = create(CreateUserRequestSchema, {- user: user,- });- response = await userServiceClientConnect.createUser(request);- }-+ const request = create(CreateUserRequestSchema, {+ user: user,+ });+ const response = await userServiceClientConnect.createUser(request);await actuatorStore.fetchServerInfo();return setUser(response);};@@ -331,49 +238,14 @@ export const useUserStore = defineStore("user", () => {throw new Error(`user with name ${name} not found`);}- let response: User;- const updateMaskPaths = updateUserRequest.updateMask?.paths ?? [];-- if (- originData.userType === UserType.SERVICE_ACCOUNT &&- updateMaskPaths.includes("service_key")- ) {- const request = create(UpdateServiceAccountRequestSchema, {- serviceAccount: create(ServiceAccountSchema, {- name: `serviceAccounts/${originData.email}`,- title: updateUserRequest.user?.title ?? originData.title,- }),- updateMask: updateUserRequest.updateMask,- });- const sa =- await serviceAccountServiceClientConnect.updateServiceAccount(request);- response = serviceAccountToUser(sa);- } else if (originData.userType === UserType.WORKLOAD_IDENTITY) {- const request = create(UpdateWorkloadIdentityRequestSchema, {- workloadIdentity: create(WorkloadIdentitySchema, {- name: `workloadIdentities/${originData.email}`,- title: updateUserRequest.user?.title ?? originData.title,- workloadIdentityConfig:- updateUserRequest.user?.workloadIdentityConfig ??- originData.workloadIdentityConfig,- }),- updateMask: updateUserRequest.updateMask,- });- const wi =- await workloadIdentityServiceClientConnect.updateWorkloadIdentity(- request- );- response = workloadIdentityToUser(wi);- } else {- const request = create(UpdateUserRequestSchema, {- user: updateUserRequest.user,- updateMask: updateUserRequest.updateMask,- otpCode: updateUserRequest.otpCode,- regenerateTempMfaSecret: updateUserRequest.regenerateTempMfaSecret,- regenerateRecoveryCodes: updateUserRequest.regenerateRecoveryCodes,- });- response = await userServiceClientConnect.updateUser(request);- }+ const request = create(UpdateUserRequestSchema, {+ user: updateUserRequest.user,+ updateMask: updateUserRequest.updateMask,+ otpCode: updateUserRequest.otpCode,+ regenerateTempMfaSecret: updateUserRequest.regenerateTempMfaSecret,+ regenerateRecoveryCodes: updateUserRequest.regenerateRecoveryCodes,+ });+ const response = await userServiceClientConnect.updateUser(request);return setUser(response);};@@ -390,59 +262,24 @@ export const useUserStore = defineStore("user", () => {return setUser(response);};- const archiveUser = async (user: User) => {- if (user.userType === UserType.SERVICE_ACCOUNT) {- const request = create(DeleteServiceAccountRequestSchema, {- name: `serviceAccounts/${user.email}`,- });- await serviceAccountServiceClientConnect.deleteServiceAccount(request);- } else if (user.userType === UserType.WORKLOAD_IDENTITY) {- const request = create(DeleteWorkloadIdentityRequestSchema, {- name: `workloadIdentities/${user.email}`,- });- await workloadIdentityServiceClientConnect.deleteWorkloadIdentity(- request- );- } else {- const request = create(DeleteUserRequestSchema, {- name: user.name,- });- await userServiceClientConnect.deleteUser(request);- }-- user.state = State.DELETED;+ const archiveUser = async (name: string) => {+ const request = create(DeleteUserRequestSchema, {+ name,+ });+ await userServiceClientConnect.deleteUser(request);await actuatorStore.fetchServerInfo();- return user;- };-- const restoreUser = async (user: User) => {- let response: User;- if (user.userType === UserType.SERVICE_ACCOUNT) {- const request = create(UndeleteServiceAccountRequestSchema, {- name: `serviceAccounts/${user.email}`,- });- const sa =- await serviceAccountServiceClientConnect.undeleteServiceAccount(- request- );- response = serviceAccountToUser(sa);- } else if (user.userType === UserType.WORKLOAD_IDENTITY) {- const request = create(UndeleteWorkloadIdentityRequestSchema, {- name: `workloadIdentities/${user.email}`,- });- const wi =- await workloadIdentityServiceClientConnect.undeleteWorkloadIdentity(- request- );- response = workloadIdentityToUser(wi);- } else {- const request = create(UndeleteUserRequestSchema, {- name: user.name,- });- response = await userServiceClientConnect.undeleteUser(request);+ const user = userMapByName.value.get(name);+ if (user) {+ user.state = State.DELETED;}+ };+ const restoreUser = async (name: string) => {+ const request = create(UndeleteUserRequestSchema, {+ name,+ });+ const response = await userServiceClientConnect.undeleteUser(request);await actuatorStore.fetchServerInfo();return setUser(response);};@@ -510,19 +347,10 @@ export const useUserStore = defineStore("user", () => {for (const email of serviceAccountEmails) {const saPromise = (async () => {try {- const request = create(GetServiceAccountRequestSchema, {- name: `serviceAccounts/${email}`,- });- const response =- await serviceAccountServiceClientConnect.getServiceAccount(- request,- {- contextValues: createContextValues().set(- silentContextKey,- true- ),- }- );+ const response = await serviceAccountStore.getOrFetchServiceAccount(+ `${serviceAccountNamePrefix}${email}`,+ true+ );setUser(serviceAccountToUser(response));} catch {// Ignore errors for individual fetches@@ -534,18 +362,10 @@ export const useUserStore = defineStore("user", () => {for (const email of workloadIdentityEmails) {const wiPromise = (async () => {try {- const request = create(GetWorkloadIdentityRequestSchema, {- name: `workloadIdentities/${email}`,- });const response =- await workloadIdentityServiceClientConnect.getWorkloadIdentity(- request,- {- contextValues: createContextValues().set(- silentContextKey,- true- ),- }+ await workloadIdentityStore.getOrFetchWorkloadIdentity(+ `${workloadIdentityNamePrefix}${email}`,+ true);setUser(workloadIdentityToUser(response));} catch {diff --git a/frontend/src/store/modules/v1/common.ts b/frontend/src/store/modules/v1/common.tsindex a733d57b81..a9f8222b75 100644--- a/frontend/src/store/modules/v1/common.ts+++ b/frontend/src/store/modules/v1/common.ts@@ -1,5 +1,6 @@import { UNKNOWN_ID } from "@/types/const";import type { ResourceId } from "@/types/id";+import { type User, UserType } from "@/types/proto-es/v1/user_service_pb";export const workspaceNamePrefix = "workspaces/";export const userNamePrefix = "users/";@@ -26,6 +27,19 @@ export const taskNamePrefix = "tasks/";export const taskRunNamePrefix = "taskRuns/";export const releaseNamePrefix = "releases/";export const revisionNamePrefix = "revisions/";+export const serviceAccountNamePrefix = "serviceAccounts/";+export const workloadIdentityNamePrefix = "workloadIdentities/";++export const getUserFullNameByType = (user: User): string => {+ switch (user.userType) {+ case UserType.SERVICE_ACCOUNT:+ return `${serviceAccountNamePrefix}${user.email}`;+ case UserType.WORKLOAD_IDENTITY:+ return `${workloadIdentityNamePrefix}${user.email}`;+ default:+ return `${userNamePrefix}${user.email}`;+ }+};export const getNameParentTokens = (name: string,@@ -168,6 +182,20 @@ export const extractUserId = (identifier: string) => {return matches?.[1] ?? identifier;};+export const extractServiceAccountId = (identifier: string) => {+ const matches = identifier.match(+ /^(?:serviceAccount:|serviceAccounts\/)(.+)$/+ );+ return matches?.[1] ?? identifier;+};++export const extractWorkloadIdentityId = (identifier: string) => {+ const matches = identifier.match(+ /^(?:workloadIdentity:|workloadIdentities\/)(.+)$/+ );+ return matches?.[1] ?? identifier;+};+export const getIdentityProviderResourceId = (name: string): ResourceId => {const tokens = getNameParentTokens(name, [idpNamePrefix]);return tokens[0];diff --git a/frontend/src/store/modules/v1/permission.ts b/frontend/src/store/modules/v1/permission.tsindex 3834285172..88a8e0259e 100644--- a/frontend/src/store/modules/v1/permission.ts+++ b/frontend/src/store/modules/v1/permission.ts@@ -4,7 +4,7 @@ import { computed, shallowReactive } from "vue";import { type Permission, PRESET_WORKSPACE_ROLES } from "@/types";import type { Project } from "@/types/proto-es/v1/project_service_pb";import { type User } from "@/types/proto-es/v1/user_service_pb";-import { bindingListInIAM } from "@/utils";+import { filterBindingsByUserName } from "@/utils";import { useRoleStore } from "../role";import { useCurrentUserV1 } from "./auth";import { useProjectIamPolicyStore } from "./projectIamPolicy";@@ -20,8 +20,10 @@ export const usePermissionStore = defineStore("permission", () => {const workspaceStore = useWorkspaceV1Store();const projectIamPolicyStore = useProjectIamPolicyStore();+ // currentRolesInWorkspace returns role for the current user in the workspace level+ // it also includes the role for the user groupconst currentRolesInWorkspace = computed(() => {- return workspaceStore.getWorkspaceRolesByEmail(currentUser.value.email);+ return workspaceStore.getWorkspaceRolesByName(currentUser.value.name);});const currentPermissions = computed(() => {@@ -44,9 +46,9 @@ export const usePermissionStore = defineStore("permission", () => {].filter((role) => !PRESET_WORKSPACE_ROLES.includes(role));const iamPolicy = projectIamPolicyStore.getProjectIamPolicy(project.name);- const projectBindings = bindingListInIAM({+ const projectBindings = filterBindingsByUserName({policy: iamPolicy,- email: currentUser.value.email,+ name: currentUser.value.name,ignoreGroup: false,});diff --git a/frontend/src/store/modules/v1/projectIamPolicy.ts b/frontend/src/store/modules/v1/projectIamPolicy.tsindex 517b167994..3ea3a35e8d 100644--- a/frontend/src/store/modules/v1/projectIamPolicy.ts+++ b/frontend/src/store/modules/v1/projectIamPolicy.ts@@ -20,11 +20,12 @@ import {} from "@/types/proto-es/v1/iam_policy_pb";import type { Project } from "@/types/proto-es/v1/project_service_pb";import type { User } from "@/types/proto-es/v1/user_service_pb";-import { getDatabaseProject, getUserEmailListInBinding } from "@/utils";+import { getDatabaseProject, getUserListInBinding } from "@/utils";import { convertFromExpr } from "@/utils/issue/cel";import { useRoleStore } from "../role";import { useUserStore } from "../user";import { useCurrentUserV1 } from "./auth";+import { getUserFullNameByType, userNamePrefix } from "./common";import { useGroupStore } from "./group";import { usePermissionStore } from "./permission";@@ -146,13 +147,13 @@ const checkProjectIAMPolicyWithExpr = (// Check if the user has the permission.for (const binding of policy.bindings) {// If the user is not in the binding, then skip.- const userEmailList = getUserEmailListInBinding({+ const nameList = getUserListInBinding({binding,ignoreGroup: false,});if (- !userEmailList.includes(user.email) &&- !userEmailList.includes(ALL_USERS_USER_EMAIL)+ !nameList.includes(getUserFullNameByType(user)) &&+ !nameList.includes(`${userNamePrefix}${ALL_USERS_USER_EMAIL}`)) {continue;}diff --git a/frontend/src/store/modules/v1/workspace.ts b/frontend/src/store/modules/v1/workspace.tsindex 0b24bb3f71..1236ec2f87 100644--- a/frontend/src/store/modules/v1/workspace.ts+++ b/frontend/src/store/modules/v1/workspace.ts@@ -4,7 +4,7 @@ import { defineStore } from "pinia";import { computed, ref } from "vue";import { workspaceServiceClientConnect } from "@/connect";import { userNamePrefix } from "@/store/modules/v1/common";-import { ALL_USERS_USER_EMAIL, groupBindingPrefix } from "@/types";+import { ALL_USERS_USER_EMAIL } from "@/types";import type { IamPolicy } from "@/types/proto-es/v1/iam_policy_pb";import {BindingSchema,@@ -12,9 +12,7 @@ import {IamPolicySchema,SetIamPolicyRequestSchema,} from "@/types/proto-es/v1/iam_policy_pb";-import { bindingListInIAM, getUserEmailListInBinding } from "@/utils";-import { extractUserId } from "./common";-import { extractGroupEmail } from "./group";+import { getUserListInBinding, isBindingPolicyExpired } from "@/utils";import { composePolicyBindings } from "./projectIamPolicy";export const useWorkspaceV1Store = defineStore("workspace_v1", () => {@@ -24,38 +22,43 @@ export const useWorkspaceV1Store = defineStore("workspace_v1", () => {return _workspaceIamPolicy.value;});- // roleMapToUsers returns Map<roles/{role}, Set<users/{email}>>- // the user could includes users/ALL_USERS_USER_EMAIL+ // roleMapToUsers returns Map<roles/{role}, Set<userfullname>>+ // the user fullname can be+ // - users/{email}, includes users/ALL_USERS_USER_EMAIL+ // - serviceAccounts/{email}+ // - workloadIdentities/{email}const roleMapToUsers = computed(() => {const map = new Map<string, Set<string>>();for (const binding of _workspaceIamPolicy.value.bindings) {if (!map.has(binding.role)) {map.set(binding.role, new Set());}- for (const email of getUserEmailListInBinding({+ for (const fullname of getUserListInBinding({binding,ignoreGroup: false,})) {- map.get(binding.role)?.add(`${userNamePrefix}${email}`);+ map.get(binding.role)?.add(fullname);}}return map;});- // userMapToRoles returns Map<users/{email}, Set<roles/{role}>>- // the user could includes users/ALL_USERS_USER_EMAIL+ // userMapToRoles returns Map<userfullname, Set<roles/{role}>>+ // the user fullname can be+ // - users/{email}, includes users/ALL_USERS_USER_EMAIL+ // - serviceAccounts/{email}+ // - workloadIdentities/{email}const userMapToRoles = computed(() => {const map = new Map<string, Set<string>>();for (const binding of _workspaceIamPolicy.value.bindings) {- for (const email of getUserEmailListInBinding({+ for (const fullname of getUserListInBinding({binding,ignoreGroup: false,})) {- const key = `${userNamePrefix}${email}`;- if (!map.has(key)) {- map.set(key, new Set());+ if (!map.has(fullname)) {+ map.set(fullname, new Set());}- map.get(key)?.add(binding.role);+ map.get(fullname)?.add(binding.role);}}return map;@@ -136,30 +139,21 @@ export const useWorkspaceV1Store = defineStore("workspace_v1", () => {_workspaceIamPolicy.value = policy;};- const findRolesByMember = ({- member,- ignoreGroup,- }: {- member: string;- ignoreGroup: boolean;- }): string[] => {- let email = member;- if (member.startsWith(groupBindingPrefix)) {- email = extractGroupEmail(member);- } else {- email = extractUserId(member);+ const findRolesByMember = (member: string): string[] => {+ const roles = new Set<string>();+ for (const binding of _workspaceIamPolicy.value.bindings) {+ if (isBindingPolicyExpired(binding)) {+ continue;+ }+ if (binding.members.includes(member)) {+ roles.add(binding.role);+ }}- return bindingListInIAM({- policy: _workspaceIamPolicy.value,- email,- ignoreGroup,- }).map((binding) => binding.role);+ return [...roles];};- const getWorkspaceRolesByEmail = (email: string) => {- const specificRoles =- userMapToRoles.value.get(`${userNamePrefix}${email}`) ??- new Set<string>([]);+ const getWorkspaceRolesByName = (name: string) => {+ const specificRoles = userMapToRoles.value.get(name) ?? new Set<string>([]);if (userMapToRoles.value.has(`${userNamePrefix}${ALL_USERS_USER_EMAIL}`)) {for (const role of userMapToRoles.value.get(`${userNamePrefix}${ALL_USERS_USER_EMAIL}`@@ -171,11 +165,12 @@ export const useWorkspaceV1Store = defineStore("workspace_v1", () => {};return {+ userMapToRoles,workspaceIamPolicy,fetchIamPolicy,patchIamPolicy,findRolesByMember,roleMapToUsers,- getWorkspaceRolesByEmail,+ getWorkspaceRolesByName,};});diff --git a/frontend/src/store/modules/workloadIdentity.ts b/frontend/src/store/modules/workloadIdentity.tsnew file mode 100644index 0000000000..8f387350c8--- /dev/null+++ b/frontend/src/store/modules/workloadIdentity.ts@@ -0,0 +1,152 @@+import { create } from "@bufbuild/protobuf";+import { createContextValues } from "@connectrpc/connect";+import { defineStore } from "pinia";+import { ref } from "vue";+import { workloadIdentityServiceClientConnect } from "@/connect";+import { silentContextKey } from "@/connect/context-key";+import { State } from "@/types/proto-es/v1/common_pb";+import {+ type User,+ UserSchema,+ UserType,+} from "@/types/proto-es/v1/user_service_pb";+import type { WorkloadIdentity } from "@/types/proto-es/v1/workload_identity_service_pb";+import {+ CreateWorkloadIdentityRequestSchema,+ DeleteWorkloadIdentityRequestSchema,+ GetWorkloadIdentityRequestSchema,+ ListWorkloadIdentitiesRequestSchema,+ UndeleteWorkloadIdentityRequestSchema,+ UpdateWorkloadIdentityRequestSchema,+ WorkloadIdentitySchema,+} from "@/types/proto-es/v1/workload_identity_service_pb";+import { useActuatorV1Store } from "./v1/actuator";++export const useWorkloadIdentityStore = defineStore("workloadIdentity", () => {+ const actuatorStore = useActuatorV1Store();+ const cacheByName = ref<Map<string, WorkloadIdentity>>(new Map());++ const listWorkloadIdentities = async (+ pageSize: number,+ pageToken: string | undefined,+ showDeleted: boolean+ ) => {+ const request = create(ListWorkloadIdentitiesRequestSchema, {+ pageSize,+ pageToken,+ showDeleted,+ });+ return workloadIdentityServiceClientConnect.listWorkloadIdentities(request);+ };++ const fetchWorkloadIdentity = async (name: string, silent = false) => {+ const request = create(GetWorkloadIdentityRequestSchema, {+ name,+ });+ return workloadIdentityServiceClientConnect.getWorkloadIdentity(request, {+ contextValues: createContextValues().set(silentContextKey, silent),+ });+ };++ const getWorkloadIdentity = (name: string) => {+ return cacheByName.value.get(name);+ };++ const getOrFetchWorkloadIdentity = async (+ name: string,+ silent = false+ ): Promise<WorkloadIdentity> => {+ const cached = getWorkloadIdentity(name);+ if (cached) {+ return cached;+ }+ const wi = await fetchWorkloadIdentity(name, silent);+ cacheByName.value.set(name, wi);+ return wi;+ };++ const createWorkloadIdentity = async (+ workloadIdentityId: string,+ workloadIdentity: Partial<WorkloadIdentity>+ ) => {+ const request = create(CreateWorkloadIdentityRequestSchema, {+ workloadIdentityId,+ workloadIdentity: create(+ WorkloadIdentitySchema,+ workloadIdentity as WorkloadIdentity+ ),+ });+ const wi =+ await workloadIdentityServiceClientConnect.createWorkloadIdentity(+ request+ );+ cacheByName.value.set(wi.name, wi);+ await actuatorStore.fetchServerInfo();+ return wi;+ };++ const updateWorkloadIdentity = async (+ workloadIdentity: Partial<WorkloadIdentity>,+ updateMask: { paths: string[] }+ ) => {+ const request = create(UpdateWorkloadIdentityRequestSchema, {+ workloadIdentity: create(+ WorkloadIdentitySchema,+ workloadIdentity as WorkloadIdentity+ ),+ updateMask,+ });+ const wi =+ await workloadIdentityServiceClientConnect.updateWorkloadIdentity(+ request+ );+ cacheByName.value.set(wi.name, wi);+ return wi;+ };++ const deleteWorkloadIdentity = async (name: string) => {+ const request = create(DeleteWorkloadIdentityRequestSchema, {+ name,+ });+ await workloadIdentityServiceClientConnect.deleteWorkloadIdentity(request);+ const wi = cacheByName.value.get(name);+ if (wi) {+ wi.state = State.DELETED;+ }+ await actuatorStore.fetchServerInfo();+ };++ const undeleteWorkloadIdentity = async (name: string) => {+ const request = create(UndeleteWorkloadIdentityRequestSchema, {+ name,+ });+ const wi =+ await workloadIdentityServiceClientConnect.undeleteWorkloadIdentity(+ request+ );+ cacheByName.value.set(wi.name, wi);+ await actuatorStore.fetchServerInfo();+ return wi;+ };++ return {+ listWorkloadIdentities,+ getWorkloadIdentity,+ getOrFetchWorkloadIdentity,+ createWorkloadIdentity,+ updateWorkloadIdentity,+ deleteWorkloadIdentity,+ undeleteWorkloadIdentity,+ };+});++export const workloadIdentityToUser = (wi: WorkloadIdentity): User => {+ return create(UserSchema, {+ name: `users/${wi.email}`,+ email: wi.email,+ title: wi.title,+ state: wi.state,+ userType: UserType.WORKLOAD_IDENTITY,+ workloadIdentityConfig: wi.workloadIdentityConfig,+ });+};diff --git a/frontend/src/types/v1/user.ts b/frontend/src/types/v1/user.tsindex 839eb36d47..7266e475fb 100644--- a/frontend/src/types/v1/user.ts+++ b/frontend/src/types/v1/user.ts@@ -54,7 +54,7 @@ export const getGroupEmailInBinding = (email: string) => {export const serviceAccountBindingPrefix = "serviceAccount:";-export const getServiceAccountEmailInBinding = (email: string) => {+export const getServiceAccountNameInBinding = (email: string) => {return `${serviceAccountBindingPrefix}${email}`;};diff --git a/frontend/src/utils/v1/iam.ts b/frontend/src/utils/v1/iam.tsindex 03db5e4b4a..e9efcc1516 100644--- a/frontend/src/utils/v1/iam.ts+++ b/frontend/src/utils/v1/iam.ts@@ -1,8 +1,25 @@import { uniq } from "lodash-es";-import { extractUserId, useGroupStore, useWorkspaceV1Store } from "@/store";-import { userNamePrefix } from "@/store/modules/v1/common";-import { ALL_USERS_USER_EMAIL, groupBindingPrefix } from "@/types";+import {+ ensureGroupIdentifier,+ extractServiceAccountId,+ extractWorkloadIdentityId,+ groupNamePrefix,+ useGroupStore,+ useWorkspaceV1Store,+} from "@/store";+import {+ serviceAccountNamePrefix,+ userNamePrefix,+ workloadIdentityNamePrefix,+} from "@/store/modules/v1/common";+import {+ ALL_USERS_USER_EMAIL,+ groupBindingPrefix,+ serviceAccountBindingPrefix,+ workloadIdentityBindingPrefix,+} from "@/types";import type { Binding, IamPolicy } from "@/types/proto-es/v1/iam_policy_pb";+import { ensureUserFullName } from "@/utils";import { convertFromExpr } from "@/utils/issue/cel";export const isBindingPolicyExpired = (binding: Binding): boolean => {@@ -18,10 +35,28 @@ export const isBindingPolicyExpired = (binding: Binding): boolean => {return false;};-// getUserEmailListInBinding will extract users in the IAM policy binding.-// If the binding is group, will conains all members email in the group.-// It can also includs ALL_USERS_USER_EMAIL-export const getUserEmailListInBinding = ({+export const convertMemberToFullname = (member: string) => {+ if (member.startsWith(groupBindingPrefix)) {+ return ensureGroupIdentifier(member);+ } else if (member.startsWith(serviceAccountBindingPrefix)) {+ const email = extractServiceAccountId(member);+ return `${serviceAccountNamePrefix}${email}`;+ } else if (member.startsWith(workloadIdentityBindingPrefix)) {+ const email = extractWorkloadIdentityId(member);+ return `${workloadIdentityNamePrefix}${email}`;+ } else {+ // ATTENTION: the email can be ALL_USERS_USER_EMAIL+ return ensureUserFullName(member);+ }+};++// getUserListInBinding will extract users in the IAM policy binding.+// If the binding is group, will conains all members in the group.+// The return value should be the user full name with the prefix:+// - users/{email}, could includs ALL_USERS_USER_EMAIL+// - serviceAccounts/{email}+// - workloadIdentities/{email}+export const getUserListInBinding = ({binding,ignoreGroup,}: {@@ -33,10 +68,11 @@ export const getUserEmailListInBinding = ({}const groupStore = useGroupStore();- const emailList = [];+ const fullnameList = [];for (const member of binding.members) {- if (member.startsWith(groupBindingPrefix)) {+ const fullname = convertMemberToFullname(member);+ if (fullname.startsWith(groupNamePrefix)) {if (ignoreGroup) {continue;}@@ -44,16 +80,15 @@ export const getUserEmailListInBinding = ({if (!group) {continue;}-- emailList.push(...group.members.map((m) => extractUserId(m.member)));+ for (const groupMember of group.members) {+ // the group member MUST be human.+ fullnameList.push(ensureUserFullName(groupMember.member));+ }} else {- const email = extractUserId(member);- // ATTENTION:- // the email can be ALL_USERS_USER_EMAIL- emailList.push(email);+ fullnameList.push(fullname);}}- return uniq(emailList);+ return uniq(fullnameList);};// memberMapToRolesInProjectIAM return the Map<users/{email}, Set<roles/{role}>>@@ -63,7 +98,7 @@ export const memberMapToRolesInProjectIAM = (targetRole?: string): Map<string, Set<string>> => {const workspaceStore = useWorkspaceV1Store();- // Map<users/{email}, Set<roles/{role}>>+ // Map<userfullname, Set<roles/{role}>>const rolesMapByName = new Map<string, Set<string>>();// Handle project level roles.@@ -75,14 +110,12 @@ export const memberMapToRolesInProjectIAM = (continue;}- const emails = getUserEmailListInBinding({ binding, ignoreGroup: false });-- for (const email of emails) {- const key = `${userNamePrefix}${email}`;- if (!rolesMapByName.has(key)) {- rolesMapByName.set(key, new Set());+ const fullnames = getUserListInBinding({ binding, ignoreGroup: false });+ for (const fullname of fullnames) {+ if (!rolesMapByName.has(fullname)) {+ rolesMapByName.set(fullname, new Set());}- rolesMapByName.get(key)?.add(binding.role);+ rolesMapByName.get(fullname)?.add(binding.role);}}@@ -102,22 +135,23 @@ export const memberMapToRolesInProjectIAM = (return rolesMapByName;};-export const bindingListInIAM = ({+export const filterBindingsByUserName = ({policy,- email,+ name,ignoreGroup,}: {policy: IamPolicy;- email: string;+ name: string; // the name should be the fullnameignoreGroup: boolean;}): Binding[] => {return policy.bindings.filter((binding) => {if (isBindingPolicyExpired(binding)) {return false;}- const emailList = getUserEmailListInBinding({ binding, ignoreGroup });+ const fullnameList = getUserListInBinding({ binding, ignoreGroup });return (- emailList.includes(ALL_USERS_USER_EMAIL) || emailList.includes(email)+ fullnameList.includes(`${userNamePrefix}${ALL_USERS_USER_EMAIL}`) ||+ fullnameList.includes(name));});};diff --git a/frontend/src/utils/v1/user.ts b/frontend/src/utils/v1/user.tsindex d00b52b1f2..aa9baa61bd 100644--- a/frontend/src/utils/v1/user.ts+++ b/frontend/src/utils/v1/user.ts@@ -22,3 +22,10 @@ export const isUserIncludedInList = (}return false;};++export const extractEmailPrefix = (email: string, suffix: string): string => {+ if (email.endsWith(suffix)) {+ return email.slice(0, -suffix.length);+ }+ return email.split("@")[0];+};diff --git a/frontend/src/views/ProfileDashboard.vue b/frontend/src/views/ProfileDashboard.vueindex cce6988aa8..37137e490e 100644--- a/frontend/src/views/ProfileDashboard.vue+++ b/frontend/src/views/ProfileDashboard.vue@@ -337,7 +337,7 @@ const user = computedAsync(() => {}, unknownUser());const userRoles = computed(() => {- return [...workspaceStore.getWorkspaceRolesByEmail(user.value.email)];+ return [...workspaceStore.getWorkspaceRolesByName(user.value.name)];});const isSelf = computed(() => currentUser.value.name === user.value.name);diff --git a/frontend/src/views/SettingWorkspaceUsers.vue b/frontend/src/views/SettingWorkspaceUsers.vueindex 9d10414199..3366c6e701 100644--- a/frontend/src/views/SettingWorkspaceUsers.vue+++ b/frontend/src/views/SettingWorkspaceUsers.vue@@ -29,8 +29,9 @@:show-roles="false":user-list="list":loading="loading"- @select-group="handleUpdateGroup"- @update-user="handleUserUpdated"+ @group-selected="handleGroupSelected"+ @user-selected="handleUserSelected"+ @user-updated="handleUserUpdated"/></template></PagedTable>@@ -55,8 +56,8 @@:groups="list":loading="loading"v-model:expanded-keys="expandedKeys"- @update-group="handleUpdateGroup"- @remove-group="handleRemoveGroup"+ @group-selected="handleGroupSelected"+ @group-removed="handleGroupRemoved"/></template></PagedTable>@@ -188,15 +189,22 @@<CreateUserDrawerv-if="state.showCreateUserDrawer"- @close="state.showCreateUserDrawer = false"+ :user="state.editingUser"+ @close="() => {+ state.showCreateUserDrawer = false+ state.editingUser = undefined+ }"@created="handleUserCreated"/><CreateGroupDrawerv-if="state.showCreateGroupDrawer":group="state.editingGroup"- @close="state.showCreateGroupDrawer = false"+ @close="() => {+ state.showCreateGroupDrawer = false+ state.editingGroup = undefined+ }"@removed="(group) => {- handleRemoveGroup(group)+ handleGroupRemoved(group)state.showCreateGroupDrawer = false}"@updated="handleGroupUpdated"@@ -225,6 +233,7 @@ import UserDataTable from "@/components/User/Settings/UserDataTable/index.vue";import UserDataTableByGroup from "@/components/User/Settings/UserDataTableByGroup/index.vue";import { SearchBox } from "@/components/v2";import PagedTable from "@/components/v2/Model/PagedTable.vue";+import { WORKSPACE_ROUTE_USER_PROFILE } from "@/router/dashboard/workspaceRoutes";import { SETTING_ROUTE_WORKSPACE_GENERAL } from "@/router/dashboard/workspaceSetting";import {featureToRef,@@ -239,7 +248,7 @@ import { groupNamePrefix } from "@/store/modules/v1/common";import { State } from "@/types/proto-es/v1/common_pb";import type { Group } from "@/types/proto-es/v1/group_service_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";-import { type User } from "@/types/proto-es/v1/user_service_pb";+import { type User, UserType } from "@/types/proto-es/v1/user_service_pb";const tabList = ["USERS", "GROUPS"] as const;type MemberTab = (typeof tabList)[number];@@ -256,6 +265,7 @@ type LocalState = {showCreateGroupDrawer: boolean;showAadSyncDrawer: boolean;editingGroup?: Group;+ editingUser?: User;};const state = reactive<LocalState>({@@ -433,12 +443,29 @@ const handleCreateGroup = () => {state.showCreateGroupDrawer = true;};-const handleUpdateGroup = (group: Group) => {+const handleUserSelected = (user: User) => {+ if (+ user.userType === UserType.SERVICE_ACCOUNT ||+ user.userType === UserType.WORKLOAD_IDENTITY+ ) {+ state.editingUser = user;+ state.showCreateUserDrawer = true;+ } else {+ router.push({+ name: WORKSPACE_ROUTE_USER_PROFILE,+ params: {+ principalEmail: user.email,+ },+ });+ }+};++const handleGroupSelected = (group: Group) => {state.editingGroup = group;state.showCreateGroupDrawer = true;};-const handleRemoveGroup = (group: Group) => {+const handleGroupRemoved = (group: Group) => {groupPagedTable.value?.removeCache(group);};