Skip to content

fix: support Claude Code 2.x authentication detection #276

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

Open
goodhanded wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix: support Claude Code 2.x authentication detection #276

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4db0d38
fix: support Claude Code 2.x authentication detection
goodhanded Dec 31, 2025
d228e2a
fix: preserve method field from checkClaudeCredentials
goodhanded Dec 31, 2025
57eb81a
Merge branch 'main' into fix/claude-code-2x-auth-detection
viper151 Jan 5, 2026
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
21 changes: 20 additions & 1 deletion server/routes/cli-auth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,24 @@ router.get('/codex/status', async (req, res) => {

async function checkClaudeCredentials() {
try {
// First try Claude Code 2.x auth location (.claude.json with oauthAccount)
const claudeJsonPath = path.join(os.homedir(), '.claude', '.claude.json');
try {
const claudeJsonContent = await fs.readFile(claudeJsonPath, 'utf8');
const claudeJson = JSON.parse(claudeJsonContent);

if (claudeJson.oauthAccount && claudeJson.oauthAccount.emailAddress) {
return {
authenticated: true,
email: claudeJson.oauthAccount.emailAddress,
method: 'claude_code_2x'
};
}
} catch (e) {
// .claude.json not found or invalid, try legacy location
}

// Fallback to legacy credentials location (.credentials.json)
const credPath = path.join(os.homedir(), '.claude', '.credentials.json');
const content = await fs.readFile(credPath, 'utf8');
const creds = JSON.parse(content);
Expand All @@ -87,7 +105,8 @@ async function checkClaudeCredentials() {
if (!isExpired) {
return {
authenticated: true,
email: creds.email || creds.user || null
email: creds.email || creds.user || null,
method: 'legacy_oauth'
};
}
}
Expand Down