feat(停用账号): 停用/删除即强制下线并点名成因——写入口、X-Auth-Reason 头、三面接线
- Java:AdminUserUpdateRequest 加 disabled 开关(不能停自己、归属门沿用既有闸), AccountExpiryService/AdminAuthSupport 抛停用/删除子类型,GlobalExceptionHandler 打 X-Auth-Reason: disabled|deleted 响应头;业务码保持 401 不变,不惊动三个既有消费者 - 后台管理:用户页停用/解除停用按钮 + 已停用徽章;拦截器把成因随 &auth= 带给登录页, 登录页分停用/删除两种文案;源码钉子棘轮基线按正路重生成 - 用户端:kick-handler 按 X-Auth-Reason 分支亮停用/删除标记(互斥清理), 登录页两段专属文案且各自关自动登录;跳转目标仍是 /login?expired=1 - 反假绿:摘掉成因头注入实测 2/4 红(变异自证),还原等值后复跑回绿
This commit is contained in:
@@ -52,6 +52,8 @@
|
||||
<h1 class="login-title">登录</h1>
|
||||
<p v-if="kickedNotice" class="kicked-msg">该账号已在其他设备登录,本设备已下线。如非本人操作,请及时修改密码。</p>
|
||||
<p v-if="expiredNotice" class="kicked-msg">登录状态已失效(登录凭证过期,或该账号已被管理员删除),请重新登录。</p>
|
||||
<p v-if="disabledNotice" class="kicked-msg">该账号已被管理员停用,本设备已退出登录。如有疑问请联系管理员恢复后重新登录。</p>
|
||||
<p v-if="deletedNotice" class="kicked-msg">该账号已被管理员删除,本设备已退出登录。</p>
|
||||
<p v-if="errorMessage" class="error-msg">{{ errorMessage }}</p>
|
||||
<form id="loginForm" @submit.prevent="submitLogin">
|
||||
<div class="form-group">
|
||||
@@ -112,7 +114,7 @@
|
||||
import { onMounted, ref, watch } from 'vue'
|
||||
import { useRouter } from 'vue-router'
|
||||
import { loginWithDevice } from '@/shared/api/user'
|
||||
import { KICK_NOTICE_KEY, SESSION_EXPIRED_NOTICE_KEY } from '@/shared/auth/kick-handler'
|
||||
import { ACCOUNT_DELETED_NOTICE_KEY, ACCOUNT_DISABLED_NOTICE_KEY, KICK_NOTICE_KEY, SESSION_EXPIRED_NOTICE_KEY } from '@/shared/auth/kick-handler'
|
||||
import { COMPANY_NAME_STORAGE_KEY, writeCompanyIdentity } from '@/shared/auth/company-identity'
|
||||
import { clearAccountExpiry, writeAccountExpiry } from '@/shared/auth/account-expiry'
|
||||
import { useVersionUpdate } from '@/shared/composables/useVersionUpdate'
|
||||
@@ -137,6 +139,8 @@ const loggingIn = ref(false)
|
||||
const errorMessage = ref('')
|
||||
const kickedNotice = ref(false)
|
||||
const expiredNotice = ref(false)
|
||||
const disabledNotice = ref(false)
|
||||
const deletedNotice = ref(false)
|
||||
const rememberPassword = ref(false)
|
||||
const autoLogin = ref(false)
|
||||
const updateOpen = ref(false)
|
||||
@@ -295,6 +299,16 @@ function isSessionExpiredNav(): boolean {
|
||||
return lsGet(SESSION_EXPIRED_NOTICE_KEY) === '1'
|
||||
}
|
||||
|
||||
/** 账号被管理员停用后跳回登录页:标记由 kick-handler 按后端 X-Auth-Reason 写入 */
|
||||
function isAccountDisabledNav(): boolean {
|
||||
return lsGet(ACCOUNT_DISABLED_NOTICE_KEY) === '1'
|
||||
}
|
||||
|
||||
/** 账号被删除后跳回登录页:同上,与停用/过期分开存 */
|
||||
function isAccountDeletedNav(): boolean {
|
||||
return lsGet(ACCOUNT_DELETED_NOTICE_KEY) === '1'
|
||||
}
|
||||
|
||||
function togglePassword() {
|
||||
passwordVisible.value = !passwordVisible.value
|
||||
}
|
||||
@@ -510,12 +524,27 @@ onMounted(() => {
|
||||
lsRemove(SESSION_EXPIRED_NOTICE_KEY)
|
||||
}
|
||||
|
||||
if (isAccountDisabledNav()) {
|
||||
// 账号已被管理员停用:同样关自动登录,标记展示后即清。
|
||||
disabledNotice.value = true
|
||||
autoLogin.value = false
|
||||
lsSet(AUTO_LOGIN_KEY, '0')
|
||||
lsRemove(ACCOUNT_DISABLED_NOTICE_KEY)
|
||||
}
|
||||
|
||||
if (isAccountDeletedNav()) {
|
||||
deletedNotice.value = true
|
||||
autoLogin.value = false
|
||||
lsSet(AUTO_LOGIN_KEY, '0')
|
||||
lsRemove(ACCOUNT_DELETED_NOTICE_KEY)
|
||||
}
|
||||
|
||||
// 恢复记住的凭据并尝试自动登录(桌面与网页形态一致;登出/切号导航由 tryAutoLogin 内部豁免)
|
||||
// loadCredentials 现为异步(AES 解密),须先恢复密码再触发自动登录
|
||||
void (async () => {
|
||||
await loadCredentials()
|
||||
if (kickedNotice.value || expiredNotice.value) {
|
||||
// 刚被顶下线或登录态失效:不自动重登,等用户手动点登录(此时顶掉对方,最后登录者胜)
|
||||
if (kickedNotice.value || expiredNotice.value || disabledNotice.value || deletedNotice.value) {
|
||||
// 刚被顶下线/登录态失效/停用/删除:不自动重登,等用户手动点登录(此时顶掉对方,最后登录者胜)
|
||||
autoLogin.value = false
|
||||
return
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user