Skip to content

Commit 077a407

Browse files
committed
fix(gui): address CodeRabbit OpenAI recovery follow-ups
Guard Accounts enable against double-clicks, localize the missing-seed path, unify zh provider wording, and drop stale allowPrivateNetwork after a successful disabled-row re-enable.
1 parent 196a6a8 commit 077a407

7 files changed

Lines changed: 91 additions & 18 deletions

File tree

‎gui/src/components/provider-catalog/ProviderCatalog.tsx‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,12 @@ export default function ProviderCatalog({
152152
<a className="btn btn-ghost" href={row.href ?? "#codex-auth"}>{t("modal.accountManage")}</a>
153153
)}
154154
{onLogin && (
155-
<button className={loggedIn ? "btn btn-ghost" : "btn btn-primary"} onClick={() => onLogin(row.id)}>
156-
{loggedIn ? t("modal.accountAdd") : t("modal.accountLogin")}
155+
<button
156+
className={loggedIn ? "btn btn-ghost" : "btn btn-primary"}
157+
disabled={busy}
158+
onClick={() => { if (!busy) onLogin(row.id); }}
159+
>
160+
{busy ? t("codexAuth.enablingOpenai") : loggedIn ? t("modal.accountAdd") : t("modal.accountLogin")}
157161
</button>
158162
)}
159163
</>

‎gui/src/i18n/zh.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -630,9 +630,9 @@ export const zh: Record<TKey, string> = {
630630
"codexAuth.openaiUnavailableDesc": "你的 OpenAI 账号仍然可用。启用提供方后即可路由 Codex 请求。",
631631
"codexAuth.enableOpenai": "启用 OpenAI",
632632
"codexAuth.enablingOpenai": "正在启用...",
633-
"codexAuth.enableOpenaiFailed": "无法启用 OpenAI 提供商。",
634-
"codexAuth.openaiPresetLoadFailed": "无法加载 OpenAI 提供商预设。",
635-
"codexAuth.openaiPresetUnavailable": "OpenAI 提供商预设不可用。",
633+
"codexAuth.enableOpenaiFailed": "无法启用 OpenAI 提供方。",
634+
"codexAuth.openaiPresetLoadFailed": "无法加载 OpenAI 提供方预设。",
635+
"codexAuth.openaiPresetUnavailable": "OpenAI 提供方预设不可用。",
636636
"codexAuth.openProviders": "打开提供商",
637637
"codexAuth.add": "添加",
638638
"codexAuth.refreshQuota": "刷新额度",

‎gui/src/pages/Providers.tsx‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -432,13 +432,15 @@ export default function Providers({ apiBase }: { apiBase: string }) {
432432

433433
const onAccountLogin = async (provider: string) => {
434434
if (provider === "openai") {
435+
if (busy === "openai") return;
435436
const configured = config.providers.openai;
436437
const state = openAiAccountProviderState(configured);
437438
if (state === "invalid") {
438439
notify(t("codexAuth.openaiMissing"), false);
439440
return;
440441
}
441442
if (state === "absent" || state === "disabled") {
443+
setBusy("openai");
442444
try {
443445
await ensureOpenAiProvider(apiBase, state);
444446
await fetchConfig();
@@ -449,6 +451,8 @@ export default function Providers({ apiBase }: { apiBase: string }) {
449451
notify(error instanceof Error ? error.message : t("prov.saveFailed"), false);
450452
}
451453
return;
454+
} finally {
455+
if (aliveRef.current) setBusy(current => current === "openai" ? null : current);
452456
}
453457
}
454458
setCodexLoginOpen(true);

‎gui/src/provider-payload.ts‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -126,22 +126,14 @@ export type OpenAiEnableErrorKey =
126126

127127
export class OpenAiEnableError extends Error {
128128
readonly i18nKey: OpenAiEnableErrorKey;
129-
/** Optional management-API error text; callers may surface it when present. */
130-
readonly serverMessage?: string;
131129

132-
constructor(i18nKey: OpenAiEnableErrorKey, serverMessage?: string) {
133-
super(serverMessage ?? i18nKey);
130+
constructor(i18nKey: OpenAiEnableErrorKey) {
131+
super(i18nKey);
134132
this.name = "OpenAiEnableError";
135133
this.i18nKey = i18nKey;
136-
this.serverMessage = serverMessage;
137134
}
138135
}
139136

140-
async function readProviderErrorMessage(response: Response): Promise<string | undefined> {
141-
const body = await response.json().catch(() => ({})) as { error?: unknown };
142-
return typeof body.error === "string" ? body.error : undefined;
143-
}
144-
145137
export async function ensureOpenAiProvider(
146138
apiBase: string,
147139
state: "absent" | "disabled",
@@ -154,20 +146,20 @@ export async function ensureOpenAiProvider(
154146
body: JSON.stringify({ disabled: false }),
155147
});
156148
if (response.ok) return;
157-
throw new OpenAiEnableError("codexAuth.enableOpenaiFailed", await readProviderErrorMessage(response));
149+
throw new OpenAiEnableError("codexAuth.enableOpenaiFailed");
158150
}
159151

160152
const presetsResponse = await fetchImpl(`${apiBase}/api/provider-presets`);
161153
if (!presetsResponse.ok) throw new OpenAiEnableError("codexAuth.openaiPresetLoadFailed");
162154
const data = await presetsResponse.json() as { providers?: ProviderPostPreset[] };
163155
const preset = data.providers?.find(provider => provider.id === "openai");
164-
if (!preset) throw new OpenAiEnableError("codexAuth.openaiPresetUnavailable");
156+
if (!preset?.provider) throw new OpenAiEnableError("codexAuth.openaiPresetUnavailable");
165157

166158
const response = await fetchImpl(`${apiBase}/api/providers`, {
167159
method: "POST",
168160
headers: { "Content-Type": "application/json" },
169161
body: JSON.stringify(buildReservedProviderPostBody(preset)),
170162
});
171163
if (response.ok) return;
172-
throw new OpenAiEnableError("codexAuth.enableOpenaiFailed", await readProviderErrorMessage(response));
164+
throw new OpenAiEnableError("codexAuth.enableOpenaiFailed");
173165
}

‎src/server/management/provider-routes.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,9 @@ export async function handleProviderRoutes(ctx: ManagementContext): Promise<Resp
270270
);
271271
if (resolvedError) return jsonResponse({ error: resolvedError }, 400);
272272
if (next.disabled === false) delete next.disabled;
273+
// Canonical openai never uses private-network opt-in; drop a stale flag that
274+
// was ignored for the DNS probe so it cannot linger on the live row.
275+
delete next.allowPrivateNetwork;
273276
}
274277

275278
const { saveConfig: save } = await import("../../config");

‎tests/management-provider-validation.test.ts‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1362,6 +1362,58 @@ describe("provider management validation", () => {
13621362
}
13631363
});
13641364

