Skip to content

修复添加 API Key 后被强制退出登录的问题 #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
T1mn wants to merge 1 commit into
base: main
Choose a base branch
from
Open

修复添加 API Key 后被强制退出登录的问题 #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion app/static/common/admin-auth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,10 @@ async function requestApiKey(creds) {
return cachedApiKey;
}

async function ensureApiKey() {
async function ensureApiKey(forceRefresh = false) {
if (cachedApiKey && !forceRefresh) {
return cachedApiKey;
}
const creds = await getStoredAppKey();
if (!creds || !creds.password) {
window.location.href = '/login';
Expand Down
30 changes: 25 additions & 5 deletions app/static/keys/keys.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,14 +383,20 @@ function applyKeyLimitPreset(mode) {
q('limit-video').value = recommended.video;
}

async function loadKeys() {
async function loadKeys(retryOn401 = true) {
const body = q('keys-table-body');
if (body) body.innerHTML = '';
setLoading(true);
setEmptyState(false);
try {
const res = await fetch('/api/v1/admin/keys', { headers: buildAuthHeaders(apiKey) });
if (res.status === 401) return logout();
if (res.status === 401) {
if (retryOn401) {
apiKey = await ensureApiKey(true);
if (apiKey) return loadKeys(false);
}
return logout();
}
const payload = await parseJsonSafely(res);
if (!res.ok || payload?.success !== true) {
throw new Error(extractErrorMessage(payload, '加载失败'));
Expand Down Expand Up @@ -428,7 +434,12 @@ async function submitKeyModal() {
is_active: isActive,
}),
});
if (res.status === 401) return logout();
if (res.status === 401) {
apiKey = await ensureApiKey(true);
if (!apiKey) return logout();
setSubmitState(false);
return submitKeyModal();
}
const payload = await parseJsonSafely(res);
if (!res.ok || payload?.success !== true) {
throw new Error(extractErrorMessage(payload, '创建失败'));
Expand Down Expand Up @@ -457,7 +468,12 @@ async function submitKeyModal() {
limits,
}),
});
if (res.status === 401) return logout();
if (res.status === 401) {
apiKey = await ensureApiKey(true);
if (!apiKey) return logout();
setSubmitState(false);
return submitKeyModal();
}
const payload = await parseJsonSafely(res);
if (!res.ok || payload?.success !== true) {
throw new Error(extractErrorMessage(payload, '更新失败'));
Expand All @@ -484,7 +500,11 @@ async function deleteKey(row) {
headers: { ...buildAuthHeaders(apiKey), 'Content-Type': 'application/json' },
body: JSON.stringify({ key }),
});
if (res.status === 401) return logout();
if (res.status === 401) {
apiKey = await ensureApiKey(true);
if (!apiKey) return logout();
return deleteKey(row);
}
const payload = await parseJsonSafely(res);
if (!res.ok || payload?.success !== true) {
throw new Error(extractErrorMessage(payload, '删除失败'));
Expand Down