fix(cpa): do not fallback id_token to access_token

Author: qwe12369

src/core/upload/cpa_upload.py

@@ -149,10 +149,7 @@ def generate_token_json(account: Account) -> dict:
         CPA 格式的 Token 字典
     """
     access_token = str(account.access_token or "").strip()
-    id_token_raw = str(account.id_token or "").strip()
-    # 兼容历史下游：部分工具只从 id_token 提取 chatgpt_account_id。
-    # 当注册链路仅拿到 access_token 时，使用 access_token 作为兜底 id_token 供解析。
-    id_token = id_token_raw or access_token
+    id_token = str(account.id_token or "").strip()
     refresh_token = str(account.refresh_token or "").strip()
 
     claims = _decode_jwt_payload_unverified(access_token) or _decode_jwt_payload_unverified(id_token)

tests/test_cpa_upload_token_json.py

@@ -43,7 +43,7 @@ def test_generate_token_json_backfills_time_and_account_id_from_access_token():
     assert token_data["email"] == "ericvillegas9964@outlook.com"
     assert token_data["last_refresh"] == "2026-04-01T13:03:41+08:00"
     assert token_data["expired"] == "2026-04-11T13:03:41+08:00"
-    assert token_data["id_token"] == account.access_token
+    assert token_data["id_token"] == ""
     assert token_data["workspace_id"] == "acct_from_jwt"
     assert token_data["chatgpt_account_id"] == "acct_from_jwt"
 
@@ -87,3 +87,28 @@ def test_generate_token_json_uses_metadata_expires_when_db_and_jwt_missing():
 
     assert token_data["expired"] == "2026-06-30T13:03:46+08:00"
     assert token_data["id_token"] == ""
+
+
+def test_generate_token_json_keeps_real_id_token_and_uses_it_for_claims():
+    payload = {
+        "iat": 1775019821,
+        "exp": 1775883821,
+        "https://api.openai.com/auth": {"chatgpt_account_id": "acct_from_id_token"},
+    }
+    id_token = _jwt_with_payload(payload)
+
+    account = Account(
+        email="idtoken@example.com",
+        email_service="luckmail",
+        access_token="",
+        id_token=id_token,
+        account_id="",
+        last_refresh=None,
+        expires_at=None,
+    )
+
+    token_data = generate_token_json(account)
+
+    assert token_data["id_token"] == id_token
+    assert token_data["account_id"] == "acct_from_id_token"
+    assert token_data["chatgpt_account_id"] == "acct_from_id_token"