feat(tenant): remember user's last-active workspace across logins
Until now a fresh login (new device, expired refresh token, cleared
browser) always dropped the user into their home tenant, even if they
spend most of their time in a peer workspace. The session-local
X-Tenant-ID override in localStorage gave a "same browser sticky"
effect, but never crossed devices or new sessions.
This adds a small server-side preference, `users.preferences.
last_active_tenant_id`, persisted in the existing jsonb column (no
new migration), and threads it through:
* Backend
* `UserPreferences` gains `LastActiveTenantID *uint64` with sentinel
semantics (`*0` from the PATCH endpoint = clear preference).
* `resolveLoginTenantID` validates the stored id (tenant still
exists + active membership, or CanAccessAllTenants) and falls
back to home on any failure, best-effort clearing the stale
preference so subsequent logins don't pay for it again.
* `Login` and `LoginWithOIDC` resolve once and use the result for
both the JWT `tenant_id` claim and the returned `active_tenant`,
keeping the two in sync. `RefreshToken` rides through
`GenerateTokens` so refresh rotations also land the user back in
their preferred tenant instead of bouncing to home.
* `UpdateUserPreferences` learns to merge the new key.
* `PUT /auth/me/preferences` accepts the new field.
* Frontend
* `Login.vue` now writes the user's HOME tenant id into
`user.tenant_id` (matching the field's documented semantics) and
expresses any active-vs-home divergence via `setSelectedTenant`,
so `useHomeTenant` and the "current"/"home" badges stay correct
after the backend honours a remembered preference. `App.vue`'s
OIDC sync does the same reconciliation.
* `TenantSelector`, `UserMenu` and the post-tenant-create handlers
fire `persistLastActiveTenantPreference` after every successful
user-initiated switch (switching to home sends `0` to clear).
The call is raced against the existing reload-grace window so
most writes finish before the page tears down; lost writes are
recoverable on the next switch.
No new UI. Users will simply notice that, after re-logging in on
another device, they land back in the workspace they were last
using rather than always in their home tenant.
Note: `make docs` is unrelated-broken on `main` (audit_log.go
references `errors.AppError` which swag can't resolve), so the
Swagger artifacts under docs/ are intentionally not regenerated
in this PR. The handler code is the source of truth.
This commit is contained in:
@@ -6,6 +6,8 @@
|
||||
// 对应数据出现空状态,体验跟跳到固定首页其实差不多——干脆统一跳到 KB 列表,
|
||||
// 用一次 full navigation 把所有 store / SSE / 请求都重置一遍。
|
||||
|
||||
import { updateMyPreferences } from '@/api/auth'
|
||||
|
||||
const SAFE_FALLBACK_PATH = '/platform/knowledge-bases'
|
||||
|
||||
/**
|
||||
@@ -55,3 +57,36 @@ export function consumePendingTenantSwitchToast(): PendingTenantSwitchToast | nu
|
||||
return null
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Persist the user's "last active tenant" preference server-side so a
|
||||
* fresh login (new device, new refresh token, cleared browser) drops
|
||||
* them back into this workspace instead of always bouncing to their
|
||||
* home tenant.
|
||||
*
|
||||
* Conventions:
|
||||
* - Pass the target tenant id when switching to a peer tenant.
|
||||
* - Pass `null` (which sends `0`) when switching back to the home
|
||||
* tenant — that clears the preference and reverts the user to the
|
||||
* "always start at home" default.
|
||||
*
|
||||
* Fire-and-forget: callers usually trigger a full-page reload right
|
||||
* after; this returns the in-flight promise so callers can race it
|
||||
* against a small budget if they want best-effort completion before
|
||||
* navigation. Failures are logged but never thrown — losing one
|
||||
* persist is recoverable on the next switch.
|
||||
*/
|
||||
export function persistLastActiveTenantPreference(
|
||||
tenantId: number | null,
|
||||
): Promise<void> {
|
||||
const payload = { last_active_tenant_id: tenantId == null ? 0 : tenantId }
|
||||
return updateMyPreferences(payload)
|
||||
.then((res) => {
|
||||
if (!res.success) {
|
||||
console.warn('persistLastActiveTenantPreference: server rejected update', res.message)
|
||||
}
|
||||
})
|
||||
.catch((err) => {
|
||||
console.warn('persistLastActiveTenantPreference: network/serialization error', err)
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user