账户页去掉多余的 /api/system/status 请求:用 /api/me 的 404 判定未启用认证
This commit is contained in:
@@ -1987,20 +1987,22 @@
|
|||||||
setTitle('账户');
|
setTitle('账户');
|
||||||
setActions('');
|
setActions('');
|
||||||
setBody('<div class="set-scroll"><div class="empty-tip">加载中…</div></div>');
|
setBody('<div class="set-scroll"><div class="empty-tip">加载中…</div></div>');
|
||||||
|
// 单个 /api/me 即可判认证开关:启用认证时中间件保证已登录,user 必有;
|
||||||
|
// 未启用时 createAuth 提前返回,该路由不存在 → 404。无需再拉 /api/system/status
|
||||||
|
let me;
|
||||||
try {
|
try {
|
||||||
const [st, me] = await Promise.all([
|
me = await req('GET', '/api/me');
|
||||||
req('GET', '/api/system/status'),
|
} catch (e) {
|
||||||
req('GET', '/api/me').catch(function () { return { user: null }; }), // 未启用认证时无此路由
|
if (ctx()) setBody('<div class="set-scroll"><div class="empty-tip">' +
|
||||||
]);
|
(e.status === 404 ? '未启用登录认证,无账户设置。' : '加载失败:' + esc(e.message)) + '</div></div>');
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (!ctx()) return;
|
if (!ctx()) return;
|
||||||
if (!st.auth_enabled || !me || !me.user) {
|
if (!me || !me.user) {
|
||||||
setBody('<div class="set-scroll"><div class="empty-tip">未启用登录认证,无账户设置。</div></div>');
|
setBody('<div class="set-scroll"><div class="empty-tip">未启用登录认证,无账户设置。</div></div>');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
setBody('<div class="set-scroll">' + userCardHtml(me.user) + '</div>');
|
setBody('<div class="set-scroll">' + userCardHtml(me.user) + '</div>');
|
||||||
} catch (e) {
|
|
||||||
if (ctx()) setBody('<div class="set-scroll"><div class="empty-tip">加载失败:' + esc(e.message) + '</div></div>');
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
async function changePassword() {
|
async function changePassword() {
|
||||||
try {
|
try {
|
||||||
|
|||||||
Reference in New Issue
Block a user