Merge main and harden managed Codex account flow

2026-07-27 16:26:16 +08:00 · 2026-07-18 10:06:58 +00:00
parent d6ebc24cb3 997be22bfa
commit 0acce5477a
276 changed files with 32101 additions and 3292 deletions
@@ -2,6 +2,7 @@ import { fireEvent, render, screen, waitFor } from "@testing-library/react";
 import { beforeEach, describe, expect, it, vi } from "vitest";
 import { AddProviderDialog } from "@/components/providers/AddProviderDialog";
 import type { ProviderFormValues } from "@/components/providers/forms/ProviderForm";
+import { codexProviderPresets } from "@/config/codexProviderPresets";

 vi.mock("@/components/ui/dialog", () => ({
  Dialog: ({ children }: { children: React.ReactNode }) => (
@@ -125,4 +126,96 @@ describe("AddProviderDialog", () => {
      },
    });
  });
+
+  it("submits the managed account selected from the Codex Official preset", async () => {
+    const handleSubmit = vi.fn().mockResolvedValue(undefined);
+    const officialPresetIndex = codexProviderPresets.findIndex(
+      (preset) =>
+        preset.category === "official" && preset.providerType === "codex_oauth",
+    );
+    expect(officialPresetIndex).toBeGreaterThanOrEqual(0);
+
+    mockFormValues = {
+      name: "OpenAI Official",
+      websiteUrl: "https://chatgpt.com/codex",
+      settingsConfig: JSON.stringify({ auth: {}, config: "" }),
+      presetId: `codex-${officialPresetIndex}`,
+      presetCategory: "official",
+      meta: {
+        providerType: "codex_oauth",
+        authBinding: {
+          source: "managed_account",
+          authProvider: "codex_oauth",
+          accountId: "acct-managed",
+        },
+      },
+    };
+
+    render(
+      <AddProviderDialog
+        open
+        onOpenChange={vi.fn()}
+        appId="codex"
+        onSubmit={handleSubmit}
+      />,
+    );
+
+    fireEvent.click(screen.getByRole("button", { name: "common.add" }));
+
+    await waitFor(() => expect(handleSubmit).toHaveBeenCalledTimes(1));
+    expect(handleSubmit).toHaveBeenCalledWith(
+      expect.objectContaining({
+        category: "official",
+        ensureCodexOfficialSeed: true,
+        meta: expect.objectContaining({
+          authBinding: {
+            source: "managed_account",
+            authProvider: "codex_oauth",
+            accountId: "acct-managed",
+          },
+        }),
+      }),
+    );
+  });
+
+  it("新建 Grok Build 自定义供应商时不补默认 Grok 图标", async () => {
+    const handleSubmit = vi.fn().mockResolvedValue(undefined);
+
+    mockFormValues = {
+      name: "tes 1",
+      websiteUrl: "",
+      icon: "",
+      iconColor: "",
+      settingsConfig: JSON.stringify({
+        config: `[models]
+default = "grok-4.5"
+
+[model."grok-4.5"]
+model = "grok-4.5"
+base_url = "https://grok.example.com/v1"
+name = "tes 1"
+api_key = "secret"
+api_backend = "responses"
+context_window = 500000
+`,
+      }),
+    };
+
+    render(
+      <AddProviderDialog
+        open
+        onOpenChange={vi.fn()}
+        appId="grokbuild"
+        onSubmit={handleSubmit}
+      />,
+    );
+
+    fireEvent.click(screen.getByRole("button", { name: "common.add" }));
+
+    await waitFor(() => expect(handleSubmit).toHaveBeenCalledTimes(1));
+
+    const submitted = handleSubmit.mock.calls[0][0];
+    expect(submitted.icon).toBeUndefined();
+    expect(submitted.iconColor).toBeUndefined();
+  });
 });