Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
feat(frontend): add project-level service account and workload identity support (#19147)
rebelice7da9ca5ddcae
diff --git a/frontend/src/components/Project/useProjectSidebar.ts b/frontend/src/components/Project/useProjectSidebar.tsindex 063282ec86..318b0cf7c4 100644--- a/frontend/src/components/Project/useProjectSidebar.ts+++ b/frontend/src/components/Project/useProjectSidebar.ts@@ -21,9 +21,11 @@ import {PROJECT_V1_ROUTE_PLANS,PROJECT_V1_ROUTE_RELEASES,PROJECT_V1_ROUTE_ROLLOUTS,+ PROJECT_V1_ROUTE_SERVICE_ACCOUNTS,PROJECT_V1_ROUTE_SETTINGS,PROJECT_V1_ROUTE_SYNC_SCHEMA,PROJECT_V1_ROUTE_WEBHOOKS,+ PROJECT_V1_ROUTE_WORKLOAD_IDENTITIES,} from "@/router/dashboard/projectV1";import { DEFAULT_PROJECT_NAME } from "@/types";import type { Project } from "@/types/proto-es/v1/project_service_pb";@@ -125,6 +127,16 @@ export const useProjectSidebar = (project: MaybeRef<Project>) => {path: PROJECT_V1_ROUTE_MEMBERS,type: "div",},+ {+ title: t("settings.members.service-accounts"),+ path: PROJECT_V1_ROUTE_SERVICE_ACCOUNTS,+ type: "div",+ },+ {+ title: t("settings.members.workload-identities"),+ path: PROJECT_V1_ROUTE_WORKLOAD_IDENTITIES,+ type: "div",+ },{title: t("common.webhooks"),path: PROJECT_V1_ROUTE_WEBHOOKS,diff --git a/frontend/src/components/User/Settings/CreateServiceAccountDrawer.vue b/frontend/src/components/User/Settings/CreateServiceAccountDrawer.vuenew file mode 100644index 0000000000..59d8cc0f20--- /dev/null+++ b/frontend/src/components/User/Settings/CreateServiceAccountDrawer.vue@@ -0,0 +1,372 @@+<template>+ <Drawer @close="$emit('close')">+ <DrawerContent+ class="w-[40rem] max-w-[100vw]"+ :title="+ isEditMode+ ? $t('settings.members.update-service-account')+ : $t('settings.members.add-service-account')+ "+ >+ <template #default>+ <div class="flex flex-col gap-y-6">+ <div class="flex flex-col gap-y-2">+ <label class="block text-sm font-medium leading-5 text-control">+ {{ $t("common.name") }}+ </label>+ <NInput+ v-model:value="state.serviceAccount.title"+ :input-props="{ type: 'text', autocomplete: 'off' }"+ placeholder="Foo"+ :maxlength="200"+ :disabled="!allowUpdate"+ />+ </div>++ <div class="flex flex-col gap-y-2">+ <label class="block text-sm font-medium leading-5 text-control">+ {{ $t("common.email") }}+ <RequiredStar class="ml-0.5" />+ </label>+ <EmailInput+ v-model:value="state.serviceAccount.email"+ :domain="emailSuffix"+ :show-domain="true"+ :disabled="isEditMode"+ />+ </div>++ <div class="flex flex-col gap-y-2">+ <div>+ <label class="block text-sm font-medium leading-5 text-control">+ {{ $t("settings.members.table.roles") }}+ </label>+ </div>+ <RoleSelect+ v-model:value="state.roles"+ :multiple="true"+ :disabled="!allowUpdateRoles"+ :project="project"+ />+ </div>+ </div>+ </template>+ <template #footer>+ <div class="w-full flex flex-row items-center justify-end gap-x-2">+ <NButton @click="$emit('close')">+ {{ $t("common.cancel") }}+ </NButton>++ <NButton+ type="primary"+ :disabled="!allowConfirm"+ :loading="state.isRequesting"+ @click="createOrUpdateServiceAccount"+ >+ {{+ isEditMode ? $t("common.update") : $t("common.confirm")+ }}+ </NButton>+ </div>+ </template>+ </DrawerContent>+ </Drawer>+</template>++<script lang="ts" setup>+import { create } from "@bufbuild/protobuf";+import { FieldMaskSchema } from "@bufbuild/protobuf/wkt";+import { cloneDeep, isEqual } from "lodash-es";+import { NButton, NInput } from "naive-ui";+import { computed, reactive, watch } from "vue";+import { useI18n } from "vue-i18n";+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 {+ ensureServiceAccountFullName,+ pushNotification,+ serviceAccountToUser,+ useProjectIamPolicyStore,+ useProjectV1Store,+ useServiceAccountStore,+ useWorkspaceV1Store,+} from "@/store";+import {+ getServiceAccountNameInBinding,+ getServiceAccountSuffix,+ UNKNOWN_USER_NAME,+ unknownUser,+} from "@/types";+import { PresetRoleType } from "@/types/iam";+import type { Binding } from "@/types/proto-es/v1/iam_policy_pb";+import type { User } from "@/types/proto-es/v1/user_service_pb";+import { UserSchema } from "@/types/proto-es/v1/user_service_pb";+import { hasProjectPermissionV2, hasWorkspacePermissionV2 } from "@/utils";++interface LocalState {+ isRequesting: boolean;+ serviceAccount: User;+ roles: string[];+}++const props = defineProps<{+ serviceAccount?: User;+ projectId?: string;+}>();++const emit = defineEmits<{+ (event: "close"): void;+ (event: "created", user: User): void;+ (event: "updated", user: User): void;+}>();++const { t } = useI18n();+const serviceAccountStore = useServiceAccountStore();+const workspaceStore = useWorkspaceV1Store();+const projectStore = useProjectV1Store();+const projectIamPolicyStore = useProjectIamPolicyStore();++const state = reactive<LocalState>({+ isRequesting: false,+ serviceAccount: unknownUser(),+ roles: props.projectId ? [] : [PresetRoleType.WORKSPACE_MEMBER],+});++const project = computed(() => {+ if (!props.projectId) return undefined;+ return projectStore.getProjectByName(`projects/${props.projectId}`);+});++const parent = computed(() => {+ if (props.projectId) {+ return `projects/${props.projectId}`;+ }+ return undefined;+});++const emailSuffix = computed(() => getServiceAccountSuffix(props.projectId));++const isEditMode = computed(+ () =>+ !!props.serviceAccount && props.serviceAccount.name !== unknownUser().name+);++const allowUpdate = computed(() => {+ if (!isEditMode.value) {+ return true;+ }+ if (props.projectId && project.value) {+ return hasProjectPermissionV2(project.value, "bb.serviceAccounts.update");+ }+ return hasWorkspacePermissionV2("bb.serviceAccounts.update");+});++const allowUpdateRoles = computed(() => {+ if (props.projectId && project.value) {+ return hasProjectPermissionV2(project.value, "bb.projects.setIamPolicy");+ }+ return hasWorkspacePermissionV2("bb.workspaces.setIamPolicy");+});++const initialRoles = computed(() => {+ if (+ !props.serviceAccount ||+ props.serviceAccount.name === UNKNOWN_USER_NAME+ ) {+ return props.projectId ? [] : [PresetRoleType.WORKSPACE_MEMBER];+ }++ if (props.projectId && project.value) {+ const policy = projectIamPolicyStore.getProjectIamPolicy(+ project.value.name+ );+ const roles = policy.bindings+ .filter((binding: Binding) =>+ binding.members.includes(+ getServiceAccountNameInBinding(props.serviceAccount!.email)+ )+ )+ .map((binding: Binding) => binding.role);+ return roles;+ }++ const roles = workspaceStore.userMapToRoles.get(+ `serviceAccounts/${props.serviceAccount.email}`+ );+ return roles ? [...roles] : [];+});++watch(+ () => props.serviceAccount,+ (sa) => {+ if (!sa) {+ return;+ }+ state.serviceAccount = cloneDeep(create(UserSchema, sa));+ state.roles = [...initialRoles.value];+ },+ {+ immediate: true,+ }+);++const allowConfirm = computed(() => {+ if (!state.serviceAccount.email) {+ return false;+ }+ return true;+});++const extractTitle = (email: string): string => {+ const atIndex = email.indexOf("@");+ if (atIndex !== -1) {+ return email.substring(0, atIndex);+ }+ return email;+};++const updateProjectIamPolicyForMember = async (+ projectName: string,+ member: string,+ roles: string[]+) => {+ const policy = cloneDeep(+ projectIamPolicyStore.getProjectIamPolicy(projectName)+ );++ // Remove member from all existing bindings+ for (const binding of policy.bindings) {+ binding.members = binding.members.filter((m) => m !== member);+ }++ // Remove empty bindings+ policy.bindings = policy.bindings.filter(+ (binding) => binding.members.length > 0+ );++ // Add member to new role bindings+ for (const role of roles) {+ const existingBinding = policy.bindings.find((b) => b.role === role);+ if (existingBinding) {+ if (!existingBinding.members.includes(member)) {+ existingBinding.members.push(member);+ }+ } else {+ policy.bindings.push({+ role,+ members: [member],+ condition: undefined,+ parsedExpr: undefined,+ } as Binding);+ }+ }++ await projectIamPolicyStore.updateProjectIamPolicy(projectName, policy);+};++const createOrUpdateServiceAccount = async () => {+ state.isRequesting = true;+ try {+ if (isEditMode.value) {+ await updateServiceAccount();+ } else {+ await createServiceAccount();+ }+ } catch {+ // nothing+ } finally {+ state.isRequesting = false;+ }+};++const createServiceAccount = async () => {+ const serviceAccountId = state.serviceAccount.email.split("@")[0];+ const sa = await serviceAccountStore.createServiceAccount(+ serviceAccountId,+ {+ title:+ state.serviceAccount.title || extractTitle(state.serviceAccount.email),+ },+ parent.value+ );+ const createdUser = serviceAccountToUser(sa);++ if (state.roles.length > 0) {+ if (props.projectId && project.value) {+ await updateProjectIamPolicyForMember(+ project.value.name,+ getServiceAccountNameInBinding(createdUser.email),+ state.roles+ );+ } else {+ await workspaceStore.patchIamPolicy([+ {+ member: getServiceAccountNameInBinding(createdUser.email),+ roles: state.roles,+ },+ ]);+ }+ }+ emit("created", createdUser);+ pushNotification({+ module: "bytebase",+ style: "SUCCESS",+ title: t("common.created"),+ });+ emit("close");+};++const updateServiceAccount = async () => {+ const sa = props.serviceAccount;+ if (!sa) {+ return;+ }++ const updateMask: string[] = [];+ if (state.serviceAccount.title !== sa.title) {+ updateMask.push("title");+ }++ let updatedUser: User = sa;++ if (updateMask.length > 0) {+ const updated = await serviceAccountStore.updateServiceAccount(+ {+ name: ensureServiceAccountFullName(sa.email),+ title: state.serviceAccount.title,+ },+ create(FieldMaskSchema, {+ paths: [...updateMask],+ })+ );+ updatedUser = serviceAccountToUser(updated);+ }++ if (!isEqual([...initialRoles.value].sort(), [...state.roles].sort())) {+ if (props.projectId && project.value) {+ await updateProjectIamPolicyForMember(+ project.value.name,+ getServiceAccountNameInBinding(updatedUser.email),+ state.roles+ );+ } else {+ await workspaceStore.patchIamPolicy([+ {+ member: getServiceAccountNameInBinding(updatedUser.email),+ 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/CreateUserDrawer.vue b/frontend/src/components/User/Settings/CreateUserDrawer.vueindex 4dd8f49346..01351d1509 100644--- a/frontend/src/components/User/Settings/CreateUserDrawer.vue+++ b/frontend/src/components/User/Settings/CreateUserDrawer.vue@@ -10,346 +10,35 @@><template #default><div class="flex flex-col gap-y-6">- <div class="w-full flex flex-col gap-y-2">- <div class="flex items-center gap-x-1">- <div class="text-sm font-medium">{{ $t("common.type") }}</div>- <a- href="https://docs.bytebase.com/get-started/terraform?source=console"- target="_blank"- >- <heroicons-outline:question-mark-circle class="w-4 h-4" />- </a>- </div>- <NRadioGroup- v-model:value="state.user.userType"- :disabled="isEditMode"- >- <NRadio :value="UserType.USER" :label="$t('common.user')" />- <NRadio- :value="UserType.SERVICE_ACCOUNT"- :label="$t('settings.members.service-account')"- />- <NRadio- :value="UserType.WORKLOAD_IDENTITY"- :label="$t('settings.members.workload-identity')"- />- </NRadioGroup>+ <div class="flex flex-col gap-y-2">+ <label class="block text-sm font-medium leading-5 text-control">+ {{ $t("common.name") }}+ </label>+ <NInput+ v-model:value="state.user.title"+ :input-props="{ type: 'text', autocomplete: 'off' }"+ placeholder="Foo"+ :maxlength="200"+ :disabled="!allowUpdate"+ /></div>- <!-- Workload Identity Fields -->- <template v-if="state.user.userType === UserType.WORKLOAD_IDENTITY">- <!-- Name -->- <div class="flex flex-col gap-y-2">- <label class="block text-sm font-medium leading-5 text-control">- {{ $t("common.name") }}- </label>- <NInput- v-model:value="state.user.title"- :input-props="{ type: 'text', autocomplete: 'off' }"- placeholder="GitHub Deploy"- :maxlength="200"- :disabled="!allowUpdate"- />- </div>-- <!-- Email -->- <div class="flex flex-col gap-y-2">- <label class="block text-sm font-medium leading-5 text-control">- {{ $t("common.email") }}- <RequiredStar class="ml-0.5" />- </label>- <EmailInput- v-model:value="state.user.email"- :domain="workloadIdentitySuffix"- :show-domain="true"- :disabled="isEditMode"- />- </div>-- <!-- Platform -->- <div class="flex flex-col gap-y-2">- <label class="block text-sm font-medium leading-5 text-control">- {{ $t("settings.members.workload-identity-platform") }}- <RequiredStar class="ml-0.5" />- </label>- <NSelect- v-model:value="state.wif.providerType"- :options="platformOptions"- :disabled="!allowUpdate"- @update:value="onPlatformChange"- />- </div>-- <!-- 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- "- >- {{ $t("settings.members.workload-identity-group") }}- </template>- <template v-else>- {{ $t("settings.members.workload-identity-owner") }}- </template>- <RequiredStar class="ml-0.5" />- </label>- <NInput- v-model:value="state.wif.owner"- :input-props="{ type: 'text', autocomplete: 'off' }"- :placeholder="- state.wif.providerType ===- WorkloadIdentityConfig_ProviderType.GITLAB- ? 'my-group'- : 'my-org'- "- :maxlength="200"- :disabled="!allowUpdate"- />- </div>-- <!-- 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- "- >- {{ $t("settings.members.workload-identity-project") }}- </template>- <template v-else>- {{ $t("settings.members.workload-identity-repo") }}- </template>- </label>- <NInput- v-model:value="state.wif.repo"- :input-props="{ type: 'text', autocomplete: 'off' }"- :placeholder="- state.wif.providerType ===- WorkloadIdentityConfig_ProviderType.GITLAB- ? 'my-project'- : 'my-repo'- "- :maxlength="200"- :disabled="!allowUpdate"- />- <span class="text-xs text-gray-500">- <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") }}- </template>- </span>- </div>-- <!-- Allowed Branches/Tags (GitLab only) -->- <div- 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"- )- }}- </label>- <NSelect- v-model:value="state.wif.refType"- :options="refTypeOptions"- :disabled="!allowUpdate"- />- </div>-- <!-- Branch (GitHub) or Branch/Tag (GitLab when specific is selected) -->- <div- 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'- "- >- {{ $t("settings.members.workload-identity-tag") }}- </template>- <template v-else>- {{ $t("settings.members.workload-identity-branch") }}- </template>- </label>- <NInput- v-model:value="state.wif.branch"- :input-props="{ type: 'text', autocomplete: 'off' }"- :placeholder="state.wif.refType === 'tag' ? 'v1.0.0' : 'main'"- :maxlength="200"- :disabled="!allowUpdate"- />- <span class="text-xs text-gray-500">- <template- v-if="- state.wif.providerType ===- WorkloadIdentityConfig_ProviderType.GITLAB &&- state.wif.refType === 'tag'- "- >- {{ $t("settings.members.workload-identity-tag-hint") }}- </template>- <template v-else>- {{ $t("settings.members.workload-identity-branch-hint") }}- </template>- </span>- </div>-- <!-- Advanced Settings -->- <NCollapseTransition :show="state.wif.showAdvanced">- <div class="flex flex-col gap-y-6 pt-6 border-t">- <!-- Issuer URL / GitLab URL -->- <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- "- >- {{- $t("settings.members.workload-identity-gitlab-url")- }}- </template>- <template v-else>- {{ $t("settings.members.workload-identity-issuer") }}- </template>- </label>- <NInput- v-model:value="state.wif.issuerUrl"- :input-props="{ type: 'text', autocomplete: 'off' }"- :maxlength="500"- :disabled="!allowUpdate"- />- <span- v-if="- state.wif.providerType ===- WorkloadIdentityConfig_ProviderType.GITLAB- "- class="text-xs text-gray-500"- >- {{- $t(- "settings.members.workload-identity-gitlab-url-hint"- )- }}- </span>- </div>-- <!-- Audience -->- <div class="flex flex-col gap-y-2">- <label- class="block text-sm font-medium leading-5 text-control"- >- {{ $t("settings.members.workload-identity-audience") }}- </label>- <NInput- v-model:value="state.wif.audience"- :input-props="{ type: 'text', autocomplete: 'off' }"- :maxlength="500"- :disabled="!allowUpdate"- />- </div>-- <!-- Subject Pattern -->- <div class="flex flex-col gap-y-2">- <label- class="block text-sm font-medium leading-5 text-control"- >- {{ $t("settings.members.workload-identity-subject") }}- </label>- <NInput- v-model:value="state.wif.subjectPattern"- :input-props="{ type: 'text', autocomplete: 'off' }"- :maxlength="500"- :disabled="!allowUpdate"- />- </div>- </div>- </NCollapseTransition>-- <NButton- text- @click="state.wif.showAdvanced = !state.wif.showAdvanced"- >- {{ $t("settings.members.workload-identity-advanced") }}- <template #icon>- <heroicons-outline:chevron-down- v-if="!state.wif.showAdvanced"- class="w-4 h-4"- />- <heroicons-outline:chevron-up v-else class="w-4 h-4" />- </template>- </NButton>- </template>-- <!-- Regular User / Service Account Fields -->- <template v-else>- <div class="flex flex-col gap-y-2">- <label class="block text-sm font-medium leading-5 text-control">- {{ $t("common.name") }}- </label>- <NInput- v-model:value="state.user.title"- :input-props="{ type: 'text', autocomplete: 'off' }"- placeholder="Foo"- :maxlength="200"- :disabled="!allowUpdate"- />- </div>-- <div class="flex flex-col gap-y-2">- <label class="block text-sm font-medium leading-5 text-control">- {{ $t("common.email") }}- <RequiredStar class="ml-0.5" />- </label>- <EmailInput- v-model:value="state.user.email"- :domain="- state.user.userType === UserType.SERVICE_ACCOUNT- ? serviceAccountSuffix- : ''- "- :show-domain="state.user.userType === UserType.SERVICE_ACCOUNT"- :disabled="isEditMode"- />- </div>- </template>+ <div class="flex flex-col gap-y-2">+ <label class="block text-sm font-medium leading-5 text-control">+ {{ $t("common.email") }}+ <RequiredStar class="ml-0.5" />+ </label>+ <EmailInput+ v-model:value="state.user.email"+ :domain="''"+ :show-domain="false"+ :disabled="isEditMode"+ />+ </div><PermissionGuardWrapperv-slot="slotProps"- :permissions="[- 'bb.workspaces.setIamPolicy'- ]"+ :permissions="['bb.workspaces.setIamPolicy']"><div class="flex flex-col gap-y-2"><div>@@ -358,42 +47,40 @@</label></div><RoleSelect- v-model:value="state.roles"- :multiple="true"- :disabled="slotProps.disabled"- />+ v-model:value="state.roles"+ :multiple="true"+ :disabled="slotProps.disabled"+ /></div></PermissionGuardWrapper>- <template v-if="state.user.userType === UserType.USER">- <div class="flex flex-col gap-y-2">- <div>- <label class="block text-sm font-medium leading-5 text-control">- {{ $t("settings.profile.phone") }}- </label>- <span class="textinfolabel text-sm">- {{ $t("settings.profile.phone-tips") }}- </span>- </div>- <NInput- v-model:value="state.user.phone"- type="text"- :input-props="{- type: 'tel',- autocomplete: 'new-password',- }"- :disabled="!allowUpdate"- />+ <div class="flex flex-col gap-y-2">+ <div>+ <label class="block text-sm font-medium leading-5 text-control">+ {{ $t("settings.profile.phone") }}+ </label>+ <span class="textinfolabel text-sm">+ {{ $t("settings.profile.phone-tips") }}+ </span></div>-- <UserPassword- ref="userPasswordRef"- v-model:password="state.user.password"- v-model:password-confirm="state.passwordConfirm"- :password-restriction="passwordRestrictionSetting"+ <NInput+ v-model:value="state.user.phone"+ type="text"+ :input-props="{+ type: 'tel',+ autocomplete: 'new-password',+ }":disabled="!allowUpdate"/>- </template>+ </div>++ <UserPassword+ ref="userPasswordRef"+ v-model:password="state.user.password"+ v-model:password-confirm="state.passwordConfirm"+ :password-restriction="passwordRestrictionSetting"+ :disabled="!allowUpdate"+ /></div></template><template #footer>@@ -404,9 +91,7 @@<PermissionGuardWrapperv-slot="slotProps"- :permissions="[- isEditMode ? updatePermission : createPermission- ]"+ :permissions="[isEditMode ? 'bb.users.update' : 'bb.users.create']"><NButtontype="primary"@@ -414,9 +99,7 @@:loading="state.isRequesting"@click="createOrUpdateUser">- {{- isEditMode ? $t("common.update") : $t("common.confirm")- }}+ {{ isEditMode ? $t("common.update") : $t("common.confirm") }}</NButton></PermissionGuardWrapper></div>@@ -429,14 +112,7 @@import { create } from "@bufbuild/protobuf";import { FieldMaskSchema } from "@bufbuild/protobuf/wkt";import { cloneDeep, isEqual } from "lodash-es";-import {- NButton,- NCollapseTransition,- NInput,- NRadio,- NRadioGroup,- NSelect,-} from "naive-ui";+import { NButton, NInput } from "naive-ui";import { computed, reactive, ref, watch } from "vue";import { useI18n } from "vue-i18n";import EmailInput from "@/components/EmailInput.vue";@@ -445,58 +121,28 @@ import RequiredStar from "@/components/RequiredStar.vue";import { Drawer, DrawerContent } from "@/components/v2";import { RoleSelect } from "@/components/v2/Select";import {- ensureServiceAccountFullName,- ensureWorkloadIdentityFullName,getUserFullNameByType,pushNotification,- serviceAccountToUser,- useServiceAccountStore,useSettingV1Store,useUserStore,- useWorkloadIdentityStore,useWorkspaceV1Store,- workloadIdentityToUser,} from "@/store";-import {- getServiceAccountNameInBinding,- getUserEmailInBinding,- getWorkloadIdentityNameInBinding,- serviceAccountSuffix,- UNKNOWN_USER_NAME,- unknownUser,- workloadIdentitySuffix,-} from "@/types";+import { getUserEmailInBinding, UNKNOWN_USER_NAME, 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,- WorkloadIdentityConfigSchema,} from "@/types/proto-es/v1/user_service_pb";import { hasWorkspacePermissionV2 } from "@/utils";import UserPassword from "./UserPassword.vue";-interface WifState {- emailPrefix: string;- providerType: WorkloadIdentityConfig_ProviderType;- owner: string;- repo: string;- branch: string;- refType: "branch" | "tag" | "all";- issuerUrl: string;- audience: string;- subjectPattern: string;- showAdvanced: boolean;-}-interface LocalState {isRequesting: boolean;user: User;roles: string[];passwordConfirm: string;- wif: WifState;}const props = defineProps<{@@ -513,8 +159,6 @@ 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>({@@ -522,51 +166,17 @@ const state = reactive<LocalState>({user: unknownUser(),roles: [PresetRoleType.WORKSPACE_MEMBER],passwordConfirm: "",- wif: {- emailPrefix: "",- providerType: WorkloadIdentityConfig_ProviderType.GITHUB,- owner: "",- repo: "",- branch: "",- refType: "all" as "branch" | "tag" | "all",- issuerUrl: "https://token.actions.githubusercontent.com",- audience: "",- subjectPattern: "",- showAdvanced: false,- },});const isEditMode = computed(() => !!props.user && props.user.name !== unknownUser().name);-const updatePermission = computed(() => {- switch (state.user.userType) {- case UserType.SERVICE_ACCOUNT:- return "bb.serviceAccounts.update";- case UserType.WORKLOAD_IDENTITY:- return "bb.workloadIdentities.update";- default:- return "bb.users.update";- }-});--const createPermission = computed(() => {- switch (state.user.userType) {- case UserType.SERVICE_ACCOUNT:- return "bb.serviceAccounts.create";- case UserType.WORKLOAD_IDENTITY:- return "bb.workloadIdentities.create";- default:- return "bb.users.create";- }-});-const allowUpdate = computed(() => {if (!isEditMode.value) {return true;}- return hasWorkspacePermissionV2(updatePermission.value);+ return hasWorkspacePermissionV2("bb.users.update");});const initialRoles = computed(() => {@@ -580,73 +190,6 @@ const initialRoles = computed(() => {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) => {@@ -655,176 +198,17 @@ watch(}state.user = cloneDeep(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",- value: WorkloadIdentityConfig_ProviderType.GITHUB,- },- {- label: "GitLab CI",- value: WorkloadIdentityConfig_ProviderType.GITLAB,- },-];--const platformPresets: Partial<- Record<- WorkloadIdentityConfig_ProviderType,- { issuerUrl: string; audience: string }- >-> = {- [WorkloadIdentityConfig_ProviderType.GITHUB]: {- issuerUrl: "https://token.actions.githubusercontent.com",- audience: "",- },- [WorkloadIdentityConfig_ProviderType.GITLAB]: {- issuerUrl: "https://gitlab.com",- audience: "",- },-};--const refTypeOptions = computed(() => {- if (state.wif.providerType === WorkloadIdentityConfig_ProviderType.GITLAB) {- return [- {- label: t("settings.members.workload-identity-all-branches-tags"),- value: "all",- },- {- label: t("settings.members.workload-identity-specific-branch"),- value: "branch",- },- {- label: t("settings.members.workload-identity-specific-tag"),- value: "tag",- },- ];- }- return [];-});--const onPlatformChange = (value: WorkloadIdentityConfig_ProviderType) => {- const preset = platformPresets[value];- if (preset) {- state.wif.issuerUrl = preset.issuerUrl;- state.wif.audience = preset.audience;- }- state.wif.refType = "all";- state.wif.branch = "";-};--// Auto-build subject pattern based on platform and inputs-const computedSubjectPattern = computed(() => {- const { owner, repo, branch, providerType, refType } = state.wif;-- if (providerType === WorkloadIdentityConfig_ProviderType.GITHUB) {- if (!repo) {- return `repo:${owner}/*`;- }- if (!branch) {- return `repo:${owner}/${repo}:*`;- }- return `repo:${owner}/${repo}:ref:refs/heads/${branch}`;- }-- if (providerType === WorkloadIdentityConfig_ProviderType.GITLAB) {- if (!repo) {- return `project_path:${owner}/*`;- }- if (refType === "all" || !branch) {- return `project_path:${owner}/${repo}:*`;- }- return `project_path:${owner}/${repo}:ref_type:${refType}:ref:${branch}`;- }-- return "";-});--// Flag to prevent circular updates-let isUpdatingFromPattern = false;-let isUpdatingFromFields = false;--// Watch for owner/repo/branch changes and update subject pattern-watch(- () => [- state.wif.owner,- state.wif.repo,- state.wif.branch,- state.wif.providerType,- state.wif.refType,- ],- () => {- if (isUpdatingFromPattern) return;- isUpdatingFromFields = true;- state.wif.subjectPattern = computedSubjectPattern.value;- isUpdatingFromFields = false;- },- { immediate: true }-);--// Watch for subject pattern changes and update fields (reverse binding)-watch(- () => state.wif.subjectPattern,- (newPattern) => {- if (isUpdatingFromFields) return;- const parsed = parseSubjectPattern(newPattern);- if (parsed) {- isUpdatingFromPattern = true;- 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;- }- isUpdatingFromPattern = false;- }- }-);-const passwordRestrictionSetting = computed(() => useSettingV1Store().workspaceProfile.passwordRestriction);const allowConfirm = computed(() => {- if (state.user.userType === UserType.WORKLOAD_IDENTITY) {- if (!state.wif.emailPrefix) {- return false;- }- if (!state.wif.owner) {- return false;- }- if (!state.wif.issuerUrl) {- return false;- }- return true;- }-if (!state.user.email) {return false;}@@ -843,7 +227,6 @@ const extractUserTitle = (email: string): string => {if (atIndex !== -1) {return email.substring(0, atIndex);}- // If there is no @, we just return the email as title.return email;};@@ -862,61 +245,18 @@ const createOrUpdateUser = async () => {}};-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,- workloadIdentityConfig: create(WorkloadIdentityConfigSchema, {- providerType: state.wif.providerType,- issuerUrl: state.wif.issuerUrl,- allowedAudiences: state.wif.audience ? [state.wif.audience] : [],- subjectPattern: state.wif.subjectPattern,- }),- }- );- 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,- });- }- }+ const createdUser = await userStore.createUser({+ ...state.user,+ userType: UserType.USER,+ title: state.user.title || extractUserTitle(state.user.email),+ password: state.user.password,+ });if (state.roles.length > 0) {await workspaceStore.patchIamPolicy([{- member: convertUserToMember(createdUser),+ member: getUserEmailInBinding(createdUser.email),roles: state.roles,},]);@@ -941,69 +281,30 @@ const updateUser = async () => {if (payload.title !== user.title) {updateMask.push("title");}+ if (payload.phone !== user.phone) {+ updateMask.push("phone");+ }+ if (payload.password) {+ updateMask.push("password");+ }let updatedUser: User = user;- switch (payload.userType) {- case UserType.WORKLOAD_IDENTITY: {- const wi = await workloadIdentityStore.updateWorkloadIdentity(- {- name: ensureWorkloadIdentityFullName(payload.email),- 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;- }- case UserType.SERVICE_ACCOUNT: {- if (updateMask.length > 0) {- const sa = await serviceAccountStore.updateServiceAccount(- {- name: ensureServiceAccountFullName(payload.email),- title: payload.title,- },- create(FieldMaskSchema, {- paths: [...updateMask],- })- );- updatedUser = serviceAccountToUser(sa);- }- 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 (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),+ member: getUserEmailInBinding(updatedUser.email),roles: state.roles,},]);diff --git a/frontend/src/components/User/Settings/CreateWorkloadIdentityDrawer.vue b/frontend/src/components/User/Settings/CreateWorkloadIdentityDrawer.vuenew file mode 100644index 0000000000..bff9dc9792--- /dev/null+++ b/frontend/src/components/User/Settings/CreateWorkloadIdentityDrawer.vue@@ -0,0 +1,862 @@+<template>+ <Drawer @close="$emit('close')">+ <DrawerContent+ class="w-[40rem] max-w-[100vw]"+ :title="+ isEditMode+ ? $t('settings.members.update-workload-identity')+ : $t('settings.members.add-workload-identity')+ "+ >+ <template #default>+ <div class="flex flex-col gap-y-6">+ <!-- Name -->+ <div class="flex flex-col gap-y-2">+ <label class="block text-sm font-medium leading-5 text-control">+ {{ $t("common.name") }}+ </label>+ <NInput+ v-model:value="state.workloadIdentity.title"+ :input-props="{ type: 'text', autocomplete: 'off' }"+ placeholder="GitHub Deploy"+ :maxlength="200"+ :disabled="!allowUpdate"+ />+ </div>++ <!-- Email -->+ <div class="flex flex-col gap-y-2">+ <label class="block text-sm font-medium leading-5 text-control">+ {{ $t("common.email") }}+ <RequiredStar class="ml-0.5" />+ </label>+ <EmailInput+ v-model:value="state.workloadIdentity.email"+ :domain="emailSuffix"+ :show-domain="true"+ :disabled="isEditMode"+ />+ </div>++ <!-- Platform -->+ <div class="flex flex-col gap-y-2">+ <label class="block text-sm font-medium leading-5 text-control">+ {{ $t("settings.members.workload-identity-platform") }}+ <RequiredStar class="ml-0.5" />+ </label>+ <NSelect+ v-model:value="state.wif.providerType"+ :options="platformOptions"+ :disabled="!allowUpdate"+ @update:value="onPlatformChange"+ />+ </div>++ <!-- 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+ "+ >+ {{ $t("settings.members.workload-identity-group") }}+ </template>+ <template v-else>+ {{ $t("settings.members.workload-identity-owner") }}+ </template>+ <RequiredStar class="ml-0.5" />+ </label>+ <NInput+ v-model:value="state.wif.owner"+ :input-props="{ type: 'text', autocomplete: 'off' }"+ :placeholder="+ state.wif.providerType ===+ WorkloadIdentityConfig_ProviderType.GITLAB+ ? 'my-group'+ : 'my-org'+ "+ :maxlength="200"+ :disabled="!allowUpdate"+ />+ </div>++ <!-- 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+ "+ >+ {{ $t("settings.members.workload-identity-project") }}+ </template>+ <template v-else>+ {{ $t("settings.members.workload-identity-repo") }}+ </template>+ </label>+ <NInput+ v-model:value="state.wif.repo"+ :input-props="{ type: 'text', autocomplete: 'off' }"+ :placeholder="+ state.wif.providerType ===+ WorkloadIdentityConfig_ProviderType.GITLAB+ ? 'my-project'+ : 'my-repo'+ "+ :maxlength="200"+ :disabled="!allowUpdate"+ />+ <span class="text-xs text-gray-500">+ <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") }}+ </template>+ </span>+ </div>++ <!-- Allowed Branches/Tags (GitLab only) -->+ <div+ 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"+ )+ }}+ </label>+ <NSelect+ v-model:value="state.wif.refType"+ :options="refTypeOptions"+ :disabled="!allowUpdate"+ />+ </div>++ <!-- Branch (GitHub) or Branch/Tag (GitLab when specific is selected) -->+ <div+ 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'+ "+ >+ {{ $t("settings.members.workload-identity-tag") }}+ </template>+ <template v-else>+ {{ $t("settings.members.workload-identity-branch") }}+ </template>+ </label>+ <NInput+ v-model:value="state.wif.branch"+ :input-props="{ type: 'text', autocomplete: 'off' }"+ :placeholder="state.wif.refType === 'tag' ? 'v1.0.0' : 'main'"+ :maxlength="200"+ :disabled="!allowUpdate"+ />+ <span class="text-xs text-gray-500">+ <template+ v-if="+ state.wif.providerType ===+ WorkloadIdentityConfig_ProviderType.GITLAB &&+ state.wif.refType === 'tag'+ "+ >+ {{ $t("settings.members.workload-identity-tag-hint") }}+ </template>+ <template v-else>+ {{ $t("settings.members.workload-identity-branch-hint") }}+ </template>+ </span>+ </div>++ <!-- Advanced Settings -->+ <NCollapseTransition :show="state.wif.showAdvanced">+ <div class="flex flex-col gap-y-6 pt-6 border-t">+ <!-- Issuer URL / GitLab URL -->+ <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+ "+ >+ {{+ $t("settings.members.workload-identity-gitlab-url")+ }}+ </template>+ <template v-else>+ {{ $t("settings.members.workload-identity-issuer") }}+ </template>+ </label>+ <NInput+ v-model:value="state.wif.issuerUrl"+ :input-props="{ type: 'text', autocomplete: 'off' }"+ :maxlength="500"+ :disabled="!allowUpdate"+ />+ <span+ v-if="+ state.wif.providerType ===+ WorkloadIdentityConfig_ProviderType.GITLAB+ "+ class="text-xs text-gray-500"+ >+ {{+ $t(+ "settings.members.workload-identity-gitlab-url-hint"+ )+ }}+ </span>+ </div>++ <!-- Audience -->+ <div class="flex flex-col gap-y-2">+ <label+ class="block text-sm font-medium leading-5 text-control"+ >+ {{ $t("settings.members.workload-identity-audience") }}+ </label>+ <NInput+ v-model:value="state.wif.audience"+ :input-props="{ type: 'text', autocomplete: 'off' }"+ :maxlength="500"+ :disabled="!allowUpdate"+ />+ </div>++ <!-- Subject Pattern -->+ <div class="flex flex-col gap-y-2">+ <label+ class="block text-sm font-medium leading-5 text-control"+ >+ {{ $t("settings.members.workload-identity-subject") }}+ </label>+ <NInput+ v-model:value="state.wif.subjectPattern"+ :input-props="{ type: 'text', autocomplete: 'off' }"+ :maxlength="500"+ :disabled="!allowUpdate"+ />+ </div>+ </div>+ </NCollapseTransition>++ <NButton+ text+ @click="state.wif.showAdvanced = !state.wif.showAdvanced"+ >+ {{ $t("settings.members.workload-identity-advanced") }}+ <template #icon>+ <heroicons-outline:chevron-down+ v-if="!state.wif.showAdvanced"+ class="w-4 h-4"+ />+ <heroicons-outline:chevron-up v-else class="w-4 h-4" />+ </template>+ </NButton>++ <div class="flex flex-col gap-y-2">+ <div>+ <label class="block text-sm font-medium leading-5 text-control">+ {{ $t("settings.members.table.roles") }}+ </label>+ </div>+ <RoleSelect+ v-model:value="state.roles"+ :multiple="true"+ :disabled="!allowUpdateRoles"+ :project="project"+ />+ </div>+ </div>+ </template>+ <template #footer>+ <div class="w-full flex flex-row items-center justify-end gap-x-2">+ <NButton @click="$emit('close')">+ {{ $t("common.cancel") }}+ </NButton>++ <NButton+ type="primary"+ :disabled="!allowConfirm"+ :loading="state.isRequesting"+ @click="createOrUpdateWorkloadIdentity"+ >+ {{+ isEditMode ? $t("common.update") : $t("common.confirm")+ }}+ </NButton>+ </div>+ </template>+ </DrawerContent>+ </Drawer>+</template>++<script lang="ts" setup>+import { create } from "@bufbuild/protobuf";+import { FieldMaskSchema } from "@bufbuild/protobuf/wkt";+import { cloneDeep, isEqual } from "lodash-es";+import { NButton, NCollapseTransition, NInput, NSelect } from "naive-ui";+import { computed, reactive, watch } from "vue";+import { useI18n } from "vue-i18n";+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 {+ ensureWorkloadIdentityFullName,+ pushNotification,+ useProjectIamPolicyStore,+ useProjectV1Store,+ useWorkloadIdentityStore,+ useWorkspaceV1Store,+ workloadIdentityToUser,+} from "@/store";+import {+ getWorkloadIdentityNameInBinding,+ getWorkloadIdentitySuffix,+ UNKNOWN_USER_NAME,+ unknownUser,+} from "@/types";+import { PresetRoleType } from "@/types/iam";+import type { Binding } from "@/types/proto-es/v1/iam_policy_pb";+import type { User } from "@/types/proto-es/v1/user_service_pb";+import {+ UserSchema,+ WorkloadIdentityConfig_ProviderType,+ WorkloadIdentityConfigSchema,+} from "@/types/proto-es/v1/user_service_pb";+import { hasProjectPermissionV2, hasWorkspacePermissionV2 } from "@/utils";++interface WifState {+ emailPrefix: string;+ providerType: WorkloadIdentityConfig_ProviderType;+ owner: string;+ repo: string;+ branch: string;+ refType: "branch" | "tag" | "all";+ issuerUrl: string;+ audience: string;+ subjectPattern: string;+ showAdvanced: boolean;+}++interface LocalState {+ isRequesting: boolean;+ workloadIdentity: User;+ roles: string[];+ wif: WifState;+}++const props = defineProps<{+ workloadIdentity?: User;+ projectId?: string;+}>();++const emit = defineEmits<{+ (event: "close"): void;+ (event: "created", user: User): void;+ (event: "updated", user: User): void;+}>();++const { t } = useI18n();+const workloadIdentityStore = useWorkloadIdentityStore();+const workspaceStore = useWorkspaceV1Store();+const projectStore = useProjectV1Store();+const projectIamPolicyStore = useProjectIamPolicyStore();++const state = reactive<LocalState>({+ isRequesting: false,+ workloadIdentity: unknownUser(),+ roles: props.projectId ? [] : [PresetRoleType.WORKSPACE_MEMBER],+ wif: {+ emailPrefix: "",+ providerType: WorkloadIdentityConfig_ProviderType.GITHUB,+ owner: "",+ repo: "",+ branch: "",+ refType: "all" as "branch" | "tag" | "all",+ issuerUrl: "https://token.actions.githubusercontent.com",+ audience: "",+ subjectPattern: "",+ showAdvanced: false,+ },+});++const project = computed(() => {+ if (!props.projectId) return undefined;+ return projectStore.getProjectByName(`projects/${props.projectId}`);+});++const parent = computed(() => {+ if (props.projectId) {+ return `projects/${props.projectId}`;+ }+ return undefined;+});++const emailSuffix = computed(() => getWorkloadIdentitySuffix(props.projectId));++const isEditMode = computed(+ () =>+ !!props.workloadIdentity &&+ props.workloadIdentity.name !== unknownUser().name+);++const allowUpdate = computed(() => {+ if (!isEditMode.value) {+ return true;+ }+ if (props.projectId && project.value) {+ return hasProjectPermissionV2(+ project.value,+ "bb.workloadIdentities.update"+ );+ }+ return hasWorkspacePermissionV2("bb.workloadIdentities.update");+});++const allowUpdateRoles = computed(() => {+ if (props.projectId && project.value) {+ return hasProjectPermissionV2(project.value, "bb.projects.setIamPolicy");+ }+ return hasWorkspacePermissionV2("bb.workspaces.setIamPolicy");+});++const initialRoles = computed(() => {+ if (+ !props.workloadIdentity ||+ props.workloadIdentity.name === UNKNOWN_USER_NAME+ ) {+ return props.projectId ? [] : [PresetRoleType.WORKSPACE_MEMBER];+ }++ if (props.projectId && project.value) {+ const policy = projectIamPolicyStore.getProjectIamPolicy(+ project.value.name+ );+ const roles = policy.bindings+ .filter((binding: Binding) =>+ binding.members.includes(+ getWorkloadIdentityNameInBinding(props.workloadIdentity!.email)+ )+ )+ .map((binding: Binding) => binding.role);+ return roles;+ }++ const roles = workspaceStore.userMapToRoles.get(+ `workloadIdentities/${props.workloadIdentity.email}`+ );+ 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) {+ 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) {+ 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.workloadIdentity,+ (wi) => {+ if (!wi) {+ return;+ }+ state.workloadIdentity = cloneDeep(create(UserSchema, wi));+ state.roles = [...initialRoles.value];++ const config = wi.workloadIdentityConfig;+ if (config) {+ state.wif.emailPrefix = wi.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",+ value: WorkloadIdentityConfig_ProviderType.GITHUB,+ },+ {+ label: "GitLab CI",+ value: WorkloadIdentityConfig_ProviderType.GITLAB,+ },+];++const platformPresets: Partial<+ Record<+ WorkloadIdentityConfig_ProviderType,+ { issuerUrl: string; audience: string }+ >+> = {+ [WorkloadIdentityConfig_ProviderType.GITHUB]: {+ issuerUrl: "https://token.actions.githubusercontent.com",+ audience: "",+ },+ [WorkloadIdentityConfig_ProviderType.GITLAB]: {+ issuerUrl: "https://gitlab.com",+ audience: "",+ },+};++const refTypeOptions = computed(() => {+ if (state.wif.providerType === WorkloadIdentityConfig_ProviderType.GITLAB) {+ return [+ {+ label: t("settings.members.workload-identity-all-branches-tags"),+ value: "all",+ },+ {+ label: t("settings.members.workload-identity-specific-branch"),+ value: "branch",+ },+ {+ label: t("settings.members.workload-identity-specific-tag"),+ value: "tag",+ },+ ];+ }+ return [];+});++const onPlatformChange = (value: WorkloadIdentityConfig_ProviderType) => {+ const preset = platformPresets[value];+ if (preset) {+ state.wif.issuerUrl = preset.issuerUrl;+ state.wif.audience = preset.audience;+ }+ state.wif.refType = "all";+ state.wif.branch = "";+};++// Auto-build subject pattern based on platform and inputs+const computedSubjectPattern = computed(() => {+ const { owner, repo, branch, providerType, refType } = state.wif;++ if (providerType === WorkloadIdentityConfig_ProviderType.GITHUB) {+ if (!repo) {+ return `repo:${owner}/*`;+ }+ if (!branch) {+ return `repo:${owner}/${repo}:*`;+ }+ return `repo:${owner}/${repo}:ref:refs/heads/${branch}`;+ }++ if (providerType === WorkloadIdentityConfig_ProviderType.GITLAB) {+ if (!repo) {+ return `project_path:${owner}/*`;+ }+ if (refType === "all" || !branch) {+ return `project_path:${owner}/${repo}:*`;+ }+ return `project_path:${owner}/${repo}:ref_type:${refType}:ref:${branch}`;+ }++ return "";+});++// Flag to prevent circular updates+let isUpdatingFromPattern = false;+let isUpdatingFromFields = false;++// Watch for owner/repo/branch changes and update subject pattern+watch(+ () => [+ state.wif.owner,+ state.wif.repo,+ state.wif.branch,+ state.wif.providerType,+ state.wif.refType,+ ],+ () => {+ if (isUpdatingFromPattern) return;+ isUpdatingFromFields = true;+ state.wif.subjectPattern = computedSubjectPattern.value;+ isUpdatingFromFields = false;+ },+ { immediate: true }+);++// Watch for subject pattern changes and update fields (reverse binding)+watch(+ () => state.wif.subjectPattern,+ (newPattern) => {+ if (isUpdatingFromFields) return;+ const parsed = parseSubjectPattern(newPattern);+ if (parsed) {+ isUpdatingFromPattern = true;+ 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;+ }+ isUpdatingFromPattern = false;+ }+ }+);++const allowConfirm = computed(() => {+ if (!state.wif.emailPrefix && !state.workloadIdentity.email) {+ return false;+ }+ if (!state.wif.owner) {+ return false;+ }+ if (!state.wif.issuerUrl) {+ return false;+ }+ return true;+});++const updateProjectIamPolicyForMember = async (+ projectName: string,+ member: string,+ roles: string[]+) => {+ const policy = cloneDeep(+ projectIamPolicyStore.getProjectIamPolicy(projectName)+ );++ // Remove member from all existing bindings+ for (const binding of policy.bindings) {+ binding.members = binding.members.filter((m) => m !== member);+ }++ // Remove empty bindings+ policy.bindings = policy.bindings.filter(+ (binding) => binding.members.length > 0+ );++ // Add member to new role bindings+ for (const role of roles) {+ const existingBinding = policy.bindings.find((b) => b.role === role);+ if (existingBinding) {+ if (!existingBinding.members.includes(member)) {+ existingBinding.members.push(member);+ }+ } else {+ policy.bindings.push({+ role,+ members: [member],+ condition: undefined,+ parsedExpr: undefined,+ } as Binding);+ }+ }++ await projectIamPolicyStore.updateProjectIamPolicy(projectName, policy);+};++const createOrUpdateWorkloadIdentity = async () => {+ state.isRequesting = true;+ try {+ if (isEditMode.value) {+ await updateWorkloadIdentity();+ } else {+ await createWorkloadIdentity();+ }+ } catch {+ // nothing+ } finally {+ state.isRequesting = false;+ }+};++const createWorkloadIdentity = async () => {+ const emailPrefix = state.workloadIdentity.email.split("@")[0];+ const wi = await workloadIdentityStore.createWorkloadIdentity(+ emailPrefix,+ {+ title: state.workloadIdentity.title || emailPrefix,+ workloadIdentityConfig: create(WorkloadIdentityConfigSchema, {+ providerType: state.wif.providerType,+ issuerUrl: state.wif.issuerUrl,+ allowedAudiences: state.wif.audience ? [state.wif.audience] : [],+ subjectPattern: state.wif.subjectPattern,+ }),+ },+ parent.value+ );+ const createdUser = workloadIdentityToUser(wi);++ if (state.roles.length > 0) {+ if (props.projectId && project.value) {+ await updateProjectIamPolicyForMember(+ project.value.name,+ getWorkloadIdentityNameInBinding(createdUser.email),+ state.roles+ );+ } else {+ await workspaceStore.patchIamPolicy([+ {+ member: getWorkloadIdentityNameInBinding(createdUser.email),+ roles: state.roles,+ },+ ]);+ }+ }+ emit("created", createdUser);+ pushNotification({+ module: "bytebase",+ style: "SUCCESS",+ title: t("common.created"),+ });+ emit("close");+};++const updateWorkloadIdentity = async () => {+ const wi = props.workloadIdentity;+ if (!wi) {+ return;+ }++ const updateMask: string[] = [];+ if (state.workloadIdentity.title !== wi.title) {+ updateMask.push("title");+ }++ let updatedUser: User = wi;++ const updated = await workloadIdentityStore.updateWorkloadIdentity(+ {+ name: ensureWorkloadIdentityFullName(wi.email),+ title: state.workloadIdentity.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(updated);++ if (!isEqual([...initialRoles.value].sort(), [...state.roles].sort())) {+ if (props.projectId && project.value) {+ await updateProjectIamPolicyForMember(+ project.value.name,+ getWorkloadIdentityNameInBinding(updatedUser.email),+ state.roles+ );+ } else {+ await workspaceStore.patchIamPolicy([+ {+ member: getWorkloadIdentityNameInBinding(updatedUser.email),+ 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/ServiceAccountPanel.vue b/frontend/src/components/User/Settings/ServiceAccountPanel.vuenew file mode 100644index 0000000000..0426c7b633--- /dev/null+++ b/frontend/src/components/User/Settings/ServiceAccountPanel.vue@@ -0,0 +1,263 @@+<template>+ <div class="w-full overflow-x-hidden flex flex-col gap-y-4 pb-4">+ <div class="flex justify-between items-center">+ <div class="flex items-center gap-x-2">+ <p class="text-lg font-medium leading-7 text-main">+ <span>{{ $t("settings.members.service-accounts") }}</span>+ <span v-if="showCount" class="ml-1 font-normal text-control-light">+ ({{ activeServiceAccountCount }})+ </span>+ </p>+ </div>++ <PermissionGuardWrapper+ v-slot="slotProps"+ :permissions="['bb.serviceAccounts.create']"+ :project="project"+ >+ <NButton+ type="primary"+ class="capitalize"+ :disabled="slotProps.disabled || !allowEdit"+ @click="handleCreateServiceAccount"+ >+ <template #icon>+ <PlusIcon class="h-5 w-5" />+ </template>+ {{ $t("settings.members.add-service-account") }}+ </NButton>+ </PermissionGuardWrapper>+ </div>++ <ComponentPermissionGuard+ :permissions="['bb.serviceAccounts.list']"+ :project="project"+ >+ <PagedTable+ ref="serviceAccountPagedTable"+ :session-key="sessionKey"+ :fetch-list="fetchServiceAccountList"+ >+ <template #table="{ list, loading }">+ <UserDataTable+ :show-roles="false"+ :show-groups="false"+ :user-list="list"+ :loading="loading"+ @user-selected="handleServiceAccountSelected"+ @user-updated="handleServiceAccountUpdated"+ />+ </template>+ </PagedTable>+ </ComponentPermissionGuard>++ <div>+ <NCheckbox v-model:checked="state.showInactiveList">+ <span class="textinfolabel">+ {{ $t("settings.members.show-inactive") }}+ </span>+ </NCheckbox>++ <template v-if="state.showInactiveList">+ <div class="flex justify-between items-center mt-2 mb-4">+ <p class="text-lg font-medium leading-7">+ <span>{{ $t("settings.members.inactive-service-accounts") }}</span>+ </p>+ </div>++ <PagedTable+ ref="deletedServiceAccountPagedTable"+ :session-key="deletedSessionKey"+ :fetch-list="fetchInactiveServiceAccountList"+ >+ <template #table="{ list, loading }">+ <UserDataTable+ :loading="loading"+ :show-roles="false"+ :show-groups="false"+ :user-list="list"+ @user-updated="handleServiceAccountRestore"+ />+ </template>+ </PagedTable>+ </template>+ </div>+ </div>++ <CreateServiceAccountDrawer+ v-if="state.showCreateDrawer"+ :service-account="state.editingServiceAccount"+ :project-id="projectId"+ @close="+ () => {+ state.showCreateDrawer = false;+ state.editingServiceAccount = undefined;+ }+ "+ @created="handleServiceAccountUpdated"+ @updated="handleServiceAccountUpdated"+ />+</template>++<script setup lang="ts">+import { PlusIcon } from "lucide-vue-next";+import { NButton, NCheckbox } from "naive-ui";+import { computed, reactive, ref } from "vue";+import type { ComponentExposed } from "vue-component-type-helpers";+import ComponentPermissionGuard from "@/components/Permission/ComponentPermissionGuard.vue";+import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrapper.vue";+import CreateServiceAccountDrawer from "@/components/User/Settings/CreateServiceAccountDrawer.vue";+import UserDataTable from "@/components/User/Settings/UserDataTable/index.vue";+import PagedTable from "@/components/v2/Model/PagedTable.vue";+import { useActuatorV1Store, useProjectByName } from "@/store";+import {+ serviceAccountToUser,+ useServiceAccountStore,+} from "@/store/modules/serviceAccount";+import { projectNamePrefix } from "@/store/modules/v1/common";+import { DEFAULT_PROJECT_NAME, unknownUser } from "@/types";+import { State } from "@/types/proto-es/v1/common_pb";+import type { User } from "@/types/proto-es/v1/user_service_pb";+import { UserType } from "@/types/proto-es/v1/user_service_pb";+import { hasProjectPermissionV2 } from "@/utils";++const props = defineProps<{+ projectId?: string;+}>();++type LocalState = {+ showInactiveList: boolean;+ showCreateDrawer: boolean;+ editingServiceAccount?: User;+};++const state = reactive<LocalState>({+ showInactiveList: false,+ showCreateDrawer: false,+});++const serviceAccountStore = useServiceAccountStore();+const actuatorStore = useActuatorV1Store();+const serviceAccountPagedTable =+ ref<ComponentExposed<typeof PagedTable<User>>>();+const deletedServiceAccountPagedTable =+ ref<ComponentExposed<typeof PagedTable<User>>>();++const { project } = useProjectByName(+ computed(() =>+ props.projectId ? `${projectNamePrefix}${props.projectId}` : ""+ )+);++const showCount = computed(() => !props.projectId);++const sessionKey = computed(() =>+ props.projectId+ ? `bb.paged-service-account-table.project.${props.projectId}.active`+ : "bb.paged-service-account-table.active"+);++const deletedSessionKey = computed(() =>+ props.projectId+ ? `bb.paged-service-account-table.project.${props.projectId}.deleted`+ : "bb.paged-service-account-table.deleted"+);++const parent = computed(() =>+ props.projectId ? `projects/${props.projectId}` : undefined+);++const allowEdit = computed(() => {+ if (!props.projectId) {+ return true;+ }+ if (project.value.name === DEFAULT_PROJECT_NAME) {+ return false;+ }+ if (project.value.state === State.DELETED) {+ return false;+ }+ return hasProjectPermissionV2(project.value, "bb.serviceAccounts.create");+});++const fetchServiceAccountList = async ({+ pageToken,+ pageSize,+}: {+ pageToken: string;+ pageSize: number;+}) => {+ const response = await serviceAccountStore.listServiceAccounts({+ parent: parent.value,+ pageSize,+ pageToken,+ showDeleted: false,+ });+ const users: User[] = response.serviceAccounts.map(serviceAccountToUser);+ return { list: users, nextPageToken: response.nextPageToken };+};++const fetchInactiveServiceAccountList = async ({+ pageToken,+ pageSize,+}: {+ pageToken: string;+ pageSize: number;+}) => {+ const response = await serviceAccountStore.listServiceAccounts({+ parent: parent.value,+ pageSize,+ pageToken,+ showDeleted: true,+ filter: {+ state: State.DELETED,+ },+ });+ const users: User[] = response.serviceAccounts.map(serviceAccountToUser);+ return { list: users, nextPageToken: response.nextPageToken };+};++const activeServiceAccountCount = computed(() => {+ return actuatorStore.countUser({+ state: State.ACTIVE,+ userTypes: [UserType.SERVICE_ACCOUNT],+ });+});++const handleCreateServiceAccount = () => {+ state.editingServiceAccount = {+ ...unknownUser(),+ userType: UserType.SERVICE_ACCOUNT,+ title: "",+ };+ state.showCreateDrawer = true;+};++const handleServiceAccountSelected = (user: User) => {+ state.editingServiceAccount = user;+ state.showCreateDrawer = true;+};++const handleServiceAccountUpdated = (user: User) => {+ if (user.state === State.DELETED) {+ return handleServiceAccountArchived(user);+ }+ return serviceAccountPagedTable.value?.updateCache([user]);+};++const handleServiceAccountRestore = (user: User) => {+ if (user.state !== State.ACTIVE) {+ return;+ }+ deletedServiceAccountPagedTable.value?.removeCache(user);+ serviceAccountPagedTable.value?.refresh();+};++const handleServiceAccountArchived = (user: User) => {+ if (user.state !== State.DELETED) {+ return;+ }+ serviceAccountPagedTable.value?.removeCache(user);+ deletedServiceAccountPagedTable.value?.refresh();+};+</script>diff --git a/frontend/src/components/User/Settings/UserDataTable/index.vue b/frontend/src/components/User/Settings/UserDataTable/index.vueindex c9792164f0..4bcc1a6f22 100644--- a/frontend/src/components/User/Settings/UserDataTable/index.vue+++ b/frontend/src/components/User/Settings/UserDataTable/index.vue@@ -54,12 +54,18 @@ defineOptions({name: "UserDataTable",});-const props = defineProps<{- showRoles: boolean;- userList: User[];- loading: boolean;- keyword?: string;-}>();+const props = withDefaults(+ defineProps<{+ showRoles: boolean;+ showGroups?: boolean;+ userList: User[];+ loading: boolean;+ keyword?: string;+ }>(),+ {+ showGroups: true,+ }+);const emit = defineEmits<{(event: "user-updated", user: User): void;@@ -122,6 +128,7 @@ const columns = computed(() => {key: "groups",title: t("settings.members.table.groups"),resizable: true,+ hide: !props.showGroups,render: (user: User) => {return h(GroupsCell, {user,diff --git a/frontend/src/components/User/Settings/WorkloadIdentityPanel.vue b/frontend/src/components/User/Settings/WorkloadIdentityPanel.vuenew file mode 100644index 0000000000..f469596c05--- /dev/null+++ b/frontend/src/components/User/Settings/WorkloadIdentityPanel.vue@@ -0,0 +1,265 @@+<template>+ <div class="w-full overflow-x-hidden flex flex-col gap-y-4 pb-4">+ <div class="flex justify-between items-center">+ <div class="flex items-center gap-x-2">+ <p class="text-lg font-medium leading-7 text-main">+ <span>{{ $t("settings.members.workload-identities") }}</span>+ <span v-if="showCount" class="ml-1 font-normal text-control-light">+ ({{ activeWorkloadIdentityCount }})+ </span>+ </p>+ </div>++ <PermissionGuardWrapper+ v-slot="slotProps"+ :permissions="['bb.workloadIdentities.create']"+ :project="project"+ >+ <NButton+ type="primary"+ class="capitalize"+ :disabled="slotProps.disabled || !allowEdit"+ @click="handleCreateWorkloadIdentity"+ >+ <template #icon>+ <PlusIcon class="h-5 w-5" />+ </template>+ {{ $t("settings.members.add-workload-identity") }}+ </NButton>+ </PermissionGuardWrapper>+ </div>++ <ComponentPermissionGuard+ :permissions="['bb.workloadIdentities.list']"+ :project="project"+ >+ <PagedTable+ ref="workloadIdentityPagedTable"+ :session-key="sessionKey"+ :fetch-list="fetchWorkloadIdentityList"+ >+ <template #table="{ list, loading }">+ <UserDataTable+ :show-roles="false"+ :show-groups="false"+ :user-list="list"+ :loading="loading"+ @user-selected="handleWorkloadIdentitySelected"+ @user-updated="handleWorkloadIdentityUpdated"+ />+ </template>+ </PagedTable>+ </ComponentPermissionGuard>++ <div>+ <NCheckbox v-model:checked="state.showInactiveList">+ <span class="textinfolabel">+ {{ $t("settings.members.show-inactive") }}+ </span>+ </NCheckbox>++ <template v-if="state.showInactiveList">+ <div class="flex justify-between items-center mt-2 mb-4">+ <p class="text-lg font-medium leading-7">+ <span>{{+ $t("settings.members.inactive-workload-identities")+ }}</span>+ </p>+ </div>++ <PagedTable+ ref="deletedWorkloadIdentityPagedTable"+ :session-key="deletedSessionKey"+ :fetch-list="fetchInactiveWorkloadIdentityList"+ >+ <template #table="{ list, loading }">+ <UserDataTable+ :loading="loading"+ :show-roles="false"+ :show-groups="false"+ :user-list="list"+ @user-updated="handleWorkloadIdentityRestore"+ />+ </template>+ </PagedTable>+ </template>+ </div>+ </div>++ <CreateWorkloadIdentityDrawer+ v-if="state.showCreateDrawer"+ :workload-identity="state.editingWorkloadIdentity"+ :project-id="projectId"+ @close="+ () => {+ state.showCreateDrawer = false;+ state.editingWorkloadIdentity = undefined;+ }+ "+ @created="handleWorkloadIdentityUpdated"+ @updated="handleWorkloadIdentityUpdated"+ />+</template>++<script setup lang="ts">+import { PlusIcon } from "lucide-vue-next";+import { NButton, NCheckbox } from "naive-ui";+import { computed, reactive, ref } from "vue";+import type { ComponentExposed } from "vue-component-type-helpers";+import ComponentPermissionGuard from "@/components/Permission/ComponentPermissionGuard.vue";+import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrapper.vue";+import CreateWorkloadIdentityDrawer from "@/components/User/Settings/CreateWorkloadIdentityDrawer.vue";+import UserDataTable from "@/components/User/Settings/UserDataTable/index.vue";+import PagedTable from "@/components/v2/Model/PagedTable.vue";+import { useActuatorV1Store, useProjectByName } from "@/store";+import { projectNamePrefix } from "@/store/modules/v1/common";+import {+ useWorkloadIdentityStore,+ workloadIdentityToUser,+} from "@/store/modules/workloadIdentity";+import { DEFAULT_PROJECT_NAME, unknownUser } from "@/types";+import { State } from "@/types/proto-es/v1/common_pb";+import type { User } from "@/types/proto-es/v1/user_service_pb";+import { UserType } from "@/types/proto-es/v1/user_service_pb";+import { hasProjectPermissionV2 } from "@/utils";++const props = defineProps<{+ projectId?: string;+}>();++type LocalState = {+ showInactiveList: boolean;+ showCreateDrawer: boolean;+ editingWorkloadIdentity?: User;+};++const state = reactive<LocalState>({+ showInactiveList: false,+ showCreateDrawer: false,+});++const workloadIdentityStore = useWorkloadIdentityStore();+const actuatorStore = useActuatorV1Store();+const workloadIdentityPagedTable =+ ref<ComponentExposed<typeof PagedTable<User>>>();+const deletedWorkloadIdentityPagedTable =+ ref<ComponentExposed<typeof PagedTable<User>>>();++const { project } = useProjectByName(+ computed(() =>+ props.projectId ? `${projectNamePrefix}${props.projectId}` : ""+ )+);++const showCount = computed(() => !props.projectId);++const sessionKey = computed(() =>+ props.projectId+ ? `bb.paged-workload-identity-table.project.${props.projectId}.active`+ : "bb.paged-workload-identity-table.active"+);++const deletedSessionKey = computed(() =>+ props.projectId+ ? `bb.paged-workload-identity-table.project.${props.projectId}.deleted`+ : "bb.paged-workload-identity-table.deleted"+);++const parent = computed(() =>+ props.projectId ? `projects/${props.projectId}` : undefined+);++const allowEdit = computed(() => {+ if (!props.projectId) {+ return true;+ }+ if (project.value.name === DEFAULT_PROJECT_NAME) {+ return false;+ }+ if (project.value.state === State.DELETED) {+ return false;+ }+ return hasProjectPermissionV2(project.value, "bb.workloadIdentities.create");+});++const fetchWorkloadIdentityList = async ({+ pageToken,+ pageSize,+}: {+ pageToken: string;+ pageSize: number;+}) => {+ const response = await workloadIdentityStore.listWorkloadIdentities({+ parent: parent.value,+ pageSize,+ pageToken,+ showDeleted: false,+ });+ const users: User[] = response.workloadIdentities.map(workloadIdentityToUser);+ return { list: users, nextPageToken: response.nextPageToken };+};++const fetchInactiveWorkloadIdentityList = async ({+ pageToken,+ pageSize,+}: {+ pageToken: string;+ pageSize: number;+}) => {+ const response = await workloadIdentityStore.listWorkloadIdentities({+ parent: parent.value,+ pageSize,+ pageToken,+ showDeleted: true,+ filter: {+ state: State.DELETED,+ },+ });+ const users: User[] = response.workloadIdentities.map(workloadIdentityToUser);+ return { list: users, nextPageToken: response.nextPageToken };+};++const activeWorkloadIdentityCount = computed(() => {+ return actuatorStore.countUser({+ state: State.ACTIVE,+ userTypes: [UserType.WORKLOAD_IDENTITY],+ });+});++const handleCreateWorkloadIdentity = () => {+ state.editingWorkloadIdentity = {+ ...unknownUser(),+ userType: UserType.WORKLOAD_IDENTITY,+ title: "",+ };+ state.showCreateDrawer = true;+};++const handleWorkloadIdentitySelected = (user: User) => {+ state.editingWorkloadIdentity = user;+ state.showCreateDrawer = true;+};++const handleWorkloadIdentityUpdated = (user: User) => {+ if (user.state === State.DELETED) {+ return handleWorkloadIdentityArchived(user);+ }+ return workloadIdentityPagedTable.value?.updateCache([user]);+};++const handleWorkloadIdentityRestore = (user: User) => {+ if (user.state !== State.ACTIVE) {+ return;+ }+ deletedWorkloadIdentityPagedTable.value?.removeCache(user);+ workloadIdentityPagedTable.value?.refresh();+};++const handleWorkloadIdentityArchived = (user: User) => {+ if (user.state !== State.DELETED) {+ return;+ }+ workloadIdentityPagedTable.value?.removeCache(user);+ deletedWorkloadIdentityPagedTable.value?.refresh();+};+</script>diff --git a/frontend/src/locales/en-US.json b/frontend/src/locales/en-US.jsonindex 4548e15607..6bac89cd9e 100644--- a/frontend/src/locales/en-US.json+++ b/frontend/src/locales/en-US.json@@ -455,8 +455,10 @@"members": {"service-accounts": "Service Accounts","add-service-account": "Add Service Account",+ "update-service-account": "Update Service Account","workload-identities": "Workload Identities","add-workload-identity": "Add Workload Identity",+ "update-workload-identity": "Update Workload Identity","inactive-users": "Inactive users","inactive-service-accounts": "Inactive service accounts","inactive-workload-identities": "Inactive workload identities",diff --git a/frontend/src/locales/es-ES.json b/frontend/src/locales/es-ES.jsonindex 5194461c35..1787b1748c 100644--- a/frontend/src/locales/es-ES.json+++ b/frontend/src/locales/es-ES.json@@ -455,8 +455,10 @@"members": {"service-accounts": "Cuentas de Servicio","add-service-account": "Añadir Cuenta de Servicio",+ "update-service-account": "Actualizar Cuenta de Servicio","workload-identities": "Identidades de Carga de Trabajo","add-workload-identity": "Añadir Identidad de Carga de Trabajo",+ "update-workload-identity": "Actualizar Identidad de Carga de Trabajo","inactive-users": "Usuarios inactivos","inactive-service-accounts": "Cuentas de servicio inactivas","inactive-workload-identities": "Identidades de carga de trabajo inactivas",diff --git a/frontend/src/locales/ja-JP.json b/frontend/src/locales/ja-JP.jsonindex 4cfc4a86cc..bf8b6db44d 100644--- a/frontend/src/locales/ja-JP.json+++ b/frontend/src/locales/ja-JP.json@@ -455,8 +455,10 @@"members": {"service-accounts": "サービスアカウント","add-service-account": "サービスアカウントを追加",+ "update-service-account": "サービスアカウントを更新","workload-identities": "ワークロードID","add-workload-identity": "ワークロードIDを追加",+ "update-workload-identity": "ワークロードIDを更新","inactive-users": "非アクティブユーザー","inactive-service-accounts": "非アクティブサービスアカウント","inactive-workload-identities": "非アクティブワークロードID",diff --git a/frontend/src/locales/vi-VN.json b/frontend/src/locales/vi-VN.jsonindex 13d77d2e34..3a7527c107 100644--- a/frontend/src/locales/vi-VN.json+++ b/frontend/src/locales/vi-VN.json@@ -455,8 +455,10 @@"members": {"service-accounts": "Tài khoản dịch vụ","add-service-account": "Thêm tài khoản dịch vụ",+ "update-service-account": "Cập nhật tài khoản dịch vụ","workload-identities": "Danh tính Workload","add-workload-identity": "Thêm danh tính Workload",+ "update-workload-identity": "Cập nhật danh tính Workload","inactive-users": "Người dùng không hoạt động","inactive-service-accounts": "Tài khoản dịch vụ không hoạt động","inactive-workload-identities": "Danh tính Workload không hoạt động",diff --git a/frontend/src/locales/zh-CN.json b/frontend/src/locales/zh-CN.jsonindex 50be17c571..5cb03b9d19 100644--- a/frontend/src/locales/zh-CN.json+++ b/frontend/src/locales/zh-CN.json@@ -455,8 +455,10 @@"members": {"service-accounts": "服务账号","add-service-account": "添加服务账号",+ "update-service-account": "更新服务账号","workload-identities": "工作负载身份","add-workload-identity": "添加工作负载身份",+ "update-workload-identity": "更新工作负载身份","inactive-users": "未激活用户","inactive-service-accounts": "未激活服务账号","inactive-workload-identities": "未激活工作负载身份",diff --git a/frontend/src/router/dashboard/projectV1.ts b/frontend/src/router/dashboard/projectV1.tsindex f2de59ef8e..5d3e6c3e67 100644--- a/frontend/src/router/dashboard/projectV1.ts+++ b/frontend/src/router/dashboard/projectV1.ts@@ -25,6 +25,8 @@ export const PROJECT_V1_ROUTE_WEBHOOKS = `${PROJECT_V1_ROUTE_DASHBOARD}.webhook`export const PROJECT_V1_ROUTE_WEBHOOK_CREATE = `${PROJECT_V1_ROUTE_DASHBOARD}.webhook.create`;export const PROJECT_V1_ROUTE_WEBHOOK_DETAIL = `${PROJECT_V1_ROUTE_DASHBOARD}.webhook.detail`;export const PROJECT_V1_ROUTE_MEMBERS = `${PROJECT_V1_ROUTE_DASHBOARD}.members`;+export const PROJECT_V1_ROUTE_SERVICE_ACCOUNTS = `${PROJECT_V1_ROUTE_DASHBOARD}.service-accounts`;+export const PROJECT_V1_ROUTE_WORKLOAD_IDENTITIES = `${PROJECT_V1_ROUTE_DASHBOARD}.workload-identities`;export const PROJECT_V1_ROUTE_SETTINGS = `${PROJECT_V1_ROUTE_DASHBOARD}.settings`;export const PROJECT_V1_ROUTE_EXPORT_CENTER = `${PROJECT_V1_ROUTE_DASHBOARD}.export-center`;export const PROJECT_V1_ROUTE_RELEASES = `${PROJECT_V1_ROUTE_DASHBOARD}.release`;@@ -329,6 +331,28 @@ const projectV1Routes: RouteRecordRaw[] = [component: () => import("@/views/project/ProjectMemberDashboard.vue"),props: true,},+ {+ path: "service-accounts",+ name: PROJECT_V1_ROUTE_SERVICE_ACCOUNTS,+ meta: {+ title: () => t("settings.members.service-accounts"),+ requiredPermissionList: () => ["bb.serviceAccounts.list"],+ },+ component: () =>+ import("@/views/project/ProjectServiceAccountDashboard.vue"),+ props: true,+ },+ {+ path: "workload-identities",+ name: PROJECT_V1_ROUTE_WORKLOAD_IDENTITIES,+ meta: {+ title: () => t("settings.members.workload-identities"),+ requiredPermissionList: () => ["bb.workloadIdentities.list"],+ },+ component: () =>+ import("@/views/project/ProjectWorkloadIdentityDashboard.vue"),+ props: true,+ },{path: "settings",name: PROJECT_V1_ROUTE_SETTINGS,diff --git a/frontend/src/router/dashboard/workspace.ts b/frontend/src/router/dashboard/workspace.tsindex 16276124a9..77a3f1ebb5 100644--- a/frontend/src/router/dashboard/workspace.ts+++ b/frontend/src/router/dashboard/workspace.ts@@ -22,11 +22,13 @@ import {WORKSPACE_ROUTE_RISK_CENTER,WORKSPACE_ROUTE_ROLES,WORKSPACE_ROUTE_SEMANTIC_TYPES,+ WORKSPACE_ROUTE_SERVICE_ACCOUNTS,WORKSPACE_ROUTE_SQL_REVIEW,WORKSPACE_ROUTE_SQL_REVIEW_CREATE,WORKSPACE_ROUTE_SQL_REVIEW_DETAIL,WORKSPACE_ROUTE_USER_PROFILE,WORKSPACE_ROUTE_USERS,+ WORKSPACE_ROUTE_WORKLOAD_IDENTITIES,} from "./workspaceRoutes";const rootRoute: RouteRecordRaw = {@@ -288,6 +290,27 @@ const workspaceRoutes: RouteRecordRaw[] = [component: () => import("@/views/SettingWorkspaceUsers.vue"),props: true,},+ {+ path: "service-accounts",+ name: WORKSPACE_ROUTE_SERVICE_ACCOUNTS,+ meta: {+ title: () => t("settings.members.service-accounts"),+ requiredPermissionList: () => ["bb.serviceAccounts.list"],+ },+ component: () => import("@/views/SettingWorkspaceServiceAccounts.vue"),+ props: true,+ },+ {+ path: "workload-identities",+ name: WORKSPACE_ROUTE_WORKLOAD_IDENTITIES,+ meta: {+ title: () => t("settings.members.workload-identities"),+ requiredPermissionList: () => ["bb.workloadIdentities.list"],+ },+ component: () =>+ import("@/views/SettingWorkspaceWorkloadIdentities.vue"),+ props: true,+ },{path: "members",name: WORKSPACE_ROUTE_MEMBERS,diff --git a/frontend/src/router/dashboard/workspaceRoutes.ts b/frontend/src/router/dashboard/workspaceRoutes.tsindex 97295bc7e9..3f4319fd49 100644--- a/frontend/src/router/dashboard/workspaceRoutes.ts+++ b/frontend/src/router/dashboard/workspaceRoutes.ts@@ -21,6 +21,9 @@ export const WORKSPACE_ROUTE_DATA_CLASSIFICATION ="workspace.data-classification";export const WORKSPACE_ROUTE_AUDIT_LOG = "workspace.audit-log";export const WORKSPACE_ROUTE_USERS = "workspace.users";+export const WORKSPACE_ROUTE_SERVICE_ACCOUNTS = "workspace.service-accounts";+export const WORKSPACE_ROUTE_WORKLOAD_IDENTITIES =+ "workspace.workload-identities";export const WORKSPACE_ROUTE_MEMBERS = "workspace.members";export const WORKSPACE_ROUTE_ROLES = "workspace.roles";diff --git a/frontend/src/store/modules/serviceAccount.ts b/frontend/src/store/modules/serviceAccount.tsindex 731f78ff89..d03dbfbd6b 100644--- a/frontend/src/store/modules/serviceAccount.ts+++ b/frontend/src/store/modules/serviceAccount.ts@@ -50,17 +50,20 @@ export const useServiceAccountStore = defineStore("serviceAccount", () => {const cacheByName = ref<Map<string, ServiceAccount>>(new Map());const listServiceAccounts = async ({+ parent,pageSize,pageToken,showDeleted,filter,}: {+ parent?: string;pageSize: number;pageToken: string | undefined;showDeleted: boolean;filter?: AccountFilter;}) => {const request = create(ListServiceAccountsRequestSchema, {+ parent: parent ?? "",pageSize,pageToken,showDeleted,@@ -104,9 +107,11 @@ export const useServiceAccountStore = defineStore("serviceAccount", () => {const createServiceAccount = async (serviceAccountId: string,- serviceAccount: Partial<ServiceAccount>+ serviceAccount: Partial<ServiceAccount>,+ parent?: string) => {const request = create(CreateServiceAccountRequestSchema, {+ parent: parent ?? "",serviceAccountId,serviceAccount: create(ServiceAccountSchema,diff --git a/frontend/src/store/modules/workloadIdentity.ts b/frontend/src/store/modules/workloadIdentity.tsindex 059022a0fa..3f0925202e 100644--- a/frontend/src/store/modules/workloadIdentity.ts+++ b/frontend/src/store/modules/workloadIdentity.ts@@ -37,17 +37,20 @@ export const useWorkloadIdentityStore = defineStore("workloadIdentity", () => {const cacheByName = ref<Map<string, WorkloadIdentity>>(new Map());const listWorkloadIdentities = async ({+ parent,pageSize,pageToken,showDeleted,filter,}: {+ parent?: string;pageSize: number;pageToken: string | undefined;showDeleted: boolean;filter?: AccountFilter;}) => {const request = create(ListWorkloadIdentitiesRequestSchema, {+ parent: parent ?? "",pageSize,pageToken,showDeleted,@@ -94,9 +97,11 @@ export const useWorkloadIdentityStore = defineStore("workloadIdentity", () => {const createWorkloadIdentity = async (workloadIdentityId: string,- workloadIdentity: Partial<WorkloadIdentity>+ workloadIdentity: Partial<WorkloadIdentity>,+ parent?: string) => {const request = create(CreateWorkloadIdentityRequestSchema, {+ parent: parent ?? "",workloadIdentityId,workloadIdentity: create(WorkloadIdentitySchema,diff --git a/frontend/src/types/v1/user.ts b/frontend/src/types/v1/user.tsindex 649edf4ac8..4befee53fe 100644--- a/frontend/src/types/v1/user.ts+++ b/frontend/src/types/v1/user.ts@@ -63,6 +63,20 @@ export const getServiceAccountNameInBinding = (email: string) => {export const workloadIdentitySuffix = "workload.bytebase.com";export const workloadIdentityBindingPrefix = "workloadIdentity:";+export const getServiceAccountSuffix = (projectId?: string) => {+ if (projectId) {+ return `${projectId}.service.bytebase.com`;+ }+ return serviceAccountSuffix;+};++export const getWorkloadIdentitySuffix = (projectId?: string) => {+ if (projectId) {+ return `${projectId}.workload.bytebase.com`;+ }+ return workloadIdentitySuffix;+};+export const getWorkloadIdentityNameInBinding = (name: string) => {return `${workloadIdentityBindingPrefix}${name}`;};diff --git a/frontend/src/utils/useDashboardSidebar.ts b/frontend/src/utils/useDashboardSidebar.tsindex ce08213041..eecf670330 100644--- a/frontend/src/utils/useDashboardSidebar.ts+++ b/frontend/src/utils/useDashboardSidebar.ts@@ -31,9 +31,11 @@ import {WORKSPACE_ROUTE_RISK_CENTER,WORKSPACE_ROUTE_ROLES,WORKSPACE_ROUTE_SEMANTIC_TYPES,+ WORKSPACE_ROUTE_SERVICE_ACCOUNTS,WORKSPACE_ROUTE_SQL_REVIEW,WORKSPACE_ROUTE_USER_PROFILE,WORKSPACE_ROUTE_USERS,+ WORKSPACE_ROUTE_WORKLOAD_IDENTITIES,} from "@/router/dashboard/workspaceRoutes";import {SETTING_ROUTE_WORKSPACE_GENERAL,@@ -126,6 +128,16 @@ export const useDashboardSidebar = () => {name: WORKSPACE_ROUTE_USERS,type: "route",},+ {+ title: t("settings.members.service-accounts"),+ name: WORKSPACE_ROUTE_SERVICE_ACCOUNTS,+ type: "route",+ },+ {+ title: t("settings.members.workload-identities"),+ name: WORKSPACE_ROUTE_WORKLOAD_IDENTITIES,+ type: "route",+ },{title: t("settings.sidebar.members"),name: WORKSPACE_ROUTE_MEMBERS,diff --git a/frontend/src/views/SettingWorkspaceServiceAccounts.vue b/frontend/src/views/SettingWorkspaceServiceAccounts.vuenew file mode 100644index 0000000000..70fa566243--- /dev/null+++ b/frontend/src/views/SettingWorkspaceServiceAccounts.vue@@ -0,0 +1,7 @@+<template>+ <ServiceAccountPanel />+</template>++<script setup lang="ts">+import ServiceAccountPanel from "@/components/User/Settings/ServiceAccountPanel.vue";+</script>diff --git a/frontend/src/views/SettingWorkspaceUsers.vue b/frontend/src/views/SettingWorkspaceUsers.vueindex e4f8d72b63..0dd8ac9130 100644--- a/frontend/src/views/SettingWorkspaceUsers.vue+++ b/frontend/src/views/SettingWorkspaceUsers.vue@@ -42,72 +42,6 @@</ComponentPermissionGuard></NTabPane>- <NTabPane name="SERVICE_ACCOUNTS">- <template #tab>- <div class="flex-1 flex gap-x-2">- <p class="text-base font-medium leading-7 text-main">- <span>{{ $t("settings.members.service-accounts") }}</span>- <span class="ml-1 font-normal text-control-light">- ({{ activeServiceAccountCount }})- </span>- </p>- </div>- </template>-- <ComponentPermissionGuard- :permissions="['bb.serviceAccounts.list']"- >- <PagedTable- ref="serviceAccountPagedTable"- session-key="bb.paged-service-account-table.active"- :fetch-list="fetchServiceAccountList"- >- <template #table="{ list, loading }">- <UserDataTable- :show-roles="false"- :user-list="list"- :loading="loading"- @user-selected="handleUserSelected"- @user-updated="handleUserUpdated"- />- </template>- </PagedTable>- </ComponentPermissionGuard>- </NTabPane>-- <NTabPane name="WORKLOAD_IDENTITIES">- <template #tab>- <div class="flex-1 flex gap-x-2">- <p class="text-base font-medium leading-7 text-main">- <span>{{ $t("settings.members.workload-identities") }}</span>- <span class="ml-1 font-normal text-control-light">- ({{ activeWorkloadIdentityCount }})- </span>- </p>- </div>- </template>-- <ComponentPermissionGuard- :permissions="['bb.workloadIdentities.list']"- >- <PagedTable- ref="workloadIdentityPagedTable"- session-key="bb.paged-workload-identity-table.active"- :fetch-list="fetchWorkloadIdentityList"- >- <template #table="{ list, loading }">- <UserDataTable- :show-roles="false"- :user-list="list"- :loading="loading"- @user-selected="handleUserSelected"- @user-updated="handleUserUpdated"- />- </template>- </PagedTable>- </ComponentPermissionGuard>- </NTabPane>-<NTabPane name="GROUPS"><template #tab><div>@@ -185,46 +119,6 @@</PermissionGuardWrapper></template>- <!-- SERVICE_ACCOUNTS tab actions -->- <template v-if="state.typeTab === 'SERVICE_ACCOUNTS'">- <PermissionGuardWrapper- v-slot="slotProps"- :permissions="['bb.serviceAccounts.create']"- >- <NButton- type="primary"- class="capitalize"- :disabled="slotProps.disabled"- @click="() => handleCreateUser(UserType.SERVICE_ACCOUNT)"- >- <template #icon>- <PlusIcon class="h-5 w-5" />- </template>- {{ $t(`settings.members.add-service-account`) }}- </NButton>- </PermissionGuardWrapper>- </template>-- <!-- WORKLOAD_IDENTITIES tab actions -->- <template v-if="state.typeTab === 'WORKLOAD_IDENTITIES'">- <PermissionGuardWrapper- v-slot="slotProps"- :permissions="['bb.workloadIdentities.create']"- >- <NButton- type="primary"- class="capitalize"- :disabled="slotProps.disabled"- @click="() => handleCreateUser(UserType.WORKLOAD_IDENTITY)"- >- <template #icon>- <PlusIcon class="h-5 w-5" />- </template>- {{ $t(`settings.members.add-workload-identity`) }}- </NButton>- </PermissionGuardWrapper>- </template>-<!-- GROUPS tab actions --><template v-if="state.typeTab === 'GROUPS'"><SearchBox@@ -331,71 +225,6 @@</template></div>- <!-- Inactive service accounts section for SERVICE_ACCOUNTS tab -->- <div v-if="state.typeTab === 'SERVICE_ACCOUNTS' && hasListPermission">- <NCheckbox v-model:checked="state.showInactiveServiceAccountList">- <span class="textinfolabel">- {{ $t("settings.members.show-inactive") }}- </span>- </NCheckbox>-- <template v-if="state.showInactiveServiceAccountList">- <div class="flex justify-between items-center mt-2 mb-4">- <p class="text-lg font-medium leading-7">- <span>{{ $t("settings.members.inactive-service-accounts") }}</span>- </p>- </div>-- <PagedTable- ref="deletedServiceAccountPagedTable"- session-key="bb.paged-service-account-table.deleted"- :fetch-list="fetchInactiveServiceAccountList"- >- <template #table="{ list, loading }">- <UserDataTable- :loading="loading"- :show-roles="false"- :user-list="list"- @user-updated="handleUserRestore"- />- </template>- </PagedTable>- </template>- </div>-- <!-- Inactive workload identities section for WORKLOAD_IDENTITIES tab -->- <div v-if="state.typeTab === 'WORKLOAD_IDENTITIES' && hasListPermission">- <NCheckbox v-model:checked="state.showInactiveWorkloadIdentityList">- <span class="textinfolabel">- {{ $t("settings.members.show-inactive") }}- </span>- </NCheckbox>-- <template v-if="state.showInactiveWorkloadIdentityList">- <div class="flex justify-between items-center mt-2 mb-4">- <p class="text-lg font-medium leading-7">- <span>{{- $t("settings.members.inactive-workload-identities")- }}</span>- </p>- </div>-- <PagedTable- ref="deletedWorkloadIdentityPagedTable"- session-key="bb.paged-workload-identity-table.deleted"- :fetch-list="fetchInactiveWorkloadIdentityList"- >- <template #table="{ list, loading }">- <UserDataTable- :loading="loading"- :show-roles="false"- :user-list="list"- @user-updated="handleUserRestore"- />- </template>- </PagedTable>- </template>- </div></div><CreateUserDrawer@@ -457,15 +286,7 @@ import {useUIStateStore,useUserStore,} from "@/store";-import {- serviceAccountToUser,- useServiceAccountStore,-} from "@/store/modules/serviceAccount";import { groupNamePrefix } from "@/store/modules/v1/common";-import {- useWorkloadIdentityStore,- workloadIdentityToUser,-} from "@/store/modules/workloadIdentity";import { unknownUser } from "@/types";import { State } from "@/types/proto-es/v1/common_pb";import type { Group } from "@/types/proto-es/v1/group_service_pb";@@ -473,12 +294,7 @@ import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";import { type User, UserType } from "@/types/proto-es/v1/user_service_pb";import { hasWorkspacePermissionV2 } from "@/utils";-const tabList = [- "USERS",- "SERVICE_ACCOUNTS",- "WORKLOAD_IDENTITIES",- "GROUPS",-] as const;+const tabList = ["USERS", "GROUPS"] as const;type MemberTab = (typeof tabList)[number];const isMemberTab = (tab: unknown): tab is MemberTab =>tabList.includes(tab as MemberTab);@@ -490,8 +306,6 @@ type LocalState = {activeGroupFilterText: string;inactiveUserFilterText: string;showInactiveUserList: boolean;- showInactiveServiceAccountList: boolean;- showInactiveWorkloadIdentityList: boolean;showCreateUserDrawer: boolean;showCreateGroupDrawer: boolean;showAadSyncDrawer: boolean;@@ -505,8 +319,6 @@ const state = reactive<LocalState>({activeGroupFilterText: "",inactiveUserFilterText: "",showInactiveUserList: false,- showInactiveServiceAccountList: false,- showInactiveWorkloadIdentityList: false,showCreateUserDrawer: false,showCreateGroupDrawer: false,showAadSyncDrawer: false,@@ -517,21 +329,11 @@ const route = useRoute();const router = useRouter();const userStore = useUserStore();const groupStore = useGroupStore();-const serviceAccountStore = useServiceAccountStore();-const workloadIdentityStore = useWorkloadIdentityStore();const uiStateStore = useUIStateStore();const actuatorStore = useActuatorV1Store();const settingV1Store = useSettingV1Store();const subscriptionV1Store = useSubscriptionV1Store();const userPagedTable = ref<ComponentExposed<typeof PagedTable<User>>>();-const serviceAccountPagedTable =- ref<ComponentExposed<typeof PagedTable<User>>>();-const workloadIdentityPagedTable =- ref<ComponentExposed<typeof PagedTable<User>>>();-const deletedServiceAccountPagedTable =- ref<ComponentExposed<typeof PagedTable<User>>>();-const deletedWorkloadIdentityPagedTable =- ref<ComponentExposed<typeof PagedTable<User>>>();const groupPagedTable = ref<ComponentExposed<typeof PagedTable<Group>>>();const deletedUserPagedTable = ref<ComponentExposed<typeof PagedTable<User>>>();const expandedKeys = ref<string[]>([]);@@ -559,13 +361,8 @@ watch();const hasListPermission = computed(() => {- switch (state.typeTab) {- case "USERS":- return hasWorkspacePermissionV2("bb.users.list");- case "SERVICE_ACCOUNTS":- return hasWorkspacePermissionV2("bb.serviceAccounts.list");- case "WORKLOAD_IDENTITIES":- return hasWorkspacePermissionV2("bb.workloadIdentities.list");+ if (state.typeTab === "USERS") {+ return hasWorkspacePermissionV2("bb.users.list");}return false;});@@ -605,76 +402,6 @@ const fetchUserList = async ({return { list: users, nextPageToken };};-const fetchServiceAccountList = async ({- pageToken,- pageSize,-}: {- pageToken: string;- pageSize: number;-}) => {- const response = await serviceAccountStore.listServiceAccounts({- pageSize,- pageToken,- showDeleted: false,- });- const users: User[] = response.serviceAccounts.map(serviceAccountToUser);- return { list: users, nextPageToken: response.nextPageToken };-};--const fetchWorkloadIdentityList = async ({- pageToken,- pageSize,-}: {- pageToken: string;- pageSize: number;-}) => {- const response = await workloadIdentityStore.listWorkloadIdentities({- pageSize,- pageToken,- showDeleted: false,- });- const users: User[] = response.workloadIdentities.map(workloadIdentityToUser);- return { list: users, nextPageToken: response.nextPageToken };-};--const fetchInactiveServiceAccountList = async ({- pageToken,- pageSize,-}: {- pageToken: string;- pageSize: number;-}) => {- const response = await serviceAccountStore.listServiceAccounts({- pageSize,- pageToken,- showDeleted: true,- filter: {- state: State.DELETED,- },- });- const users: User[] = response.serviceAccounts.map(serviceAccountToUser);- return { list: users, nextPageToken: response.nextPageToken };-};--const fetchInactiveWorkloadIdentityList = async ({- pageToken,- pageSize,-}: {- pageToken: string;- pageSize: number;-}) => {- const response = await workloadIdentityStore.listWorkloadIdentities({- pageSize,- pageToken,- showDeleted: true,- filter: {- state: State.DELETED,- },- });- const users: User[] = response.workloadIdentities.map(workloadIdentityToUser);- return { list: users, nextPageToken: response.nextPageToken };-};-const fetchInactiveUserList = async ({pageToken,pageSize,@@ -723,20 +450,6 @@ const activeUserCount = computed(() => {});});-const activeServiceAccountCount = computed(() => {- return actuatorStore.countUser({- state: State.ACTIVE,- userTypes: [UserType.SERVICE_ACCOUNT],- });-});--const activeWorkloadIdentityCount = computed(() => {- return actuatorStore.countUser({- state: State.ACTIVE,- userTypes: [UserType.WORKLOAD_IDENTITY],- });-});-const remainingUserCount = computed((): number => {return Math.max(0,@@ -772,20 +485,12 @@ const handleCreateGroup = () => {};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,- },- });- }+ router.push({+ name: WORKSPACE_ROUTE_USER_PROFILE,+ params: {+ principalEmail: user.email,+ },+ });};const handleGroupSelected = (group: Group) => {@@ -810,61 +515,23 @@ const handleUserUpdated = (user: User) => {if (user.state === State.DELETED) {return handleUserArchived(user);}-- switch (user.userType) {- case UserType.SERVICE_ACCOUNT:- return serviceAccountPagedTable.value?.updateCache([user]);- case UserType.WORKLOAD_IDENTITY:- return workloadIdentityPagedTable.value?.updateCache([user]);- default:- return userPagedTable.value?.updateCache([user]);- }+ return userPagedTable.value?.updateCache([user]);};const handleUserRestore = (user: User) => {if (user.state !== State.ACTIVE) {return;}- switch (user.userType) {- case UserType.SERVICE_ACCOUNT: {- deletedServiceAccountPagedTable.value?.removeCache(user);- serviceAccountPagedTable.value?.refresh();- break;- }- case UserType.WORKLOAD_IDENTITY: {- deletedWorkloadIdentityPagedTable.value?.removeCache(user);- workloadIdentityPagedTable.value?.refresh();- break;- }- default: {- deletedUserPagedTable.value?.removeCache(user);- userPagedTable.value?.updateCache([user]);- break;- }- }+ deletedUserPagedTable.value?.removeCache(user);+ userPagedTable.value?.updateCache([user]);};const handleUserArchived = (user: User) => {if (user.state !== State.DELETED) {return;}- switch (user.userType) {- case UserType.SERVICE_ACCOUNT: {- serviceAccountPagedTable.value?.removeCache(user);- deletedServiceAccountPagedTable.value?.refresh();- break;- }- case UserType.WORKLOAD_IDENTITY: {- workloadIdentityPagedTable.value?.removeCache(user);- deletedWorkloadIdentityPagedTable.value?.refresh();- break;- }- default: {- userPagedTable.value?.removeCache(user);- deletedUserPagedTable.value?.updateCache([user]);- break;- }- }+ userPagedTable.value?.removeCache(user);+ deletedUserPagedTable.value?.updateCache([user]);};const handleGroupUpdated = (group: Group) => {diff --git a/frontend/src/views/SettingWorkspaceWorkloadIdentities.vue b/frontend/src/views/SettingWorkspaceWorkloadIdentities.vuenew file mode 100644index 0000000000..b406ab2fdb--- /dev/null+++ b/frontend/src/views/SettingWorkspaceWorkloadIdentities.vue@@ -0,0 +1,7 @@+<template>+ <WorkloadIdentityPanel />+</template>++<script setup lang="ts">+import WorkloadIdentityPanel from "@/components/User/Settings/WorkloadIdentityPanel.vue";+</script>diff --git a/frontend/src/views/project/ProjectServiceAccountDashboard.vue b/frontend/src/views/project/ProjectServiceAccountDashboard.vuenew file mode 100644index 0000000000..061eb4fa3a--- /dev/null+++ b/frontend/src/views/project/ProjectServiceAccountDashboard.vue@@ -0,0 +1,11 @@+<template>+ <ServiceAccountPanel :project-id="projectId" />+</template>++<script setup lang="ts">+import ServiceAccountPanel from "@/components/User/Settings/ServiceAccountPanel.vue";++defineProps<{+ projectId: string;+}>();+</script>diff --git a/frontend/src/views/project/ProjectWorkloadIdentityDashboard.vue b/frontend/src/views/project/ProjectWorkloadIdentityDashboard.vuenew file mode 100644index 0000000000..fd20f43331--- /dev/null+++ b/frontend/src/views/project/ProjectWorkloadIdentityDashboard.vue@@ -0,0 +1,11 @@+<template>+ <WorkloadIdentityPanel :project-id="projectId" />+</template>++<script setup lang="ts">+import WorkloadIdentityPanel from "@/components/User/Settings/WorkloadIdentityPanel.vue";++defineProps<{+ projectId: string;+}>();+</script>