1365+
test("disabled OpenAI recovery strips allowPrivateNetwork after successful re-enable", async () => {
1366+
if (existsSync(TEST_DIR)) rmSync(TEST_DIR, { recursive: true });
1367+
mkdirSync(TEST_DIR, { recursive: true });
1368+
process.env.OPENCODEX_HOME = TEST_DIR;
1369+
const liveConfig: OcxConfig = {
1370+
port: 0,
1371+
hostname: "127.0.0.1",
1372+
defaultProvider: "extra",
1373+
openaiProviderTierVersion: 2,
1374+
providers: {
1375+
openai: {
1376+
adapter: "openai-responses",
1377+
baseUrl: "https://chatgpt.com/backend-api/codex",
1378+
authMode: "forward",
1379+
allowPrivateNetwork: true,
1380+
disabled: true,
1381+
},
1382+
extra: {
1383+
adapter: "openai-chat",
1384+
baseUrl: "https://extra.example.test/v1",
1385+
liveModels: false,
1386+
models: ["extra-model"],
1387+
},
1388+
},
1389+
};
1390+
saveConfig(liveConfig);
1391+
const resolvedError = spyOn(destinationPolicy, "providerDestinationResolvedError")
1392+
.mockResolvedValue(null);
1393+
1394+
try {
1395+
const request = new Request("http://127.0.0.1/api/providers?name=openai", {
1396+
method: "PATCH",
1397+
headers: { "content-type": "application/json" },
1398+
body: JSON.stringify({ disabled: false }),
1399+
});
1400+
const response = await handleManagementAPI(request, new URL(request.url), liveConfig, {
1401+
refreshCodexCatalog: async () => undefined,
1402+
});
1403+
expect(response?.status).toBe(200);
1404+
expect(liveConfig.providers.openai).toEqual({
1405+
adapter: "openai-responses",
1406+
baseUrl: "https://chatgpt.com/backend-api/codex",
1407+
authMode: "forward",
1408+
codexAccountMode: "pool",
1409+
});
1410+
expect(Object.hasOwn(liveConfig.providers.openai as object, "allowPrivateNetwork")).toBe(false);
1411+
expect(Object.hasOwn(loadConfig().providers.openai as object, "allowPrivateNetwork")).toBe(false);
1412+
} finally {
1413+
resolvedError.mockRestore();
1414+
}
1415+
});
1416+
13651417
for (const [label, baseUrl] of [
13661418
["uppercase host", "https://CHATGPT.com/backend-api/codex"],
13671419
["explicit :443 port", "https://chatgpt.com:443/backend-api/codex"],

‎tests/provider-payload.test.ts‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,24 @@ describe("provider dashboard payload", () => {
130130
}
131131
});
132132

133+
test("missing openai preset seed maps to a stable i18n key", async () => {
134+
const fetchImpl = (async (input: RequestInfo | URL) => {
135+
const url = new URL(String(input));
136+
if (url.pathname === "/api/provider-presets") {
137+
return Response.json({ providers: [{ id: "openai" }] });
138+
}
139+
return new Response("not found", { status: 404 });
140+
}) as typeof fetch;
141+
142+
try {
143+
await ensureOpenAiProvider("http://localhost:10100", "absent", fetchImpl);
144+
expect.unreachable("expected OpenAiEnableError");
145+
} catch (error) {
146+
expect(error).toBeInstanceOf(OpenAiEnableError);
147+
expect((error as OpenAiEnableError).i18nKey).toBe("codexAuth.openaiPresetUnavailable");
148+
}
149+
});
150+
133151
test("persists explicit API-key mode for built-in OAuth providers", () => {
134152
expect(buildProviderPayload({
135153
name: "xai",

0 commit comments

Comments
 (0)