feat(oauth): 新增 Codex account_user_id 和 organizations 字段采集、展示与判重

- 从 Codex id_token claims 和 token_response 中提取 account_user_id 和 organizations
- OAuth 判重逻辑改为优先按 account_user_id 匹配,支持同用户不同 Team 不误判
- 号池和 Provider 详情页展示组织标签、account ID 和 account_user_id
- 前端重复的 OAuth identity 工具函数提取到 utils/oauthIdentity.ts
- 后端重复的 normalize_oauth_organizations 提取到 core/provider_oauth_utils.py
This commit is contained in:
fawney19
2026-03-11 21:37:08 +08:00
parent b45f021bba
commit 0d770d1c4d
16 changed files with 546 additions and 15 deletions

View File

@@ -1,17 +1,24 @@
from __future__ import annotations
import json
from types import SimpleNamespace
import pytest
from src.api.admin import provider_oauth as module
from src.core.exceptions import InvalidRequestException
def test_parse_standard_oauth_import_entries_keeps_codex_hints() -> None:
entries = module._parse_standard_oauth_import_entries(
'[{"refresh_token":"rt_1","accountId":"acc-1","planType":"TEAM","userId":"u-1","email":"u@example.com"}]'
'[{"refresh_token":"rt_1","accountId":"acc-1","chatgptAccountUserId":"u-1__acc-1","planType":"TEAM","userId":"u-1","email":"u@example.com"}]'
)
assert entries == [
{
"refresh_token": "rt_1",
"account_id": "acc-1",
"account_user_id": "u-1__acc-1",
"plan_type": "team",
"user_id": "u-1",
"email": "u@example.com",
@@ -32,6 +39,7 @@ def test_apply_codex_import_hints_only_fills_missing_fields() -> None:
module._apply_codex_import_hints(
auth_config,
{
"account_user_id": "u-1__acc-1",
"account_id": "acc-1",
"plan_type": "plus",
"user_id": "user-1",
@@ -40,6 +48,106 @@ def test_apply_codex_import_hints_only_fills_missing_fields() -> None:
)
assert auth_config["account_id"] == "existing-account"
assert auth_config["account_user_id"] == "u-1__acc-1"
assert auth_config["plan_type"] == "plus"
assert auth_config["user_id"] == "user-1"
assert auth_config["email"] == "u@example.com"
class _DummyQuery:
def __init__(self, keys: list[SimpleNamespace]) -> None:
self._keys = keys
def filter(self, *_args: object, **_kwargs: object) -> "_DummyQuery":
return self
def all(self) -> list[SimpleNamespace]:
return self._keys
class _DummyDB:
def __init__(self, keys: list[SimpleNamespace]) -> None:
self._keys = keys
def query(self, _model: object) -> _DummyQuery:
return _DummyQuery(self._keys)
def _make_oauth_key(*, key_id: str, name: str, auth_config: dict[str, object]) -> SimpleNamespace:
return SimpleNamespace(
id=key_id,
name=name,
provider_id="provider-1",
auth_type="oauth",
auth_config=json.dumps(auth_config),
is_active=True,
)
def test_check_duplicate_oauth_account_codex_allows_same_user_different_account_id(
monkeypatch: pytest.MonkeyPatch,
) -> None:
monkeypatch.setattr(module.crypto_service, "decrypt", lambda value, silent=True: value)
existing_key = _make_oauth_key(
key_id="key-1",
name="existing",
auth_config={
"provider_type": "codex",
"email": "u@example.com",
"user_id": "user-1",
"account_id": "acc-1",
"account_user_id": "user-1__acc-1",
"plan_type": "team",
},
)
db = _DummyDB([existing_key])
result = module._check_duplicate_oauth_account(
db, # type: ignore[arg-type]
"provider-1",
{
"provider_type": "codex",
"email": "u@example.com",
"user_id": "user-1",
"account_id": "acc-2",
"account_user_id": "user-1__acc-2",
"plan_type": "team",
},
)
assert result is None
def test_check_duplicate_oauth_account_codex_rejects_same_account_user_identity(
monkeypatch: pytest.MonkeyPatch,
) -> None:
monkeypatch.setattr(module.crypto_service, "decrypt", lambda value, silent=True: value)
existing_key = _make_oauth_key(
key_id="key-1",
name="existing",
auth_config={
"provider_type": "codex",
"email": "u@example.com",
"user_id": "user-1",
"account_id": "acc-1",
"account_user_id": "user-1__acc-1",
"plan_type": "team",
},
)
db = _DummyDB([existing_key])
with pytest.raises(InvalidRequestException, match="已存在"):
module._check_duplicate_oauth_account(
db, # type: ignore[arg-type]
"provider-1",
{
"provider_type": "codex",
"email": "u@example.com",
"user_id": "user-1",
"account_id": "acc-1",
"account_user_id": "user-1__acc-1",
"plan_type": "team",
},
)