mirror of
https://github.com/openclaw/openclaw.git
synced 2026-05-10 12:44:59 +00:00
- Guard against undefined/empty token in buildGatewayAuthConfig - Automatically generate random token when token param is undefined, empty, or whitespace - Prevents JSON.stringify from writing literal string "undefined" to config - Add tests for undefined, empty, and whitespace token cases Fixes #13756 Co-authored-by: Klawd Asklee <klawdebot@gmail.com>
104 lines
3.3 KiB
TypeScript
104 lines
3.3 KiB
TypeScript
import type { OpenClawConfig, GatewayAuthConfig } from "../config/config.js";
|
|
import type { RuntimeEnv } from "../runtime.js";
|
|
import type { WizardPrompter } from "../wizard/prompts.js";
|
|
import { ensureAuthProfileStore } from "../agents/auth-profiles.js";
|
|
import { promptAuthChoiceGrouped } from "./auth-choice-prompt.js";
|
|
import { applyAuthChoice, resolvePreferredProviderForAuthChoice } from "./auth-choice.js";
|
|
import {
|
|
applyModelAllowlist,
|
|
applyModelFallbacksFromSelection,
|
|
applyPrimaryModel,
|
|
promptDefaultModel,
|
|
promptModelAllowlist,
|
|
} from "./model-picker.js";
|
|
import { promptCustomApiConfig } from "./onboard-custom.js";
|
|
import { randomToken } from "./onboard-helpers.js";
|
|
|
|
type GatewayAuthChoice = "token" | "password";
|
|
|
|
const ANTHROPIC_OAUTH_MODEL_KEYS = [
|
|
"anthropic/claude-opus-4-6",
|
|
"anthropic/claude-opus-4-5",
|
|
"anthropic/claude-sonnet-4-5",
|
|
"anthropic/claude-haiku-4-5",
|
|
];
|
|
|
|
export function buildGatewayAuthConfig(params: {
|
|
existing?: GatewayAuthConfig;
|
|
mode: GatewayAuthChoice;
|
|
token?: string;
|
|
password?: string;
|
|
}): GatewayAuthConfig | undefined {
|
|
const allowTailscale = params.existing?.allowTailscale;
|
|
const base: GatewayAuthConfig = {};
|
|
if (typeof allowTailscale === "boolean") {
|
|
base.allowTailscale = allowTailscale;
|
|
}
|
|
|
|
if (params.mode === "token") {
|
|
// Guard against undefined/empty token to prevent JSON.stringify from writing the string "undefined"
|
|
const safeToken = params.token?.trim() || randomToken();
|
|
return { ...base, mode: "token", token: safeToken };
|
|
}
|
|
return { ...base, mode: "password", password: params.password };
|
|
}
|
|
|
|
export async function promptAuthConfig(
|
|
cfg: OpenClawConfig,
|
|
runtime: RuntimeEnv,
|
|
prompter: WizardPrompter,
|
|
): Promise<OpenClawConfig> {
|
|
const authChoice = await promptAuthChoiceGrouped({
|
|
prompter,
|
|
store: ensureAuthProfileStore(undefined, {
|
|
allowKeychainPrompt: false,
|
|
}),
|
|
includeSkip: true,
|
|
});
|
|
|
|
let next = cfg;
|
|
if (authChoice === "custom-api-key") {
|
|
const customResult = await promptCustomApiConfig({ prompter, runtime, config: next });
|
|
next = customResult.config;
|
|
} else if (authChoice !== "skip") {
|
|
const applied = await applyAuthChoice({
|
|
authChoice,
|
|
config: next,
|
|
prompter,
|
|
runtime,
|
|
setDefaultModel: true,
|
|
});
|
|
next = applied.config;
|
|
} else {
|
|
const modelSelection = await promptDefaultModel({
|
|
config: next,
|
|
prompter,
|
|
allowKeep: true,
|
|
ignoreAllowlist: true,
|
|
preferredProvider: resolvePreferredProviderForAuthChoice(authChoice),
|
|
});
|
|
if (modelSelection.model) {
|
|
next = applyPrimaryModel(next, modelSelection.model);
|
|
}
|
|
}
|
|
|
|
const anthropicOAuth =
|
|
authChoice === "setup-token" || authChoice === "token" || authChoice === "oauth";
|
|
|
|
if (authChoice !== "custom-api-key") {
|
|
const allowlistSelection = await promptModelAllowlist({
|
|
config: next,
|
|
prompter,
|
|
allowedKeys: anthropicOAuth ? ANTHROPIC_OAUTH_MODEL_KEYS : undefined,
|
|
initialSelections: anthropicOAuth ? ["anthropic/claude-opus-4-6"] : undefined,
|
|
message: anthropicOAuth ? "Anthropic OAuth models" : undefined,
|
|
});
|
|
if (allowlistSelection.models) {
|
|
next = applyModelAllowlist(next, allowlistSelection.models);
|
|
next = applyModelFallbacksFromSelection(next, allowlistSelection.models);
|
|
}
|
|
}
|
|
|
|
return next;
|
|
}
|