feat(auth): add anthropic api key storage and cli auth
This commit is contained in:
@@ -0,0 +1,50 @@
|
||||
import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
|
||||
import { mkdtempSync, statSync } from 'fs';
|
||||
import { tmpdir } from 'os';
|
||||
import { join } from 'path';
|
||||
|
||||
describe('auth/anthropic', () => {
|
||||
const originalHome = process.env.HOME;
|
||||
const originalEnvKey = process.env.ANTHROPIC_API_KEY;
|
||||
|
||||
let homeDir: string;
|
||||
|
||||
beforeEach(() => {
|
||||
homeDir = mkdtempSync(join(tmpdir(), 'flynn-auth-anthropic-'));
|
||||
process.env.HOME = homeDir;
|
||||
delete process.env.ANTHROPIC_API_KEY;
|
||||
vi.resetModules();
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
process.env.HOME = originalHome;
|
||||
if (originalEnvKey) {
|
||||
process.env.ANTHROPIC_API_KEY = originalEnvKey;
|
||||
} else {
|
||||
delete process.env.ANTHROPIC_API_KEY;
|
||||
}
|
||||
});
|
||||
|
||||
it('stores, loads, and clears Anthropic API key', async () => {
|
||||
const mod = await import('./anthropic.js');
|
||||
|
||||
expect(mod.loadStoredAnthropicAuth()).toBeNull();
|
||||
|
||||
mod.storeAnthropicAuth('sk-test');
|
||||
expect(mod.loadStoredAnthropicAuth()?.api_key).toBe('sk-test');
|
||||
|
||||
const authFile = join(homeDir, '.config/flynn/auth.json');
|
||||
const mode = statSync(authFile).mode & 0o777;
|
||||
expect(mode).toBe(0o600);
|
||||
|
||||
mod.clearAnthropicAuth();
|
||||
expect(mod.loadStoredAnthropicAuth()).toBeNull();
|
||||
});
|
||||
|
||||
it('getAnthropicApiKey prefers environment variable', async () => {
|
||||
process.env.ANTHROPIC_API_KEY = 'sk-env';
|
||||
const mod = await import('./anthropic.js');
|
||||
expect(mod.getAnthropicApiKey()).toBe('sk-env');
|
||||
});
|
||||
});
|
||||
|
||||
@@ -0,0 +1,72 @@
|
||||
import { readFileSync, writeFileSync, mkdirSync, chmodSync } from 'fs';
|
||||
import { resolve } from 'path';
|
||||
import { homedir } from 'os';
|
||||
|
||||
const AUTH_DIR = resolve(homedir(), '.config/flynn');
|
||||
const AUTH_FILE = resolve(AUTH_DIR, 'auth.json');
|
||||
|
||||
export interface AnthropicAuthInfo {
|
||||
/** Anthropic API key. */
|
||||
api_key: string;
|
||||
created_at: string;
|
||||
}
|
||||
|
||||
interface AuthStore {
|
||||
anthropic?: AnthropicAuthInfo;
|
||||
[key: string]: unknown;
|
||||
}
|
||||
|
||||
function safeJsonParse<T>(raw: string): T | null {
|
||||
try {
|
||||
return JSON.parse(raw) as T;
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
function readAuthStore(): AuthStore {
|
||||
try {
|
||||
const raw = readFileSync(AUTH_FILE, 'utf-8');
|
||||
const parsed = safeJsonParse<AuthStore>(raw);
|
||||
return parsed ?? {};
|
||||
} catch {
|
||||
return {};
|
||||
}
|
||||
}
|
||||
|
||||
function writeAuthStore(store: AuthStore): void {
|
||||
mkdirSync(AUTH_DIR, { recursive: true });
|
||||
writeFileSync(AUTH_FILE, JSON.stringify(store, null, 2) + '\n', 'utf-8');
|
||||
chmodSync(AUTH_FILE, 0o600);
|
||||
}
|
||||
|
||||
export function loadStoredAnthropicAuth(): AnthropicAuthInfo | null {
|
||||
const store = readAuthStore();
|
||||
return store.anthropic ?? null;
|
||||
}
|
||||
|
||||
export function storeAnthropicAuth(apiKey: string): void {
|
||||
const trimmed = apiKey.trim();
|
||||
if (!trimmed) {
|
||||
throw new Error('Anthropic API key is empty');
|
||||
}
|
||||
const store = readAuthStore();
|
||||
store.anthropic = { api_key: trimmed, created_at: new Date().toISOString() };
|
||||
writeAuthStore(store);
|
||||
}
|
||||
|
||||
export function clearAnthropicAuth(): void {
|
||||
const store = readAuthStore();
|
||||
delete store.anthropic;
|
||||
writeAuthStore(store);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get an Anthropic API key from any available source.
|
||||
* Priority: ANTHROPIC_API_KEY → stored auth.json.
|
||||
*/
|
||||
export function getAnthropicApiKey(): string | null {
|
||||
return process.env.ANTHROPIC_API_KEY
|
||||
?? loadStoredAnthropicAuth()?.api_key
|
||||
?? null;
|
||||
}
|
||||
@@ -1,3 +1,11 @@
|
||||
export {
|
||||
loadStoredAnthropicAuth,
|
||||
storeAnthropicAuth,
|
||||
clearAnthropicAuth,
|
||||
getAnthropicApiKey,
|
||||
type AnthropicAuthInfo,
|
||||
} from './anthropic.js';
|
||||
|
||||
export {
|
||||
requestDeviceCode,
|
||||
pollForToken,
|
||||
|
||||
@@ -0,0 +1,56 @@
|
||||
import type { Command } from 'commander';
|
||||
import readline from 'readline';
|
||||
import { loadStoredAnthropicAuth, storeAnthropicAuth } from '../auth/index.js';
|
||||
|
||||
async function promptHidden(question: string): Promise<string> {
|
||||
const rl = readline.createInterface({ input: process.stdin, output: process.stdout, terminal: true });
|
||||
const rlAny = rl as unknown as { stdoutMuted?: boolean; _writeToOutput?: (s: string) => void };
|
||||
rlAny.stdoutMuted = true;
|
||||
|
||||
rlAny._writeToOutput = (s: string) => {
|
||||
if (!rlAny.stdoutMuted) {
|
||||
process.stdout.write(s);
|
||||
return;
|
||||
}
|
||||
if (s.includes('\n')) {
|
||||
process.stdout.write('\n');
|
||||
} else {
|
||||
process.stdout.write('*');
|
||||
}
|
||||
};
|
||||
|
||||
const answer = await new Promise<string>((resolve) => rl.question(question, resolve));
|
||||
rlAny.stdoutMuted = false;
|
||||
rl.close();
|
||||
process.stdout.write('\n');
|
||||
return answer.trim();
|
||||
}
|
||||
|
||||
export function registerAnthropicAuthCommand(program: Command): void {
|
||||
program
|
||||
.command('anthropic-auth')
|
||||
.description('Store an Anthropic API key (auth.json)')
|
||||
.action(async () => {
|
||||
const existing = loadStoredAnthropicAuth();
|
||||
if (existing) {
|
||||
console.log('Anthropic credential already exists.');
|
||||
console.log('Delete ~/.config/flynn/auth.json anthropic entry if you want to re-authenticate.');
|
||||
process.exit(0);
|
||||
}
|
||||
|
||||
console.log('Anthropic uses API keys for authentication.');
|
||||
console.log('Create a key at: https://console.anthropic.com/settings/keys');
|
||||
console.log('');
|
||||
|
||||
try {
|
||||
const apiKey = await promptHidden('Enter Anthropic API key: ');
|
||||
storeAnthropicAuth(apiKey);
|
||||
console.log('');
|
||||
console.log('Anthropic credential stored in ~/.config/flynn/auth.json');
|
||||
} catch (error) {
|
||||
const message = error instanceof Error ? error.message : String(error);
|
||||
console.error(`Anthropic auth failed: ${message}`);
|
||||
process.exit(1);
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -20,6 +20,7 @@ import { registerGdriveAuthCommand } from './gdrive-auth.js';
|
||||
import { registerGtasksAuthCommand } from './gtasks-auth.js';
|
||||
import { registerOpenaiAuthCommand } from './openai-auth.js';
|
||||
import { registerZaiAuthCommand } from './zai-auth.js';
|
||||
import { registerAnthropicAuthCommand } from './anthropic-auth.js';
|
||||
import { registerSkillsCommand } from './skills.js';
|
||||
|
||||
export function createProgram(): Command {
|
||||
@@ -45,6 +46,7 @@ export function createProgram(): Command {
|
||||
registerGtasksAuthCommand(program);
|
||||
registerOpenaiAuthCommand(program);
|
||||
registerZaiAuthCommand(program);
|
||||
registerAnthropicAuthCommand(program);
|
||||
registerSkillsCommand(program);
|
||||
|
||||
return program;
|
||||
|
||||
@@ -3,6 +3,7 @@ import { AnthropicClient, OpenAIClient, OllamaClient, LlamaCppClient, GeminiClie
|
||||
import type { ModelClient, RetryConfig, ModelTier } from '../models/index.js';
|
||||
import { logger } from '../logger.js';
|
||||
import { getZaiApiKey } from '../auth/zai.js';
|
||||
import { getAnthropicApiKey } from '../auth/anthropic.js';
|
||||
|
||||
/**
|
||||
* Resolve an API key from config or environment variable.
|
||||
@@ -44,9 +45,15 @@ function resolveAuthCredential(cfg: ModelConfig, apiKeyEnvVar: string, authToken
|
||||
export function createClientFromConfig(cfg: ModelConfig): ModelClient {
|
||||
switch (cfg.provider) {
|
||||
case 'anthropic':
|
||||
if (!cfg.api_key && !getAnthropicApiKey()) {
|
||||
throw new Error(
|
||||
'Anthropic API key not configured. ' +
|
||||
'Set ANTHROPIC_API_KEY, run `flynn anthropic-auth`, or provide api_key in config.',
|
||||
);
|
||||
}
|
||||
return new AnthropicClient({
|
||||
model: cfg.model,
|
||||
apiKey: cfg.api_key,
|
||||
apiKey: cfg.api_key ?? getAnthropicApiKey() ?? undefined,
|
||||
authToken: cfg.auth_token,
|
||||
});
|
||||
case 'openai':
|
||||
|
||||
Reference in New Issue
Block a user