Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
chore(iam): user permission (#18805)
ecmadaoafd0b743bf77
diff --git a/backend/component/iam/acl.yaml b/backend/component/iam/acl.yamlindex 31361cdde0..6ce9f9f2d3 100644--- a/backend/component/iam/acl.yaml+++ b/backend/component/iam/acl.yaml@@ -228,6 +228,8 @@ roles:- bb.groups.create- bb.groups.get- bb.groups.list+ - bb.users.get+ - bb.users.list- bb.workspaces.getIamPolicy- name: roles/projectOwnertitle: Project owner@@ -293,6 +295,8 @@ roles:- bb.sql.explain- bb.sql.info- bb.sql.select+ - bb.users.get+ - bb.users.list- bb.taskRuns.list- bb.worksheets.get- name: roles/projectDeveloperdiff --git a/frontend/src/components/Member/MemberDataTable/index.vue b/frontend/src/components/Member/MemberDataTable/index.vueindex 26afa345bc..0dd6bdc9ac 100644--- a/frontend/src/components/Member/MemberDataTable/index.vue+++ b/frontend/src/components/Member/MemberDataTable/index.vue@@ -86,16 +86,11 @@ const onGroupLoad = async (row: DataTableRowData) => {return;}- await userStore.batchGetOrFetchUsers(+ const users = await userStore.batchGetOrFetchUsers(binding.group.members.map((m) => m.member));-const children: UserRoleData[] = [];- for (const member of binding.group.members) {- const user = userStore.getUserByIdentifier(member.member);- if (!user) {- continue;- }+ for (const user of users) {children.push({data: user,key: `${binding.group?.name}-${user.name}`,diff --git a/frontend/src/components/Member/utils.ts b/frontend/src/components/Member/utils.tsindex ea74a34b03..bf4e58c040 100644--- a/frontend/src/components/Member/utils.ts+++ b/frontend/src/components/Member/utils.ts@@ -10,6 +10,7 @@ import {getGroupEmailInBinding,getUserEmailInBinding,groupBindingPrefix,+ unknownUser,} from "@/types";import { State } from "@/types/proto-es/v1/common_pb";import { GroupSchema } from "@/types/proto-es/v1/group_service_pb";@@ -54,7 +55,7 @@ const getMemberBinding = (projectRoleBindings: [],};} else {- let user = userStore.getUserByIdentifier(member);+ let user = userStore.getUserByIdentifier(member) ?? unknownUser(member);if (!user) {const email = extractUserId(member);user = create(UserSchema, {diff --git a/frontend/src/components/User/Settings/UserDataTableByGroup/index.vue b/frontend/src/components/User/Settings/UserDataTableByGroup/index.vueindex 49ea3626d2..56a82a3313 100644--- a/frontend/src/components/User/Settings/UserDataTableByGroup/index.vue+++ b/frontend/src/components/User/Settings/UserDataTableByGroup/index.vue@@ -21,6 +21,7 @@ import { NDataTable } from "naive-ui";import { computed, h, watchEffect } from "vue";import { useI18n } from "vue-i18n";import { useUserStore } from "@/store";+import { getUserEmailInBinding } from "@/types";import type { Group } from "@/types/proto-es/v1/group_service_pb";import { GroupMember_Role } from "@/types/proto-es/v1/group_service_pb";import { type User } from "@/types/proto-es/v1/user_service_pb";@@ -78,19 +79,18 @@ const onExpand = async (row: DataTableRowData) => {const onGroupLoad = async (row: GroupRowData) => {const { group } = row;const memberUserIds = group.members.map((m) => m.member);- await userStore.batchGetOrFetchUsers(memberUserIds);+ const users = await userStore.batchGetOrFetchUsers(memberUserIds);const members: UserRowData[] = [];- for (const member of group.members) {- const user = userStore.getUserByIdentifier(member.member);- if (!user) {- continue;- }+ for (const user of users) {+ const member = group.members.find(+ (m) => m.member === getUserEmailInBinding(user.email)+ );members.push({type: "user",name: `${group.name}-${user.name}`,user,- role: member.role,+ role: member?.role ?? GroupMember_Role.MEMBER,});}diff --git a/frontend/src/components/v2/Model/cells/UserLink.vue b/frontend/src/components/v2/Model/cells/UserLink.vueindex af6e8b7b48..42e58b89ec 100644--- a/frontend/src/components/v2/Model/cells/UserLink.vue+++ b/frontend/src/components/v2/Model/cells/UserLink.vue@@ -1,7 +1,6 @@<template><component:is="isLink ? 'router-link' : 'div'"- class="truncate max-w-[10em]":class="isLink && 'normal-link'":to="`/users/${email}`">diff --git a/frontend/src/components/v2/Select/RemoteResourceSelector/index.vue b/frontend/src/components/v2/Select/RemoteResourceSelector/index.vueindex 30bc25f96f..34d90a8d77 100644--- a/frontend/src/components/v2/Select/RemoteResourceSelector/index.vue+++ b/frontend/src/components/v2/Select/RemoteResourceSelector/index.vue@@ -5,7 +5,7 @@:loading="isLoadingNextPage":filterable="true":clearable="true"- :remote="true"+ :remote="remote":virtual-scroll="true":multiple="multiple":value="value"@@ -53,6 +53,7 @@ import type { ResourceSelectOption, SelectSize } from "./types";const props = withDefaults(defineProps<{+ remote?: boolean;placeholder?: string;multiple?: boolean;disabled?: boolean;@@ -82,6 +83,7 @@ const props = withDefaults(filterable?: boolean;}>(),{+ remote: true,fallbackOption: false,consistentMenuWidth: true,filterable: true,diff --git a/frontend/src/components/v2/Select/UserSelect.vue b/frontend/src/components/v2/Select/UserSelect.vueindex 6d7e3d1eb4..1906731944 100644--- a/frontend/src/components/v2/Select/UserSelect.vue+++ b/frontend/src/components/v2/Select/UserSelect.vue@@ -5,6 +5,8 @@:disabled="disabled":size="size":value="value"+ :tag="!hasPermission"+ :remote="hasPermission":additional-options="additionalOptions":render-label="renderLabel":render-tag="renderTag"@@ -22,6 +24,7 @@ import { UserNameCell } from "@/components/v2/Model/cells";import { type UserFilter, userNamePrefix, useUserStore } from "@/store";import { allUsersUser } from "@/types";import { type User, UserType } from "@/types/proto-es/v1/user_service_pb";+import { hasWorkspacePermissionV2 } from "@/utils";import RemoteResourceSelector from "./RemoteResourceSelector/index.vue";import type {ResourceSelectOption,@@ -52,6 +55,8 @@ defineEmits<{const userStore = useUserStore();+const hasPermission = computed(() => hasWorkspacePermissionV2("bb.users.list"));+const getFilter = (search: string): UserFilter => {const filter = [];if (search) {@@ -115,8 +120,10 @@ const handleSearch = async (params: {pageToken: string;pageSize: number;}) => {+ const filter = getFilter(params.search);+const { users, nextPageToken } = await userStore.fetchUserList({- filter: getFilter(params.search),+ filter,pageToken: params.pageToken,pageSize: params.pageSize,});diff --git a/frontend/src/store/modules/user.ts b/frontend/src/store/modules/user.tsindex a09eb96809..80c623ea86 100644--- a/frontend/src/store/modules/user.ts+++ b/frontend/src/store/modules/user.ts@@ -29,7 +29,7 @@ import {UpdateUserRequestSchema,UserType,} from "@/types/proto-es/v1/user_service_pb";-import { ensureUserFullName } from "@/utils";+import { ensureUserFullName, hasWorkspacePermissionV2 } from "@/utils";import { useActuatorV1Store } from "./v1/actuator";import { extractUserId, userNamePrefix } from "./v1/common";import { usePermissionStore } from "./v1/permission";@@ -91,6 +91,12 @@ export const useUserStore = defineStore("user", () => {users: User[];nextPageToken: string;}> => {+ if (!hasWorkspacePermissionV2("bb.users.list")) {+ return {+ users: [],+ nextPageToken: "",+ };+ }const request = create(ListUsersRequestSchema, {pageSize: params.pageSize,pageToken: params.pageToken,@@ -185,8 +191,11 @@ export const useUserStore = defineStore("user", () => {return getUserByIdentifier(name) === undefined;}).map((name) => ensureUserFullName(name));+if (pendingFetch.length === 0) {- return validList.map(getUserByIdentifier);+ return validList.map(+ (name) => getUserByIdentifier(name) ?? unknownUser(name)+ );}try {