From 9c88af33701df0730544b476820908a05a2e6d9c Mon Sep 17 00:00:00 2001 From: wizardchen Date: Sat, 16 May 2026 03:11:02 +0800 Subject: [PATCH] feat(i18n): add RBAC messages for tenant admin requirements Enhanced internationalization support by adding RBAC-related messages across multiple language files. These messages inform users about the necessary tenant admin role for actions such as creating, joining, and managing shared spaces. Updated English, Korean, Russian, and Chinese translations to ensure consistent user experience regarding role-based access control. Refs: #1303 --- frontend/src/i18n/locales/en-US.ts | 7 ++ frontend/src/i18n/locales/ko-KR.ts | 7 ++ frontend/src/i18n/locales/ru-RU.ts | 7 ++ frontend/src/i18n/locales/zh-CN.ts | 7 ++ .../views/organization/JoinOrganization.vue | 11 ++- .../views/organization/OrganizationList.vue | 75 ++++++++++++++++--- .../OrganizationSettingsModal.vue | 48 +++++++++++- 7 files changed, 146 insertions(+), 16 deletions(-) diff --git a/frontend/src/i18n/locales/en-US.ts b/frontend/src/i18n/locales/en-US.ts index 41bdb143..4f26f39d 100755 --- a/frontend/src/i18n/locales/en-US.ts +++ b/frontend/src/i18n/locales/en-US.ts @@ -3285,6 +3285,13 @@ export default { refreshInviteCode: 'Refresh Invite Code', inviteCodeRefreshed: 'Invite code refreshed', inviteCodeRefreshFailed: 'Failed to refresh invite code', + rbac: { + needTenantAdmin: 'Tenant admin role required', + needTenantAdminTip: 'This action requires the admin role (or higher) in the current tenant. Please contact the tenant owner.', + cannotCreate: 'Your tenant role is insufficient to create a shared space', + cannotJoin: 'Your tenant role is insufficient to join or request to join a shared space', + cannotManage: 'Your tenant role is insufficient to manage this shared space', + }, join: { title: 'Join Space', joining: 'Joining space...', diff --git a/frontend/src/i18n/locales/ko-KR.ts b/frontend/src/i18n/locales/ko-KR.ts index dbbe53bd..a19bd8a0 100755 --- a/frontend/src/i18n/locales/ko-KR.ts +++ b/frontend/src/i18n/locales/ko-KR.ts @@ -3329,6 +3329,13 @@ export default { refreshInviteCode: "초대 코드 새로 고침", inviteCodeRefreshed: "초대 코드가 새로 고쳐졌습니다.", inviteCodeRefreshFailed: "초대 코드를 새로 고치지 못했습니다.", + rbac: { + needTenantAdmin: "테넌트 관리자 권한이 필요합니다", + needTenantAdminTip: "이 작업은 현재 테넌트에서 admin 이상 역할이 필요합니다. 테넌트 소유자에게 문의하세요.", + cannotCreate: "현재 테넌트 역할이 부족하여 공유 공간을 만들 수 없습니다", + cannotJoin: "현재 테넌트 역할이 부족하여 공유 공간에 가입하거나 가입을 신청할 수 없습니다", + cannotManage: "현재 테넌트 역할이 부족하여 공유 공간을 관리할 수 없습니다", + }, join: { title: "스페이스에 참여하기", joining: "스페이스에 참여하는 중..", diff --git a/frontend/src/i18n/locales/ru-RU.ts b/frontend/src/i18n/locales/ru-RU.ts index 15963594..27c1de61 100755 --- a/frontend/src/i18n/locales/ru-RU.ts +++ b/frontend/src/i18n/locales/ru-RU.ts @@ -3811,6 +3811,13 @@ export default { refreshInviteCode: 'Refresh Invite Code', inviteCodeRefreshed: 'Invite code refreshed', inviteCodeRefreshFailed: 'Failed to refresh invite code', + rbac: { + needTenantAdmin: 'Требуется роль администратора тенанта', + needTenantAdminTip: 'Для этого действия требуется роль admin или выше в текущем тенанте. Обратитесь к владельцу тенанта.', + cannotCreate: 'Недостаточно прав в текущем тенанте для создания общего пространства', + cannotJoin: 'Недостаточно прав в текущем тенанте для присоединения к общему пространству', + cannotManage: 'Недостаточно прав в текущем тенанте для управления общим пространством', + }, join: { title: 'Join Space', joining: 'Joining space...', diff --git a/frontend/src/i18n/locales/zh-CN.ts b/frontend/src/i18n/locales/zh-CN.ts index e231442d..2c44535b 100755 --- a/frontend/src/i18n/locales/zh-CN.ts +++ b/frontend/src/i18n/locales/zh-CN.ts @@ -3280,6 +3280,13 @@ export default { refreshInviteCode: "刷新邀请码", inviteCodeRefreshed: "邀请码已刷新", inviteCodeRefreshFailed: "刷新邀请码失败", + rbac: { + needTenantAdmin: "需要租户管理员权限", + needTenantAdminTip: "此操作需要当前租户的 admin 或更高角色,请联系租户 Owner 调整权限。", + cannotCreate: "当前租户角色不足,无法创建共享空间", + cannotJoin: "当前租户角色不足,无法加入或申请加入共享空间", + cannotManage: "当前租户角色不足,无法管理共享空间", + }, join: { title: "加入空间", joining: "正在加入空间...", diff --git a/frontend/src/views/organization/JoinOrganization.vue b/frontend/src/views/organization/JoinOrganization.vue index 6e087e5f..a06d1ce0 100644 --- a/frontend/src/views/organization/JoinOrganization.vue +++ b/frontend/src/views/organization/JoinOrganization.vue @@ -26,11 +26,13 @@ import { useRoute, useRouter } from 'vue-router' import { useI18n } from 'vue-i18n' import { MessagePlugin } from 'tdesign-vue-next' import { useOrganizationStore } from '@/stores/organization' +import { useAuthStore } from '@/stores/auth' const route = useRoute() const router = useRouter() const { t } = useI18n() const orgStore = useOrganizationStore() +const authStore = useAuthStore() const loading = ref(true) const error = ref('') @@ -43,7 +45,14 @@ onMounted(async () => { loading.value = false return } - + + // 后端 POST /organizations/join 要求当前租户角色 ≥ admin,先在前端拦截以给出友好提示 + if (!authStore.hasRole('admin') && !authStore.canAccessAllTenants) { + error.value = t('organization.rbac.cannotJoin') + loading.value = false + return + } + try { const result = await orgStore.join(code) if (result) { diff --git a/frontend/src/views/organization/OrganizationList.vue b/frontend/src/views/organization/OrganizationList.vue index d5a8c55a..6bce9cb5 100644 --- a/frontend/src/views/organization/OrganizationList.vue +++ b/frontend/src/views/organization/OrganizationList.vue @@ -13,25 +13,27 @@

