diff --git a/.env.example b/.env.example
index f492c7a8..64ce36f1 100644
--- a/.env.example
+++ b/.env.example
@@ -142,6 +142,14 @@ TZ=Asia/Shanghai
# 禁止新用户注册(生产环境建议设为 true)
DISABLE_REGISTRATION=false
+# 公开注册后的默认空间策略:create_personal(默认,自动创建个人空间)
+# 或 tenantless(仅创建账户,等待邀请或用户主动创建空间)。
+# WEKNORA_AUTH_DEFAULT_TENANT_MODE=create_personal
+
+# 是否允许普通用户登录后主动创建空间。设为 false 时只能通过邀请加入已有空间,
+# 跨租户超管不受影响。默认 true。
+# WEKNORA_TENANT_SELF_SERVICE_CREATION_ENABLED=true
+
# Ollama 服务的基准 URL,用于连接本地/其他服务器上运行的 Ollama 服务
OLLAMA_BASE_URL=http://host.docker.internal:11434
@@ -708,6 +716,9 @@ DOCREADER_TRANSPORT=grpc
# OIDC_AUTH_SCOPES="openid profile email"
+# OIDC 首次自动开户后的空间策略:create_personal(默认)或 tenantless。
+# OIDC_AUTH_DEFAULT_TENANT_MODE=create_personal
+
# 用于OIDC用于信息中提取用户数据
# OIDC_USER_INFO_MAPPING_USER_NAME=name
# OIDC_USER_INFO_MAPPING_EMAIL=email
diff --git a/docker-compose.yml b/docker-compose.yml
index 33b7090e..c923c642 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -73,6 +73,9 @@ services:
- COS_ENABLE_OLD_DOMAIN=${COS_ENABLE_OLD_DOMAIN:-}
- GIN_MODE=${GIN_MODE:-release}
- DISABLE_REGISTRATION=${DISABLE_REGISTRATION:-false}
+ - WEKNORA_AUTH_DEFAULT_TENANT_MODE=${WEKNORA_AUTH_DEFAULT_TENANT_MODE:-}
+ - WEKNORA_TENANT_SELF_SERVICE_CREATION_ENABLED=${WEKNORA_TENANT_SELF_SERVICE_CREATION_ENABLED:-}
+ - OIDC_AUTH_DEFAULT_TENANT_MODE=${OIDC_AUTH_DEFAULT_TENANT_MODE:-}
- DB_DRIVER=${DB_DRIVER:-postgres}
- DB_HOST=${DB_HOST:-postgres}
- DB_PORT=${DB_PORT:-5432}
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 2f66dc96..7e86e17b 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -52,7 +52,7 @@ const syncOIDCUserContext = async () => {
throw new Error(currentUserResponse.message || 'Failed to get user information')
}
- const { user, tenant, memberships } = currentUserResponse.data
+ const { user, tenant, memberships, capabilities } = currentUserResponse.data
authStore.setUser(userInfoFromApi(user, tenant?.id))
if (tenant) {
authStore.setTenant({
@@ -67,6 +67,8 @@ const syncOIDCUserContext = async () => {
created_at: tenant.created_at || new Date().toISOString(),
updated_at: tenant.updated_at || new Date().toISOString()
})
+ } else {
+ authStore.setTenant(null)
}
// Refresh memberships so currentTenantRole reflects any role change
// since the last login (e.g. an Owner demoted us to Viewer in a
@@ -75,6 +77,9 @@ const syncOIDCUserContext = async () => {
if (Array.isArray(memberships)) {
authStore.setMemberships(memberships)
}
+ if (typeof capabilities?.can_create_tenant === 'boolean') {
+ authStore.setCanCreateTenant(capabilities.can_create_tenant)
+ }
// Same active-vs-home reconciliation as Login.vue: if the OIDC login
// landed us in a non-home tenant (because the backend honoured a
// remembered last-active-tenant preference) make sure X-Tenant-ID
@@ -101,7 +106,7 @@ const persistOIDCLoginResponse = async (response: any) => {
await syncOIDCUserContext()
await nextTick()
- router.replace('/platform/knowledge-bases')
+ router.replace(authStore.hasValidTenant ? '/platform/knowledge-bases' : '/onboarding/workspace')
}
const handleGlobalOIDCCallback = async () => {
diff --git a/frontend/src/api/auth/index.ts b/frontend/src/api/auth/index.ts
index 5c8f556c..b0bcc35f 100644
--- a/frontend/src/api/auth/index.ts
+++ b/frontend/src/api/auth/index.ts
@@ -34,7 +34,7 @@ export interface LoginResponse {
storage_used: number
created_at: string
updated_at: string
- }
+ } | null
// active_tenant mirrors `tenant` for endpoints that distinguish home
// tenant from current tenant (e.g. /auth/register-by-invite). Only
// one of `tenant` / `active_tenant` is populated by any given endpoint.
@@ -48,7 +48,8 @@ export interface LoginResponse {
storage_used?: number
created_at?: string
updated_at?: string
- }
+ } | null
+ memberships?: MembershipInfo[]
token?: string
refresh_token?: string
}
@@ -137,10 +138,11 @@ export function userInfoFromApi(
u: any,
fallbackTenantId?: string | number | null,
): UserInfo {
- const tid =
+ const rawTenantId =
u?.tenant_id !== undefined && u?.tenant_id !== null && u.tenant_id !== ''
? u.tenant_id
: fallbackTenantId ?? ''
+ const tid = Number(rawTenantId) > 0 ? rawTenantId : ''
return {
id: u?.id || '',
username: u?.username || '',
@@ -316,10 +318,14 @@ export interface MembershipInfo {
/**
* 获取当前用户信息
*/
-export async function getCurrentUser(): Promise<{ success: boolean; data?: { user: UserInfo; tenant?: TenantInfo | null; memberships?: MembershipInfo[] }; message?: string }> {
+export interface AuthCapabilities {
+ can_create_tenant: boolean
+}
+
+export async function getCurrentUser(): Promise<{ success: boolean; data?: { user: UserInfo; tenant?: TenantInfo | null; memberships?: MembershipInfo[]; tenant_required?: boolean; capabilities?: AuthCapabilities }; message?: string }> {
try {
const response = await get('/api/v1/auth/me')
- return response as unknown as { success: boolean; data?: { user: UserInfo; tenant?: TenantInfo | null; memberships?: MembershipInfo[] }; message?: string }
+ return response as unknown as { success: boolean; data?: { user: UserInfo; tenant?: TenantInfo | null; memberships?: MembershipInfo[]; tenant_required?: boolean; capabilities?: AuthCapabilities }; message?: string }
} catch (error: any) {
return {
success: false,
diff --git a/frontend/src/api/tenant/index.ts b/frontend/src/api/tenant/index.ts
index d0909bea..a65bda3c 100644
--- a/frontend/src/api/tenant/index.ts
+++ b/frontend/src/api/tenant/index.ts
@@ -284,9 +284,12 @@ export async function createTenant(
const response = await post('/api/v1/tenants', payload)
return response as unknown as { success: boolean; data?: TenantInfo; message?: string }
} catch (error: any) {
+ const code = error?.error?.code ?? error?.code
return {
success: false,
- message: error.message || t('error.tenant.createFailed'),
+ message: code === 2005
+ ? t('tenant.create.disabled')
+ : (error.message || t('error.tenant.createFailed')),
}
}
}
diff --git a/frontend/src/components/TenantSelector.vue b/frontend/src/components/TenantSelector.vue
index f4519fd9..1232e06c 100644
--- a/frontend/src/components/TenantSelector.vue
+++ b/frontend/src/components/TenantSelector.vue
@@ -53,9 +53,8 @@
-
-
+
+
{{ $t('tenant.create.action') }}
@@ -276,6 +275,10 @@ const createDialogVisible = ref(false)
const openCreateDialog = () => {
closeDropdown()
+ if (!authStore.canCreateTenant) {
+ MessagePlugin.info(t('tenant.create.disabled'))
+ return
+ }
createDialogVisible.value = true
}
diff --git a/frontend/src/components/UserMenu.vue b/frontend/src/components/UserMenu.vue
index 144a87a9..c9da13b1 100644
--- a/frontend/src/components/UserMenu.vue
+++ b/frontend/src/components/UserMenu.vue
@@ -185,11 +185,8 @@
{{ $t('tenant.switcher.empty') }}
-
-