mirror of
https://github.com/farion1231/cc-switch.git
synced 2026-10-16 21:15:38 +08:00
* Add managed ChatGPT account binding for Codex * Consolidate managed account entry points * Clarify unmanaged Codex login option * fix(provider-form): show Codex FAST mode toggle in account-select mode The FAST mode switch was gated on mode === "manage", but the Claude and Claude Desktop Codex OAuth forms render CodexOAuthSection in select mode while still passing onFastModeChange. The toggle was therefore hidden: new providers couldn't enable FAST mode and existing ones couldn't turn it off, even though the backend still honors meta.codexFastMode. Gate the toggle on onFastModeChange presence instead, restoring the pre-refactor behavior without affecting the manage panel or native Codex form (which do not pass the handler). * fix(i18n): localize Codex managed-account none option label ProviderForm passed a hardcoded Chinese string as codexOauthNoneOptionLabel, so en/ja/zh-TW users saw Chinese text in the Codex account selector's "none" option. Add codexOauth.noneOptionLabel to all four locales and resolve it via t(). * feat(codex): write managed ChatGPT id_token into live auth + reauth prompt Bind the selected ChatGPT account's id_token into the Codex official managed auth.json so it matches a native browser login for the fields that drive behavior (auth_mode, account/plan/email via id_token claims). - Persist id_token on CodexAccountData; capture at login and on refresh (empty string treated as missing). Add get_valid_token_and_id_token_for_account. - codex_managed_oauth_live_auth now writes tokens.id_token when available. - Keep the managed-vs-native safety marker intact: extract_codex_managed_oauth_auth tolerates id_token but still rejects native logins (which carry refresh_token / top-level last_refresh), so cc-switch never clears a real browser login. refresh_token and last_refresh are intentionally NOT written for this reason. - Surface reauth_required (account has no stored id_token) through GitHubAccount -> ManagedAuthAccount -> TS. Legacy accounts get a styled amber prompt + one-click re-login (device flow) in CodexOAuthSection, flagged in both the selector dropdown and the select-mode hint. - i18n: reauth strings added for en / ja / zh / zh-TW. Verified: pnpm typecheck + build:renderer green; cross-model review of Rust correctness, the managed-vs-native safety invariant, and the id_token lifecycle. * style(codex): satisfy prettier format check for reauth UI * fix(i18n): add missing managed-account selector keys The managed OAuth account selector referenced codexOauth.chatgptAccount, codexOauth.manageAccounts, copilot.githubAccount, copilot.manageAccounts and providerForm.providerKeyStatusLoading with Chinese defaultValue fallbacks, so the en/ja/zh-TW UIs rendered Chinese text. Add the translations across all four locales. Addresses review feedback on #3879. * fix(providers): don't clear managed OAuth binding on status-query failure useManagedAuth now exposes isStatusSuccess. The account-clear effect in the Codex/Copilot selector sections only unbinds when the status query has *successfully* loaded and the bound account is genuinely gone. Previously a failed or still-pending query yielded an empty accounts array, which silently cleared the selection; the subsequent save then dropped providerType/authBinding and turned a managed provider into a broken unbound config. Addresses review feedback on #3879. * fix(codex-oauth): make managed accounts safe & usable with the bare CLI Addresses review feedback on #3879. These backend changes are deeply intertwined across shared files, so they are committed together. Refreshable managed auth (bare `codex` support): - Write a full, native-shaped auth.json bundle (tokens.refresh_token + top-level last_refresh) instead of an access-only token, so the Codex CLI can self-refresh and the managed account keeps working past ~1h without a proxy. - last_refresh reflects the access token's real obtained-at time (not write time), so the CLI doesn't treat a cached token as freshly refreshed. - Read back the CLI-rotated refresh_token from ~/.codex/auth.json before writing (account_id-matched, chatgpt-mode guarded) so re-switching doesn't clobber the CLI's valid login with a stale refresh_token. Never persist managed tokens at rest: - Backfill of a managed provider always replaces live auth with the stored placeholder (even on marker mismatch), so native tokens can't leak into the provider's DB config. - Sanitize managed auth out of Live backups on the initial/strict snapshot paths and in update_live_backup_from_provider_inner before serialization. Concurrency / blocking: - Drop the redundant outer Arc<RwLock<CodexOAuthManager>> (all methods are &self) so token refresh no longer holds a coarse lock across the network; give OAuth token/device requests a 30s timeout instead of the shared 600s client default. - Add a persistence lock and linearize the access-token cache under a consistent accounts -> access_tokens order (existence-checked reads/writes; remove/clear clear the cache atomically) to prevent stale or resurrected cache entries. Switch ordering: - Preflight the managed token before committing the current provider on switch/add/update, so a failed token fetch can't leave DB/UI pointing at a provider whose live config was never written. Cleanup: - Remove the now-dead content-fingerprint marker machinery; managed writes are now shape-identical to a native login, so ownership is judged by account_id. Known, documented limitations (B-scheme, narrow & recoverable): a remove+re-login of the same account within an in-flight refresh window (ABA), a login authorized after logout, and switch-away cleanup being unable to distinguish our write from a user's native login of the same account. * fix(codex-oauth): keep managed token in restore backup; fix failing tests CI caught three test failures from the previous commit. Root cause: the Live backup (proxy_live_backup) is local restore state that is replayed to ~/.codex/auth.json when proxy takeover ends, so it must contain the real auth to restore a working login. Stripping it (the earlier "don't leak into backup" change) broke restore and over-stripped a user's native login. - Revert the backup auth stripping: remove sanitize_codex_backup_auth from the initial/strict snapshot paths and the forced auth={} in update_live_backup_from_provider_inner. The managed token belongs in the restore backup (the refresh_token is already persisted by CodexOAuthManager, so this is not a new exposure). - Restore the ownership marker (account_id + access_token fingerprint) so backup cleanup can tell our managed write from a user's native `codex login` of the same account. extract now also tolerates the full-bundle shape (refresh_token + last_refresh) so it fingerprints ①'s refreshable writes. clear_codex_auth_in_backup and clear_codex_live_auth_for_managed_account use the marker again; the account_id-only helper is dropped. - Fix the adopt unit test: adopt now invalidates the cached access token, so the test asserts the stored refresh_token/id_token were updated and the cache was cleared instead of reading it back through get_valid_token_bundle (which would trigger a network refresh). Token stays out of the exported provider settings_config (backfill strip) — only the local restore backup keeps it, matching pre-existing behavior. * fix(codex): harden managed OAuth credential lifecycle * fix: preserve Codex restore auth state * feat(codex): support multiple official accounts * feat(codex): refine official account login selection Keep native Codex login separate from managed ChatGPT accounts, migrate provider identity safely when switching modes, and cover the account-selection states with regression tests. * style(codex): satisfy clippy for login guard --------- Co-authored-by: Jason <farion1231@gmail.com> Co-authored-by: YUZHEthefool <2804776511@qq.com>
215 lines
6.0 KiB
TypeScript
215 lines
6.0 KiB
TypeScript
import { QueryClientProvider } from "@tanstack/react-query";
|
|
import { render, screen } from "@testing-library/react";
|
|
import userEvent from "@testing-library/user-event";
|
|
import { describe, expect, it, vi } from "vitest";
|
|
import { ProviderCard } from "@/components/providers/ProviderCard";
|
|
import type { ManagedAuthStatus } from "@/lib/api";
|
|
import type { Provider } from "@/types";
|
|
import { createTestQueryClient } from "../utils/testQueryClient";
|
|
|
|
vi.mock("@/components/providers/ProviderActions", () => ({
|
|
ProviderActions: () => null,
|
|
}));
|
|
|
|
vi.mock("@/components/ProviderIcon", () => ({
|
|
ProviderIcon: () => null,
|
|
}));
|
|
|
|
vi.mock("@/components/UsageFooter", () => ({ default: () => null }));
|
|
vi.mock("@/components/SubscriptionQuotaFooter", () => ({
|
|
default: () => null,
|
|
}));
|
|
vi.mock("@/components/CopilotQuotaFooter", () => ({ default: () => null }));
|
|
vi.mock("@/components/CodexOauthQuotaFooter", () => ({
|
|
default: () => null,
|
|
}));
|
|
vi.mock("@/components/XaiOauthQuotaFooter", () => ({ default: () => null }));
|
|
|
|
vi.mock("@/lib/query/failover", () => ({
|
|
useProviderHealth: () => ({ data: undefined }),
|
|
}));
|
|
|
|
vi.mock("@/lib/query/queries", () => ({
|
|
useUsageQuery: () => ({ data: undefined }),
|
|
}));
|
|
|
|
const managedProvider = (
|
|
name: string,
|
|
accountId = "account-long",
|
|
): Provider => ({
|
|
id: "managed-official",
|
|
name,
|
|
category: "official",
|
|
settingsConfig: {},
|
|
meta: {
|
|
providerType: "codex_oauth",
|
|
authBinding: {
|
|
source: "managed_account",
|
|
authProvider: "codex_oauth",
|
|
accountId,
|
|
},
|
|
},
|
|
});
|
|
|
|
const authStatus = (login: string): ManagedAuthStatus => ({
|
|
provider: "codex_oauth",
|
|
authenticated: true,
|
|
default_account_id: "account-long",
|
|
accounts: [
|
|
{
|
|
id: "account-long",
|
|
provider: "codex_oauth",
|
|
login,
|
|
avatar_url: null,
|
|
authenticated_at: 0,
|
|
is_default: true,
|
|
github_domain: "",
|
|
reauth_required: false,
|
|
requires_reauth: false,
|
|
},
|
|
],
|
|
});
|
|
|
|
function renderCard(
|
|
provider: Provider,
|
|
options: {
|
|
status?: ManagedAuthStatus;
|
|
isCurrent?: boolean;
|
|
onEdit?: (provider: Provider) => void;
|
|
} = {},
|
|
) {
|
|
const queryClient = createTestQueryClient();
|
|
if (options.status) {
|
|
queryClient.setQueryData(
|
|
["managed-auth-status", "codex_oauth"],
|
|
options.status,
|
|
);
|
|
}
|
|
|
|
return render(
|
|
<QueryClientProvider client={queryClient}>
|
|
<ProviderCard
|
|
provider={provider}
|
|
appId="codex"
|
|
isCurrent={options.isCurrent ?? false}
|
|
isProxyRunning={false}
|
|
onSwitch={vi.fn()}
|
|
onEdit={options.onEdit ?? vi.fn()}
|
|
onDelete={vi.fn()}
|
|
onConfigureUsage={vi.fn()}
|
|
onOpenWebsite={vi.fn()}
|
|
onDuplicate={vi.fn()}
|
|
/>
|
|
</QueryClientProvider>,
|
|
);
|
|
}
|
|
|
|
describe("ProviderCard Codex Official account identity", () => {
|
|
it("keeps a custom nickname and safely truncates a long account login", () => {
|
|
const login =
|
|
"a-very-long-personal-account-name-that-must-not-expand-the-card@example.com";
|
|
renderCard(managedProvider("Work account"), {
|
|
status: authStatus(login),
|
|
});
|
|
|
|
expect(
|
|
screen.getByRole("heading", { level: 3, name: "Work account" }),
|
|
).toBeInTheDocument();
|
|
expect(screen.getByTitle(login)).toHaveClass("truncate");
|
|
expect(screen.getByTitle(login)).toHaveTextContent(login);
|
|
});
|
|
|
|
it("keeps generated and legacy generated provider names as the title", () => {
|
|
const login = "user@example.com";
|
|
const { rerender } = renderCard(managedProvider(login), {
|
|
status: authStatus(login),
|
|
});
|
|
|
|
expect(screen.getByRole("heading", { name: login })).toHaveAttribute(
|
|
"title",
|
|
login,
|
|
);
|
|
expect(screen.getByText("OpenAI 账号")).toBeInTheDocument();
|
|
|
|
const queryClient = createTestQueryClient();
|
|
queryClient.setQueryData(
|
|
["managed-auth-status", "codex_oauth"],
|
|
authStatus(login),
|
|
);
|
|
rerender(
|
|
<QueryClientProvider client={queryClient}>
|
|
<ProviderCard
|
|
provider={managedProvider(`OpenAI Official (${login})`)}
|
|
appId="codex"
|
|
isCurrent={false}
|
|
isProxyRunning={false}
|
|
onSwitch={vi.fn()}
|
|
onEdit={vi.fn()}
|
|
onDelete={vi.fn()}
|
|
onConfigureUsage={vi.fn()}
|
|
onOpenWebsite={vi.fn()}
|
|
onDuplicate={vi.fn()}
|
|
/>
|
|
</QueryClientProvider>,
|
|
);
|
|
|
|
expect(
|
|
screen.getByRole("heading", {
|
|
name: `OpenAI Official (${login})`,
|
|
}),
|
|
).toHaveClass("truncate");
|
|
});
|
|
|
|
it("keeps the provider name on the native card and explains its login", () => {
|
|
renderCard({
|
|
id: "codex-official",
|
|
name: "OpenAI Official",
|
|
category: "official",
|
|
settingsConfig: {},
|
|
});
|
|
|
|
expect(
|
|
screen.getByRole("heading", { name: "OpenAI Official" }),
|
|
).toBeInTheDocument();
|
|
expect(
|
|
screen.getByText("账号会随 Codex CLI 当前登录变化"),
|
|
).toBeInTheDocument();
|
|
});
|
|
|
|
it("shows a manual note instead of generated account guidance", () => {
|
|
renderCard({
|
|
id: "codex-official",
|
|
name: "OpenAI Official",
|
|
notes: "Primary work provider",
|
|
category: "official",
|
|
settingsConfig: {},
|
|
});
|
|
|
|
expect(screen.getByText("Primary work provider")).toBeInTheDocument();
|
|
expect(
|
|
screen.queryByText("账号会随 Codex CLI 当前登录变化"),
|
|
).not.toBeInTheDocument();
|
|
});
|
|
|
|
it("makes a legacy unbound card actionable without changing it", async () => {
|
|
const user = userEvent.setup();
|
|
const onEdit = vi.fn();
|
|
const provider: Provider = {
|
|
id: "legacy-unbound",
|
|
name: "Legacy Official",
|
|
category: "official",
|
|
settingsConfig: {},
|
|
};
|
|
renderCard(provider, { isCurrent: true, onEdit });
|
|
|
|
expect(screen.getByText("尚未选择账号").parentElement).toHaveClass(
|
|
"text-sm",
|
|
);
|
|
const chooseAccount = screen.getByRole("button", { name: "选择账号" });
|
|
expect(chooseAccount).toHaveClass("text-sm");
|
|
expect(screen.queryByText("使用中")).not.toBeInTheDocument();
|
|
await user.click(chooseAccount);
|
|
expect(onEdit).toHaveBeenCalledWith(provider);
|
|
});
|
|
});
|