Skip to content

fix: empty token overrides provider default + hardcoded error message #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mforce wants to merge 1 commit into from
Closed

fix: empty token overrides provider default + hardcoded error message #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/cli.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,18 +163,18 @@ async function main(): Promise<number> {
}

const baseUrl =
values["base-url"] ?? process.env.CLAUDELY_BASE_URL ?? config.baseUrl ?? provider.defaultBaseUrl();
const token = values.token ?? process.env.CLAUDELY_TOKEN ?? config.token ?? provider.defaultToken;
values["base-url"] ?? process.env.CLAUDELY_BASE_URL ?? (config.baseUrl || undefined) ?? provider.defaultBaseUrl();
const token = values.token ?? process.env.CLAUDELY_TOKEN ?? (config.token || undefined) ?? provider.defaultToken;

if (!baseUrl) {
console.error(
"claudely: provider 'custom' requires --base-url <url> (or $CLAUDELY_BASE_URL)",
`claudely: provider '${providerName}' requires --base-url <url> (or $CLAUDELY_BASE_URL, or run \`claudely setup\`)`,
);
return 2;
}
if (!token) {
console.error(
"claudely: provider 'custom' requires --token <token> (or $CLAUDELY_TOKEN)",
`claudely: provider '${providerName}' requires --token <token> (or $CLAUDELY_TOKEN, or run \`claudely setup\`)`,
);
return 2;
}
Expand Down
21 changes: 15 additions & 6 deletions src/setup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,22 @@ export async function runSetup(): Promise<number> {

const provider = PROVIDERS[providerName];

const providerDefault = provider.defaultBaseUrl();
const baseUrl = await input({
message: "Base URL",
default: existing.baseUrl ?? provider.defaultBaseUrl(),
message: existing.baseUrl && existing.baseUrl !== providerDefault
? `Base URL (provider default: ${providerDefault})`
: "Base URL",
default: existing.baseUrl || providerDefault,
});

const tokenDefault = provider.defaultToken;
const token = await input({
message: "Auth token",
default: existing.token ?? provider.defaultToken,
message: tokenDefault
? existing.token && existing.token !== tokenDefault
? `Auth token (provider default: ${tokenDefault})`
: "Auth token"
: "Auth token (required)",
default: existing.token || tokenDefault,
});

let models: ModelEntry[] = [];
Expand Down Expand Up @@ -73,13 +81,14 @@ export async function runSetup(): Promise<number> {
if (manual) model = manual;
}

const config: ClaudelyConfig = { provider: providerName, baseUrl, token };
const config: ClaudelyConfig = { provider: providerName, baseUrl };
if (token) config.token = token;
if (model) config.model = model;

console.log("\nConfig to save:");
console.log(` provider: ${config.provider}`);
console.log(` baseUrl: ${config.baseUrl}`);
console.log(` token: ${config.token}`);
console.log(` token: ${config.token ?? "(provider default)"}`);
if (config.model) console.log(` model: ${config.model}`);
console.log();

Expand Down
Loading