huangzhenpc/kirogo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: Refactor authentication method based on presence of client credentials (#5)

Browse Source 
- Refactor authentication method based on presence of client credentials in payload.
This commit is contained in:
hkxiaoyao
2026-02-08 00:02:35 +08:00
committed by GitHub
parent 5332a5381e
commit 9aad3dec7e
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
web/index.html
View File

@@ -1741,7 +1741,9 @@
try { clientData = JSON.parse(clientJson); } catch { alert(t('local.clientInvalid')); return; }
if (!clientData.clientId || !clientData.clientSecret) { alert(t('local.clientSecretMissing')); return; }
}
const payload = { refreshToken: tokenData.refreshToken, accessToken: tokenData.accessToken || '', clientId: clientData?.clientId || '', clientSecret: clientData?.clientSecret || '', authMethod: isSocial ? 'social' : 'idc', provider: provider };
// 根据是否有 clientData 判断认证方式
const authMethod = clientData ? 'idc' : 'social';
const payload = { refreshToken: tokenData.refreshToken, accessToken: tokenData.accessToken || '', clientId: clientData?.clientId || '', clientSecret: clientData?.clientSecret || '', authMethod: authMethod, provider: provider };
const res = await fetch('/admin/api/auth/credentials', { method: 'POST', headers: { 'Content-Type': 'application/json', 'X-Admin-Password': password }, body: JSON.stringify(payload) });
const d = await res.json();
if (d.success) { closeModal(); loadAccounts(); loadStats(); alert(t('local.importSuccess') + ': ' + (d.account?.email || d.account?.id)); }
@@ -1754,9 +1756,10 @@
let success = 0, failed = 0, errors = [];
for (const item of items) {
if (!item.refreshToken) { failed++; errors.push('missing refreshToken'); continue; }
const provider = (item.provider || 'BuilderId').toLowerCase();
const isSocial = provider === 'google' || provider === 'github' || provider === 'builderid';
const payload = { refreshToken: item.refreshToken, clientId: item.clientId || '', clientSecret: item.clientSecret || '', authMethod: isSocial ? 'social' : 'idc', provider: item.provider || 'BuilderId' };
// 根据是否包含 clientId/clientSecret 判断认证方式
const hasClientCredentials = !!(item.clientId && item.clientSecret);
const authMethod = hasClientCredentials ? 'idc' : 'social';
const payload = { refreshToken: item.refreshToken, clientId: item.clientId || '', clientSecret: item.clientSecret || '', authMethod: authMethod, provider: item.provider || 'BuilderId' };
try {
const res = await fetch('/admin/api/auth/credentials', { method: 'POST', headers: { 'Content-Type': 'application/json', 'X-Admin-Password': password }, body: JSON.stringify(payload) });
const d = await res.json();