feat: Implement cross-tenant access functionality

- Added configuration for enabling cross-tenant access in the application.
- Introduced new API endpoints for listing and searching tenants, accessible only to users with the appropriate permissions.
- Updated user and tenant models to include the `can_access_all_tenants` field.
- Enhanced the authentication middleware to handle cross-tenant requests and validate user permissions.
- Created a new TenantSelector component for selecting tenants in the frontend, improving user experience.
- Updated internationalization files to support new tenant-related strings and messages.
This commit is contained in:
wizardchen
2025-12-02 12:17:39 +08:00
parent e66ace9c14
commit cdf576eb18
22 changed files with 1079 additions and 29 deletions
+2
View File
@@ -15,6 +15,7 @@ export interface LoginResponse {
email: string
avatar?: string
tenant_id: number
can_access_all_tenants?: boolean
is_active: boolean
created_at: string
updated_at: string
@@ -66,6 +67,7 @@ export interface UserInfo {
email: string
avatar?: string
tenant_id: string
can_access_all_tenants?: boolean
created_at: string
updated_at: string
}
+83
View File
@@ -0,0 +1,83 @@
import { get } from '@/utils/request'
// 租户信息接口
export interface TenantInfo {
id: number
name: string
description?: string
api_key?: string
status?: string
business?: string
storage_quota?: number
storage_used?: number
created_at: string
updated_at: string
}
// 搜索租户参数
export interface SearchTenantsParams {
keyword?: string
tenant_id?: number
page?: number
page_size?: number
}
// 搜索租户响应
export interface SearchTenantsResponse {
success: boolean
data?: {
items: TenantInfo[]
total: number
page: number
page_size: number
}
message?: string
}
/**
* 获取所有租户列表(需要跨租户访问权限)
* @deprecated 建议使用 searchTenants 代替,支持分页和搜索
*/
export async function listAllTenants(): Promise<{ success: boolean; data?: { items: TenantInfo[] }; message?: string }> {
try {
const response = await get('/api/v1/tenants/all')
return response as unknown as { success: boolean; data?: { items: TenantInfo[] }; message?: string }
} catch (error: any) {
return {
success: false,
message: error.message || '获取租户列表失败'
}
}
}
/**
* 搜索租户(支持分页、关键词搜索和租户ID过滤)
*/
export async function searchTenants(params: SearchTenantsParams = {}): Promise<SearchTenantsResponse> {
try {
const queryParams = new URLSearchParams()
if (params.keyword) {
queryParams.append('keyword', params.keyword)
}
if (params.tenant_id) {
queryParams.append('tenant_id', String(params.tenant_id))
}
if (params.page) {
queryParams.append('page', String(params.page))
}
if (params.page_size) {
queryParams.append('page_size', String(params.page_size))
}
const queryString = queryParams.toString()
const url = `/api/v1/tenants/search${queryString ? '?' + queryString : ''}`
const response = await get(url)
return response as unknown as SearchTenantsResponse
} catch (error: any) {
return {
success: false,
message: error.message || '搜索租户失败'
}
}
}
+534
View File
@@ -0,0 +1,534 @@
<template>
<div class="tenant-selector">
<div v-if="canAccessAllTenants" class="tenant-selector-wrapper">
<div class="tenant-menu-item" @click="toggleDropdown" ref="triggerRef">
<div class="tenant-item-box">
<div class="tenant-icon">
<t-icon name="usergroup" size="16px" />
</div>
<span class="tenant-title">{{ currentTenantName }}</span>
</div>
<t-icon name="chevron-up" class="tenant-arrow" :class="{ rotated: showDropdown }" />
</div>
<div v-if="showDropdown" class="tenant-overlay" @click="close">
<div class="tenant-dropdown" @click.stop :style="dropdownStyle">
<div class="tenant-list" ref="tenantList">
<div
v-for="tenant in tenants"
:key="tenant.id"
:class="['tenant-item', { selected: isSelected(tenant.id) }]"
@click="selectTenant(tenant.id)"
>
<div class="tenant-item-info">
<span class="tenant-item-name">{{ tenant.name }}</span>
<span v-if="tenant.description" class="tenant-item-desc">{{ tenant.description }}</span>
<span class="tenant-item-id">ID: {{ tenant.id }}</span>
</div>
<t-icon v-if="isSelected(tenant.id)" name="check" size="16px" class="tenant-check-icon" />
</div>
<div v-if="tenants.length === 0 && !loading" class="tenant-empty">
{{ $t('tenant.noMatch') }}
</div>
<div v-if="loading" class="tenant-loading">
{{ $t('tenant.loading') }}
</div>
<div v-if="hasMore && !loading" class="tenant-load-more" @click="loadMore">
{{ $t('tenant.loadMore') }}
</div>
</div>
<div class="tenant-search">
<input
ref="searchInput"
v-model="searchQuery"
type="text"
:placeholder="$t('tenant.searchPlaceholder')"
class="tenant-search-input"
@keydown.esc="closeDropdown"
@input="handleSearchInput"
/>
<div class="tenant-search-hint">
{{ $t('tenant.searchHint') }}
</div>
</div>
</div>
</div>
</div>
<div v-else class="tenant-menu-item readonly">
<div class="tenant-item-box">
<div class="tenant-icon">
<t-icon name="usergroup" size="16px" />
</div>
<span class="tenant-title">{{ currentTenantName }}</span>
</div>
</div>
</div>
</template>
<script setup lang="ts">
import { ref, computed, onMounted, watch, onUnmounted, nextTick } from 'vue'
import { useAuthStore } from '@/stores/auth'
import { searchTenants, type TenantInfo } from '@/api/tenant'
import { useI18n } from 'vue-i18n'
import { MessagePlugin } from 'tdesign-vue-next'
const { t } = useI18n()
const authStore = useAuthStore()
const showDropdown = ref(false)
const searchQuery = ref('')
const tenants = ref<TenantInfo[]>([])
const triggerRef = ref<HTMLElement | null>(null)
const tenantList = ref<HTMLElement | null>(null)
const searchInput = ref<HTMLInputElement | null>(null)
const dropdownStyle = ref<Record<string, string>>({})
// 分页相关
const currentPage = ref(1)
const pageSize = ref(20)
const total = ref(0)
const loading = ref(false)
const searchTimer = ref<number | null>(null)
const canAccessAllTenants = computed(() => authStore.canAccessAllTenants)
const selectedTenantId = computed(() => authStore.selectedTenantId)
const defaultTenantId = computed(() => authStore.tenant?.id ? Number(authStore.tenant.id) : null)
const currentTenantId = computed(() => {
return selectedTenantId.value || defaultTenantId.value
})
const currentTenantName = computed(() => {
if (!currentTenantId.value) return t('tenant.unknown')
const tenant = tenants.value.find(t => t.id === currentTenantId.value)
if (tenant) return tenant.name
return authStore.tenant?.name || t('tenant.unknown')
})
const hasMore = computed(() => {
return tenants.value.length < total.value
})
const isSelected = (tenantId: number) => {
return currentTenantId.value === tenantId
}
const updateDropdownPosition = () => {
if (!triggerRef.value) return
const rect = triggerRef.value.getBoundingClientRect()
const dropdownMaxHeight = 400 // max-height
const spaceAbove = rect.top
const padding = 16
// 计算可用高度,确保有足够空间显示搜索框
const availableHeight = Math.min(dropdownMaxHeight, spaceAbove - padding)
// 确保最小高度(至少能显示搜索框和一些列表项)
const minHeight = 200
const finalHeight = Math.max(minHeight, availableHeight)
// 向上弹出,确保不遮挡用户头像
dropdownStyle.value = {
bottom: `${window.innerHeight - rect.top + 8}px`,
left: `${rect.left}px`,
width: '280px',
height: `${finalHeight}px`,
maxHeight: `${finalHeight}px`
}
}
const toggleDropdown = () => {
if (!canAccessAllTenants.value) return
showDropdown.value = !showDropdown.value
if (showDropdown.value) {
if (tenants.value.length === 0) {
loadTenants()
}
nextTick(() => {
updateDropdownPosition()
searchInput.value?.focus()
})
} else {
// 关闭时重置搜索
searchQuery.value = ''
currentPage.value = 1
tenants.value = []
total.value = 0
}
}
const closeDropdown = () => {
showDropdown.value = false
searchQuery.value = ''
currentPage.value = 1
tenants.value = []
total.value = 0
if (searchTimer.value) {
clearTimeout(searchTimer.value)
searchTimer.value = null
}
}
const close = (event: MouseEvent) => {
const target = event.target as HTMLElement
if (!target.closest('.tenant-dropdown') && !target.closest('.tenant-menu-item')) {
closeDropdown()
}
}
const selectTenant = (tenantId: number) => {
// 如果选择的是默认租户,清除选择
if (tenantId === defaultTenantId.value) {
authStore.setSelectedTenant(null)
} else {
authStore.setSelectedTenant(tenantId)
}
closeDropdown()
// 触发页面刷新以加载新租户的数据
MessagePlugin.success(t('tenant.switchSuccess'))
setTimeout(() => {
window.location.reload()
}, 500)
}
const loadTenants = async (append = false) => {
if (loading.value) return
loading.value = true
try {
// 解析搜索关键词,判断是否是租户ID
let keyword = searchQuery.value.trim()
let tenantID: number | undefined = undefined
// 如果搜索关键词是纯数字,尝试作为租户ID查询
if (keyword && /^\d+$/.test(keyword)) {
tenantID = Number(keyword)
keyword = '' // 清空关键词,使用租户ID查询
}
const response = await searchTenants({
keyword: keyword || undefined,
tenant_id: tenantID,
page: currentPage.value,
page_size: pageSize.value
})
if (response.success && response.data) {
if (append) {
tenants.value = [...tenants.value, ...response.data.items]
} else {
tenants.value = response.data.items
}
total.value = response.data.total
authStore.setAllTenants(tenants.value)
} else {
MessagePlugin.error(response.message || t('tenant.loadTenantsFailed'))
}
} catch (error) {
console.error('Failed to load tenants:', error)
MessagePlugin.error(t('tenant.loadTenantsFailed'))
} finally {
loading.value = false
}
}
const handleSearchInput = () => {
// 防抖处理,延迟500ms后搜索
if (searchTimer.value) {
clearTimeout(searchTimer.value)
}
searchTimer.value = window.setTimeout(() => {
currentPage.value = 1
tenants.value = []
total.value = 0
loadTenants()
}, 500)
}
const loadMore = () => {
if (hasMore.value && !loading.value) {
currentPage.value++
loadTenants(true)
}
}
const handleClickOutside = (event: MouseEvent) => {
const target = event.target as HTMLElement
if (!target.closest('.tenant-selector-wrapper')) {
closeDropdown()
}
}
const handleResize = () => {
if (showDropdown.value) {
updateDropdownPosition()
}
}
watch(showDropdown, (newVal) => {
if (newVal) {
document.addEventListener('click', handleClickOutside)
window.addEventListener('resize', handleResize)
window.addEventListener('scroll', handleResize, true)
updateDropdownPosition()
} else {
document.removeEventListener('click', handleClickOutside)
window.removeEventListener('resize', handleResize)
window.removeEventListener('scroll', handleResize, true)
}
})
onMounted(() => {
// 不再自动加载,等用户打开下拉框时再加载
})
onUnmounted(() => {
document.removeEventListener('click', handleClickOutside)
window.removeEventListener('resize', handleResize)
window.removeEventListener('scroll', handleResize, true)
if (searchTimer.value) {
clearTimeout(searchTimer.value)
}
})
</script>
<style scoped lang="less">
.tenant-selector {
width: 100%;
margin-bottom: 4px;
}
.tenant-selector-wrapper {
width: 100%;
position: relative;
}
.tenant-menu-item {
cursor: pointer;
display: flex;
align-items: center;
justify-content: space-between;
height: 48px;
padding: 13px 8px 13px 16px;
box-sizing: border-box;
transition: all 0.2s;
&:hover {
border-radius: 4px;
background: #30323605;
color: #00000099;
.tenant-icon,
.tenant-title {
color: #00000099;
}
}
&.readonly {
cursor: default;
&:hover {
background: transparent;
}
}
}
.tenant-item-box {
display: flex;
align-items: center;
flex: 1;
min-width: 0;
}
.tenant-icon {
width: 20px;
height: 20px;
display: flex;
align-items: center;
justify-content: center;
margin-right: 12px;
color: #00000099;
flex-shrink: 0;
}
.tenant-title {
font-size: 14px;
font-weight: 400;
color: #000000e6;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
flex: 1;
min-width: 0;
}
.tenant-arrow {
font-size: 16px;
color: #00000066;
flex-shrink: 0;
margin-left: 8px;
transition: transform 0.2s;
&.rotated {
transform: rotate(180deg);
}
}
.tenant-overlay {
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
z-index: 999;
}
.tenant-dropdown {
position: fixed;
background: #fff;
border: 1px solid #e7e9eb;
border-radius: 8px;
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
z-index: 1000;
display: flex;
flex-direction: column;
overflow: hidden;
transform-origin: bottom left;
box-sizing: border-box;
}
.tenant-search {
padding: 8px;
border-top: 1px solid #f0f0f0;
background: #fafafa;
flex-shrink: 0;
box-sizing: border-box;
}
.tenant-search-input {
width: 100%;
padding: 6px 8px;
border: 1px solid #e7e9eb;
border-radius: 4px;
font-size: 14px;
outline: none;
background: #fff;
color: #333;
transition: border-color 0.2s;
box-sizing: border-box;
&:focus {
border-color: #07c05f;
}
&::placeholder {
color: #999;
}
}
.tenant-list {
flex: 1;
overflow-y: auto;
overflow-x: hidden;
padding: 4px 0;
min-height: 0;
max-height: 100%;
box-sizing: border-box;
}
.tenant-item {
display: flex;
align-items: center;
justify-content: space-between;
padding: 10px 16px;
cursor: pointer;
transition: background 0.2s;
&:hover {
background: #f5f7fa;
}
&.selected {
background: #07c05f1a;
.tenant-item-name {
color: #07c05f;
font-weight: 500;
}
}
}
.tenant-item-info {
flex: 1;
display: flex;
flex-direction: column;
gap: 4px;
min-width: 0;
}
.tenant-item-name {
font-size: 14px;
color: #333;
font-weight: 400;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.tenant-item-desc {
font-size: 12px;
color: #999;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.tenant-item-id {
font-size: 11px;
color: #999;
margin-top: 2px;
}
.tenant-loading {
padding: 16px;
text-align: center;
color: #999;
font-size: 14px;
}
.tenant-load-more {
padding: 12px;
text-align: center;
color: #07c05f;
font-size: 14px;
cursor: pointer;
border-top: 1px solid #f0f0f0;
transition: background 0.2s;
&:hover {
background: #f5f7fa;
}
}
.tenant-search-hint {
font-size: 11px;
color: #999;
margin-top: 4px;
padding: 0 2px;
}
.tenant-check-icon {
color: #07c05f;
flex-shrink: 0;
margin-left: 8px;
}
.tenant-empty {
padding: 16px;
text-align: center;
color: #999;
font-size: 14px;
}
</style>
+26 -3
View File
@@ -205,10 +205,33 @@ const loadUserInfo = async () => {
try {
const response = await getCurrentUser()
if (response.success && response.data && response.data.user) {
const user = response.data.user
userInfo.value = {
username: response.data.user.username || t('common.info'),
email: response.data.user.email || 'user@example.com',
avatar: response.data.user.avatar || ''
username: user.username || t('common.info'),
email: user.email || 'user@example.com',
avatar: user.avatar || ''
}
// 同时更新 authStore 中的用户信息,确保包含 can_access_all_tenants 字段
authStore.setUser({
id: user.id,
username: user.username,
email: user.email,
avatar: user.avatar,
tenant_id: user.tenant_id,
can_access_all_tenants: user.can_access_all_tenants || false,
created_at: user.created_at,
updated_at: user.updated_at
})
// 如果返回了租户信息,也更新租户信息
if (response.data.tenant) {
authStore.setTenant({
id: String(response.data.tenant.id),
name: response.data.tenant.name,
api_key: response.data.tenant.api_key || '',
owner_id: user.id,
created_at: response.data.tenant.created_at,
updated_at: response.data.tenant.updated_at
})
}
}
} catch (error) {
+2
View File
@@ -161,6 +161,7 @@
<!-- 下半部分:用户菜单 -->
<div class="menu_bottom">
<TenantSelector />
<UserMenu />
</div>
@@ -194,6 +195,7 @@ import { useAuthStore } from '@/stores/auth';
import { useUIStore } from '@/stores/ui';
import { MessagePlugin } from "tdesign-vue-next";
import UserMenu from '@/components/UserMenu.vue';
import TenantSelector from '@/components/TenantSelector.vue';
import { useI18n } from 'vue-i18n';
import { kbFileTypeVerification } from '@/utils';
+8
View File
@@ -1149,6 +1149,7 @@ export default {
},
tenant: {
title: 'Tenant Information',
currentTenant: 'Current Tenant',
sectionDescription: 'View detailed configuration for the tenant',
apiDocument: 'API Document',
name: 'Tenant Name',
@@ -1195,6 +1196,13 @@ export default {
apiKeyCopied: 'API Key copied to clipboard',
unknown: 'Unknown',
formatError: 'Format error',
searchPlaceholder: 'Search by name or enter tenant ID...',
searchHint: 'Search by name or enter tenant ID directly',
noMatch: 'No matching tenants found',
switchSuccess: 'Tenant switched successfully',
loadTenantsFailed: 'Failed to load tenant list',
loading: 'Loading...',
loadMore: 'Load more',
details: {
idLabel: 'Tenant ID',
idDescription: 'Unique identifier of your tenant',
+8
View File
@@ -640,6 +640,7 @@ export default {
},
tenant: {
title: 'Информация об арендаторе',
currentTenant: 'Текущий арендатор',
sectionDescription: 'Просмотр детальной конфигурации арендатора',
apiDocument: 'Документация API',
name: 'Имя арендатора',
@@ -686,6 +687,13 @@ export default {
apiKeyCopied: 'API Key скопирован в буфер обмена',
unknown: 'Неизвестно',
formatError: 'Ошибка формата',
searchPlaceholder: 'Поиск по имени или введите ID арендатора...',
searchHint: 'Поиск по имени или введите ID арендатора напрямую',
noMatch: 'Не найдено подходящих арендаторов',
switchSuccess: 'Арендатор успешно переключен',
loadTenantsFailed: 'Не удалось загрузить список арендаторов',
loading: 'Загрузка...',
loadMore: 'Загрузить еще',
details: {
idLabel: 'ID арендатора',
idDescription: 'Уникальный идентификатор вашего арендатора',
+8
View File
@@ -732,6 +732,7 @@ export default {
},
tenant: {
title: "租户信息",
currentTenant: "当前租户",
sectionDescription: "查看租户的详细配置信息",
apiDocument: "API文档",
name: "租户名称",
@@ -777,6 +778,13 @@ export default {
apiKeyCopied: "API密钥已复制到剪贴板",
unknown: "未知",
formatError: "格式错误",
searchPlaceholder: "搜索租户名称或输入租户ID...",
searchHint: "支持按名称搜索或直接输入租户ID",
noMatch: "未找到匹配的租户",
switchSuccess: "租户切换成功",
loadTenantsFailed: "加载租户列表失败",
loading: "加载中...",
loadMore: "加载更多",
details: {
idLabel: "租户 ID",
idDescription: "您所属租户的唯一标识",
+48
View File
@@ -1,6 +1,7 @@
import { defineStore } from 'pinia'
import { ref, computed } from 'vue'
import type { UserInfo, TenantInfo, KnowledgeBaseInfo } from '@/api/auth'
import type { TenantInfo as TenantInfoFromAPI } from '@/api/tenant'
import i18n from '@/i18n'
export const useAuthStore = defineStore('auth', () => {
@@ -11,6 +12,8 @@ export const useAuthStore = defineStore('auth', () => {
const refreshToken = ref<string>('')
const knowledgeBases = ref<KnowledgeBaseInfo[]>([])
const currentKnowledgeBase = ref<KnowledgeBaseInfo | null>(null)
const selectedTenantId = ref<number | null>(null)
const allTenants = ref<TenantInfoFromAPI[]>([])
// 计算属性
const isLoggedIn = computed(() => {
@@ -29,6 +32,15 @@ export const useAuthStore = defineStore('auth', () => {
return user.value?.id || ''
})
const canAccessAllTenants = computed(() => {
return user.value?.can_access_all_tenants || false
})
const effectiveTenantId = computed(() => {
// 如果选择了其他租户,使用选择的租户ID,否则使用用户默认租户ID
return selectedTenantId.value || (tenant.value?.id ? Number(tenant.value.id) : null)
})
// 操作方法
const setUser = (userData: UserInfo) => {
user.value = userData
@@ -67,6 +79,23 @@ export const useAuthStore = defineStore('auth', () => {
}
}
const setSelectedTenant = (tenantId: number | null) => {
selectedTenantId.value = tenantId
if (tenantId !== null) {
localStorage.setItem('weknora_selected_tenant_id', String(tenantId))
} else {
localStorage.removeItem('weknora_selected_tenant_id')
}
}
const setAllTenants = (tenants: TenantInfoFromAPI[]) => {
allTenants.value = tenants
}
const getSelectedTenant = () => {
return selectedTenantId.value
}
const logout = () => {
// 清空状态
@@ -76,6 +105,8 @@ export const useAuthStore = defineStore('auth', () => {
refreshToken.value = ''
knowledgeBases.value = []
currentKnowledgeBase.value = null
selectedTenantId.value = null
allTenants.value = []
// 清空localStorage
localStorage.removeItem('weknora_user')
@@ -95,6 +126,7 @@ export const useAuthStore = defineStore('auth', () => {
const storedRefreshToken = localStorage.getItem('weknora_refresh_token')
const storedKnowledgeBases = localStorage.getItem('weknora_knowledge_bases')
const storedCurrentKb = localStorage.getItem('weknora_current_kb')
const storedSelectedTenantId = localStorage.getItem('weknora_selected_tenant_id')
if (storedUser) {
try {
@@ -137,6 +169,15 @@ export const useAuthStore = defineStore('auth', () => {
console.error(i18n.global.t('authStore.errors.parseCurrentKnowledgeBaseFailed'), e)
}
}
if (storedSelectedTenantId) {
try {
selectedTenantId.value = Number(storedSelectedTenantId)
} catch (e) {
console.error('Failed to parse selected tenant ID', e)
selectedTenantId.value = null
}
}
}
// 初始化时从localStorage恢复状态
@@ -150,12 +191,16 @@ export const useAuthStore = defineStore('auth', () => {
refreshToken,
knowledgeBases,
currentKnowledgeBase,
selectedTenantId,
allTenants,
// 计算属性
isLoggedIn,
hasValidTenant,
currentTenantId,
currentUserId,
canAccessAllTenants,
effectiveTenantId,
// 方法
setUser,
@@ -164,6 +209,9 @@ export const useAuthStore = defineStore('auth', () => {
setRefreshToken,
setKnowledgeBases,
setCurrentKnowledgeBase,
setSelectedTenant,
setAllTenants,
getSelectedTenant,
logout,
initFromStorage
}
+16
View File
@@ -25,6 +25,22 @@ instance.interceptors.request.use(
config.headers["Authorization"] = `Bearer ${token}`;
}
// 添加跨租户访问请求头(如果选择了其他租户)
const selectedTenantId = localStorage.getItem('weknora_selected_tenant_id');
const defaultTenantId = localStorage.getItem('weknora_tenant');
if (selectedTenantId) {
try {
const defaultTenant = defaultTenantId ? JSON.parse(defaultTenantId) : null;
const defaultId = defaultTenant?.id ? String(defaultTenant.id) : null;
// 如果选择的租户ID与默认租户ID不同,添加请求头
if (selectedTenantId !== defaultId) {
config.headers["X-Tenant-ID"] = selectedTenantId;
}
} catch (e) {
console.error('Failed to parse tenant info', e);
}
}
config.headers["X-Request-ID"] = `${generateRandomString(12)}`;
return config;
},
+1
View File
@@ -625,6 +625,7 @@ const handleLogin = async () => {
email: response.user.email || '',
avatar: response.user.avatar,
tenant_id: String(response.tenant.id) || '',
can_access_all_tenants: response.user.can_access_all_tenants || false,
created_at: response.user.created_at || new Date().toISOString(),
updated_at: response.user.updated_at || new Date().toISOString()
})