lywsvip/cc-switch
1
0
Fork 0
mirror of https://github.com/farion1231/cc-switch.git synced 2026-09-03 06:52:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(codex): clean up OAuth account selector

Browse Source
This commit is contained in:
saladday
2026-08-17 01:53:32 -04:00
parent d8065cc628
commit 717dc3b8c4
2 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/components/providers/forms/CodexOAuthSection.tsx
View File

@@ -247,22 +247,23 @@ export const CodexOAuthSection: React.FC<CodexOAuthSectionProps> = ({
</span>
</SelectItem>
)}
{!allowUnboundSelection && !selectedAccountId && (
<SelectItem value="__managed_account_required__" disabled>
<span className="text-muted-foreground">
{accountChoicePlaceholder}
</span>
</SelectItem>
)}
{!requireExplicitSelection &&
!allowUnboundSelection &&
!selectedAccountId && (
<SelectItem value="__managed_account_required__" disabled>
<span className="text-muted-foreground">
{accountChoicePlaceholder}
</span>
</SelectItem>
)}
{!nativeLoginOnly &&
accounts.map((account, index) => (
<React.Fragment key={account.id}>
<SelectItem
value={account.id}
className="min-w-0 overflow-hidden py-2 pl-6 [&>span:last-child]:min-w-0 [&>span:last-child]:flex-1 [&>span:last-child]:overflow-hidden"
className="min-w-0 overflow-hidden py-2 [&>span:last-child]:min-w-0 [&>span:last-child]:flex-1 [&>span:last-child]:overflow-hidden"
>
<div className="flex min-w-0 items-center gap-2">
<span aria-hidden className="h-4 w-4 shrink-0" />
<span
className="min-w-0 truncate text-sm font-medium leading-5"
title={account.login}
@@ -286,9 +287,12 @@ export const CodexOAuthSection: React.FC<CodexOAuthSectionProps> = ({
</React.Fragment>
))}
{!nativeLoginOnly && onManageAccounts && (
<SelectItem value="__manage_accounts__" className="py-2 pl-6">
<SelectItem value="__manage_accounts__" className="py-2">
<div className="flex items-center gap-2">
<Plus className="h-4 w-4 shrink-0 text-muted-foreground" />
<Plus
aria-hidden
className="absolute left-2 top-1/2 h-4 w-4 -translate-y-1/2 text-muted-foreground"
/>
<span className="truncate text-sm font-medium leading-5">
{t(
"codexOauth.addOrManageAccounts",
@@ -306,10 +310,9 @@ export const CodexOAuthSection: React.FC<CodexOAuthSectionProps> = ({
{allowUnboundSelection && (
<SelectItem
value="none"
className="min-w-0 overflow-hidden py-2 pl-6 [&>span:last-child]:min-w-0 [&>span:last-child]:flex-1 [&>span:last-child]:overflow-hidden"
className="min-w-0 overflow-hidden py-2 [&>span:last-child]:min-w-0 [&>span:last-child]:flex-1 [&>span:last-child]:overflow-hidden"
>
<div className="flex min-w-0 items-center gap-2">
<span aria-hidden className="h-4 w-4 shrink-0" />
<span className="shrink-0 text-sm font-medium leading-5">
{noneOptionLabel ??
t("codexOauth.useDefaultAccount", "使用默认账号")}

9
tests/components/CodexOAuthSection.test.tsx
View File

@@ -228,13 +228,15 @@ describe("CodexOAuthSection", () => {
).toBeInTheDocument();
});
it("shows a disabled account prompt before a managed account is selected", () => {
it("shows one disabled prompt before a managed account is selected", async () => {
const user = userEvent.setup();
render(
<CodexOAuthSection
mode="select"
selectedAccountId={null}
onAccountSelect={vi.fn()}
allowUnboundSelection={false}
requireExplicitSelection
/>,
);
@@ -244,6 +246,11 @@ describe("CodexOAuthSection", () => {
"font-normal",
"text-muted-foreground",
);
await user.click(screen.getByRole("combobox"));
expect(
screen.getAllByRole("option", { name: "请选择登录方式" }),
).toHaveLength(1);
});
it("does not default a new Official card to the current Codex login", async () => {