i/Aether
1
0
Fork 0
mirror of https://github.com/fawney19/Aether.git synced 2026-09-02 09:20:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #175 from AAEE86/dev

Browse Source 
fix: Kiro 导入授权时无法判断重复
This commit is contained in:
fawney19
2026-02-13 21:31:06 +08:00
committed by GitHub
parent d01caaa4b1 3f68821663
commit c171d65d3f
1 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/api/admin/provider_oauth.py
View File

@@ -1340,23 +1340,19 @@ async def import_refresh_token(
logger.warning("Kiro Refresh Token 验证失败: {}", e) logger.warning("Kiro Refresh Token 验证失败: {}", e)
raise InvalidRequestException("Kiro Refresh Token 验证失败，请检查凭据是否有效") raise InvalidRequestException("Kiro Refresh Token 验证失败，请检查凭据是否有效")
# 先获取 email，确保重复检查时有 email 可用
email = await _fetch_kiro_email(new_cfg.to_dict(), proxy_config=proxy_config)
if email and not new_cfg.email:
new_cfg.email = email
# 检查是否存在重复的 Kiro 账号（失效账号允许覆盖） # 检查是否存在重复的 Kiro 账号（失效账号允许覆盖）
existing_key = _check_duplicate_oauth_account(db, provider_id, new_cfg.to_dict()) existing_key = _check_duplicate_oauth_account(db, provider_id, new_cfg.to_dict())
replaced = False replaced = False
# Kiro 确定账号名称（与 Codex/Antigravity 保持一致，使用 email） # Kiro 确定账号名称（与 Codex/Antigravity 保持一致，使用 email）
email: str | None = None name = (payload.name or "").strip()
if not existing_key: if not name:
name = (payload.name or "").strip() name = email or f"账号_{int(time.time())}"
if not name:
email = await _fetch_kiro_email(new_cfg.to_dict(), proxy_config=proxy_config)
name = email or f"账号_{int(time.time())}"
else:
email = await _fetch_kiro_email(new_cfg.to_dict(), proxy_config=proxy_config)
# 将获取到的 email 写回 auth_config，确保持久化
if email and not new_cfg.email:
new_cfg.email = email
if existing_key: if existing_key:
new_key = _update_existing_oauth_key( new_key = _update_existing_oauth_key(
@@ -1876,6 +1872,11 @@ async def _batch_import_kiro_internal(
failed_count += 1 failed_count += 1
continue continue
# 先获取 email，确保重复检查时有 email 可用
email = await _fetch_kiro_email(new_cfg.to_dict(), proxy_config=proxy_config)
if email and not new_cfg.email:
new_cfg.email = email
# 检查是否存在重复（失效账号允许覆盖） # 检查是否存在重复（失效账号允许覆盖）
try: try:
existing_key = _check_duplicate_oauth_account(db, provider_id, new_cfg.to_dict()) existing_key = _check_duplicate_oauth_account(db, provider_id, new_cfg.to_dict())
@@ -1890,13 +1891,6 @@ async def _batch_import_kiro_internal(
failed_count += 1 failed_count += 1
continue continue
# Kiro 确定账号名称（与 Codex/Antigravity 保持一致，使用 email）
email = await _fetch_kiro_email(new_cfg.to_dict(), proxy_config=proxy_config)
# 将获取到的 email 写回 auth_config，确保持久化
if email and not new_cfg.email:
new_cfg.email = email
replaced = False replaced = False
if existing_key: if existing_key:
new_key = _update_existing_oauth_key( new_key = _update_existing_oauth_key(