fix(bar): bound native credential and quota waits

This commit is contained in:
Tam Nhu Tran committed 2026-08-08 21:12:28 -04:00
1 parent 833473c5f6
commit da2de60015
8 files changed
+201 -89

No files matched your search

@@ -27,14 +27,14 @@ function makeCreds(overrides: Record<string, unknown> = {}): ClaudeNativeCredent
}
describe('readClaudeCredentials', () => {
it('parses the on-disk credentials file when present (file-first, no Keychain)', () => {
it('parses the on-disk credentials file when present (file-first, no Keychain)', async () => {
let keychainCalled = false;
const creds = readClaudeCredentials({
const creds = await readClaudeCredentials({
platform: 'darwin',
homedir: '/home/test',
existsSyncImpl: () => true,
readFileSyncImpl: () => JSON.stringify(makeCreds()),
execSyncImpl: () => {
execFileImpl: () => {
keychainCalled = true;
return '';
},
@@ -44,44 +44,52 @@ describe('readClaudeCredentials', () => {
expect(keychainCalled).toBe(false);
});
it('falls back to the macOS Keychain when the file is absent', () => {
const creds = readClaudeCredentials({
it('falls back to the macOS Keychain when the file is absent', async () => {
let executable = '';
let args: readonly string[] = [];
const creds = await readClaudeCredentials({
platform: 'darwin',
homedir: '/home/test',
existsSyncImpl: () => false,
readFileSyncImpl: () => {
throw new Error('should not read file');
},
execSyncImpl: () => JSON.stringify(makeCreds({ subscriptionType: 'pro' })),
execFileImpl: (file, receivedArgs, _options, callback) => {
executable = file;
args = receivedArgs;
callback(null, JSON.stringify(makeCreds({ subscriptionType: 'pro' })));
},
});
expect(creds?.claudeAiOauth?.subscriptionType).toBe('pro');
expect(executable).toBe('/usr/bin/security');
expect(args).toEqual(['find-generic-password', '-s', 'Claude Code-credentials', '-w']);
});
it('returns null when both file and Keychain are absent', () => {
const creds = readClaudeCredentials({
it('returns null when both file and Keychain are absent', async () => {
const creds = await readClaudeCredentials({
platform: 'darwin',
homedir: '/home/test',
existsSyncImpl: () => false,
readFileSyncImpl: () => {
throw new Error('no file');
},
execSyncImpl: () => {
throw new Error('no keychain entry');
execFileImpl: (_file, _args, _options, callback) => {
callback(new Error('no keychain entry'), '');
},
});
expect(creds).toBeNull();
});
it('does not consult the Keychain on non-darwin platforms', () => {
it('does not consult the Keychain on non-darwin platforms', async () => {
let keychainCalled = false;
const creds = readClaudeCredentials({
const creds = await readClaudeCredentials({
platform: 'linux',
homedir: '/home/test',
existsSyncImpl: () => false,
readFileSyncImpl: () => {
throw new Error('no file');
},
execSyncImpl: () => {
execFileImpl: () => {
keychainCalled = true;
return '';
},
@@ -149,16 +157,16 @@ describe('readClaudeCredentialsForConfigDir', () => {
const configDir = '/home/test/.ccs/instances/work';
const credFile = `${configDir}/.credentials.json`;
it('reads <configDir>/.credentials.json when present (file-first, no Keychain)', () => {
it('reads <configDir>/.credentials.json when present (file-first, no Keychain)', async () => {
let keychainCalled = false;
const creds = readClaudeCredentialsForConfigDir(configDir, {
const creds = await readClaudeCredentialsForConfigDir(configDir, {
platform: 'darwin',
existsSyncImpl: (p: string) => p === credFile,
readFileSyncImpl: (p: string) => {
expect(p).toBe(credFile);
return JSON.stringify(makeCreds());
},
execSyncImpl: () => {
execFileImpl: () => {
keychainCalled = true;
return '';
},
@@ -167,46 +175,61 @@ describe('readClaudeCredentialsForConfigDir', () => {
expect(keychainCalled).toBe(false);
});
it('falls back to the per-config-dir Keychain service when the file is absent', () => {
let keychainCmd = '';
const creds = readClaudeCredentialsForConfigDir(configDir, {
it('uses absolute security path and argument array for the per-config-dir Keychain item', async () => {
let executable = '';
let args: readonly string[] = [];
const creds = await readClaudeCredentialsForConfigDir(configDir, {
platform: 'darwin',
existsSyncImpl: () => false,
readFileSyncImpl: () => {
throw new Error('should not read file');
},
execSyncImpl: (cmd: string) => {
keychainCmd = cmd;
return JSON.stringify(makeCreds({ subscriptionType: 'team' }));
execFileImpl: (file, receivedArgs, _options, callback) => {
executable = file;
args = receivedArgs;
callback(null, JSON.stringify(makeCreds({ subscriptionType: 'team' })));
},
});
expect(creds?.claudeAiOauth?.subscriptionType).toBe('team');
expect(keychainCmd).toContain('Claude Code-credentials-ffeb4b45');
expect(executable).toBe('/usr/bin/security');
expect(args).toEqual(['find-generic-password', '-s', 'Claude Code-credentials-ffeb4b45', '-w']);
});
it('returns null when both file and Keychain are absent', () => {
const creds = readClaudeCredentialsForConfigDir(configDir, {
it('returns null when both file and Keychain are absent', async () => {
const creds = await readClaudeCredentialsForConfigDir(configDir, {
platform: 'darwin',
existsSyncImpl: () => false,
readFileSyncImpl: () => {
throw new Error('no file');
},
execSyncImpl: () => {
throw new Error('no keychain entry');
execFileImpl: (_file, _args, _options, callback) => {
callback(new Error('no keychain entry'), '');
},
});
expect(creds).toBeNull();
});
it('does not consult the Keychain on non-darwin platforms', () => {
it('bounds a blocked Keychain lookup without exposing a credential payload', async () => {
const startedAt = Date.now();
const creds = await readClaudeCredentialsForConfigDir(configDir, {
platform: 'darwin',
existsSyncImpl: () => false,
keychainTimeoutMs: 20,
execFileImpl: () => ({ kill: () => {} }),
});
expect(creds).toBeNull();
expect(Date.now() - startedAt).toBeLessThan(250);
});
it('does not consult the Keychain on non-darwin platforms', async () => {
let keychainCalled = false;
const creds = readClaudeCredentialsForConfigDir(configDir, {
const creds = await readClaudeCredentialsForConfigDir(configDir, {
platform: 'linux',
existsSyncImpl: () => false,
readFileSyncImpl: () => {
throw new Error('no file');
},
execSyncImpl: () => {
execFileImpl: () => {
keychainCalled = true;
return '';
},