{{ $t('organization.title') }}

- + - + @@ -114,7 +116,7 @@ {{ $t('organization.leave') }}
-
@@ -584,6 +600,7 @@ import { ref, onMounted, onUnmounted, computed, watch, nextTick } from 'vue' import { useRoute, useRouter } from 'vue-router' import { MessagePlugin } from 'tdesign-vue-next' import { useOrganizationStore } from '@/stores/organization' +import { useAuthStore } from '@/stores/auth' import type { Organization, OrganizationPreview, SearchableOrganizationItem } from '@/api/organization' import { previewOrganization, joinOrganization, submitJoinRequest, searchSearchableOrganizations, joinOrganizationById } from '@/api/organization' import { useI18n } from 'vue-i18n' @@ -599,6 +616,14 @@ const { t } = useI18n() const route = useRoute() const router = useRouter() const orgStore = useOrganizationStore() +const authStore = useAuthStore() + +// 后端 /api/v1/organizations 下的写操作(创建、加入、申请加入、邀请、审批、改设置等) +// 在路由层都要求当前租户角色 ≥ admin。前端只用于 UI 渲染,安全边界仍在服务端。 +const canManageOrg = computed( + () => authStore.hasRole('admin') || authStore.canAccessAllTenants +) +const noPermissionTip = computed(() => t('organization.rbac.needTenantAdminTip')) // 申请加入时可选角色(仅需审核时使用) const orgRoleOptions = [ @@ -767,6 +792,14 @@ watch([searchableList, searchLoading], () => { // 监听菜单快捷操作事件 const handleOrganizationDialogEvent = ((event: CustomEvent<{ type: 'create' | 'join' }>) => { + if (!canManageOrg.value) { + MessagePlugin.warning( + event.detail?.type === 'create' + ? t('organization.rbac.cannotCreate') + : t('organization.rbac.cannotJoin') + ) + return + } if (event.detail?.type === 'create') { // 创建组织使用 SettingsModal settingsOrgId.value = '' @@ -841,6 +874,10 @@ const onVisibleChange = (visible: boolean, org: OrgWithUI) => { // 创建组织 function handleCreateOrganization() { + if (!canManageOrg.value) { + MessagePlugin.warning(t('organization.rbac.cannotCreate')) + return + } settingsOrgId.value = '' settingsMode.value = 'create' showSettingsModal.value = true @@ -848,6 +885,10 @@ function handleCreateOrganization() { // 加入组织 function handleJoinOrganization() { + if (!canManageOrg.value) { + MessagePlugin.warning(t('organization.rbac.cannotJoin')) + return + } joinInputCode.value = '' inviteCode.value = '' invitePreviewData.value = null @@ -907,6 +948,10 @@ function handleDelete(org: OrgWithUI) { async function confirmDelete() { if (!deletingOrg.value) return + if (!canManageOrg.value) { + MessagePlugin.warning(t('organization.rbac.cannotManage')) + return + } const success = await orgStore.remove(deletingOrg.value.id) if (success) { MessagePlugin.success(t('organization.deleteSuccess')) @@ -946,6 +991,10 @@ async function handleInvitePreview(code: string) { // 确认加入组织(区分直接加入 vs 需要审核,支持邀请码和搜索两种方式) async function confirmJoinOrganization() { if (!invitePreviewData.value || invitePreviewData.value.is_already_member) return + if (!canManageOrg.value) { + MessagePlugin.warning(t('organization.rbac.cannotJoin')) + return + } // 如果是通过搜索加入的(没有邀请码),使用搜索加入逻辑 if (!inviteCode.value && invitePreviewData.value.id) { @@ -1173,6 +1222,10 @@ function fallbackCopyText(text: string) { // 从搜索列表加入空间(通过空间 ID,无需邀请码)- 在预览确认后调用 async function joinBySearchOrg() { if (!invitePreviewData.value || invitePreviewData.value.is_already_member) return + if (!canManageOrg.value) { + MessagePlugin.warning(t('organization.rbac.cannotJoin')) + return + } inviteJoining.value = true try { diff --git a/frontend/src/views/organization/OrganizationSettingsModal.vue b/frontend/src/views/organization/OrganizationSettingsModal.vue index e00f6a5e..44ed185d 100644 --- a/frontend/src/views/organization/OrganizationSettingsModal.vue +++ b/frontend/src/views/organization/OrganizationSettingsModal.vue @@ -37,6 +37,11 @@
+ +
+ + {{ $t('organization.rbac.needTenantAdminTip') }} +
@@ -857,16 +862,32 @@ function clearAvatarEmoji() { // Computed const isCreateMode = computed(() => props.mode === 'create') const isEditMode = computed(() => props.mode === 'edit' || props.mode === 'create') +// 后端组织相关变更接口(保存设置、邀请、搜索用户、改/删成员、审核加入申请、 +// 升级申请、刷新邀请码、移除共享等)在路由层都要求当前租户角色 ≥ admin(见 +// internal/router/router.go 的 RegisterOrganizationRoutes)。跨租户超管可绕过。 +// 因此前端任何"管理类"入口必须同时满足:组织内是 admin/owner ∩ 当前租户 admin+。 +const hasTenantAdmin = computed( + () => authStore.hasRole('admin') || authStore.canAccessAllTenants +) const isAdmin = computed(() => { - if (isCreateMode.value) return true - return orgInfo.value?.my_role === 'admin' || orgInfo.value?.is_owner + if (isCreateMode.value) return hasTenantAdmin.value + const orgAdmin = orgInfo.value?.my_role === 'admin' || orgInfo.value?.is_owner + return !!orgAdmin && hasTenantAdmin.value }) -// 是否可以申请权限升级(非管理员成员可申请) +// 当用户在组织内是 admin/owner 但当前租户角色不足时,展示只读提示 +const showTenantRoleHint = computed(() => { + if (isCreateMode.value) return !hasTenantAdmin.value + const orgAdmin = orgInfo.value?.my_role === 'admin' || orgInfo.value?.is_owner + return !!orgAdmin && !hasTenantAdmin.value +}) + +// 是否可以申请权限升级(非管理员成员可申请;后端也要求租户 admin+) const canRequestUpgrade = computed(() => { if (isCreateMode.value || !props.orgId) return false const myRole = orgInfo.value?.my_role - return myRole && myRole !== 'admin' + if (!myRole || myRole === 'admin') return false + return hasTenantAdmin.value }) // 可申请的角色选项(比当前角色高的角色) @@ -1764,6 +1785,25 @@ watch(currentSection, (section) => { padding: 24px 32px; } +.tenant-role-hint { + display: flex; + align-items: flex-start; + gap: 8px; + margin-bottom: 16px; + padding: 10px 12px; + background: var(--td-warning-color-light); + border: 1px solid var(--td-warning-color-focus); + border-radius: 8px; + font-size: 13px; + line-height: 1.5; + color: var(--td-warning-color-active); + + .t-icon { + flex-shrink: 0; + margin-top: 2px; + } +} + .section { .section-header { margin-bottom: 20px;