Skip to content

Fix：统一认证优先级顺序 #2

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

Merged
GodD6366 merged 1 commit into from
Jul 16, 2025
Merged

Fix：统一认证优先级顺序 #2

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 claude-env-switch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,10 +159,10 @@ function saveSettings(settings, paths) {

function getCurrentEnvironmentIndex(configs, settings) {
const currentUrl = settings.env?.ANTHROPIC_BASE_URL;
const currentToken = settings.env?.ANTHROPIC_AUTH_TOKEN || settings.env?.ANTHROPIC_API_KEY;
const currentToken = settings.env?.ANTHROPIC_API_KEY || settings.env?.ANTHROPIC_AUTH_TOKEN;

return configs.environments.findIndex(env => {
const envToken = env.ANTHROPIC_AUTH_TOKEN || env.ANTHROPIC_API_KEY;
const envToken = env.ANTHROPIC_API_KEY || env.ANTHROPIC_AUTH_TOKEN;
return env.ANTHROPIC_BASE_URL === currentUrl && envToken === currentToken;
});
}
Expand Down Expand Up @@ -191,7 +191,7 @@ function switchEnvironment(env, paths) {
async function deleteEnvironmentFromSettings(paths) {
const settings = loadSettings(paths);

const hasToken = settings.env?.ANTHROPIC_AUTH_TOKEN || settings.env?.ANTHROPIC_API_KEY;
const hasToken = settings.env?.ANTHROPIC_API_KEY || settings.env?.ANTHROPIC_AUTH_TOKEN;
if (!settings.env || (!settings.env.ANTHROPIC_BASE_URL && !hasToken)) {
console.log(chalk.yellow('⚠️ settings.json 中没有代理配置'));
return;
Expand Down Expand Up @@ -248,7 +248,7 @@ async function showCurrentSettings(paths) {
console.log(chalk.bold.blue(`\n📋 当前${paths.type === 'project' ? '项目' : '全局'}配置:`));
console.log(chalk.gray(` 配置文件: ${paths.settingsPath}`));

const hasToken = settings.env?.ANTHROPIC_AUTH_TOKEN || settings.env?.ANTHROPIC_API_KEY;
const hasToken = settings.env?.ANTHROPIC_API_KEY || settings.env?.ANTHROPIC_AUTH_TOKEN;
if (!settings.env || (!settings.env.ANTHROPIC_BASE_URL && !hasToken)) {
console.log(chalk.gray(' 暂无代理配置'));
} else {
Expand Down