refactor(agent): move the connector credential helpers out of VaultStore (P1.2)
getConnectorCredential, setConnectorCredential and setConnectorCredentialBundle are now plain functions over a SecretStore in packages/agent/src/connectors/connector-credentials.ts. The secret names, metadata layout and the rule that tokens never go into plaintext metadata are unchanged, so existing vault files keep working. A bundle still lands as one update: SecretStore gains writeBatch, which VaultStore applies with a single vault-file replacement. Connector tests seed a Map-backed SecretStore instead of mocking VaultStore methods; the helper tests from core and server moved to the agent package.
This commit is contained in:
@@ -229,102 +229,6 @@ describe('VaultStore', () => {
|
||||
expect(keyHex2).toBe(keyHex);
|
||||
});
|
||||
|
||||
it('setConnectorCredential — refresh token is NOT stored as plaintext in vault.json', () => {
|
||||
const dir = makeTempDir();
|
||||
const vault = new VaultStore(dir);
|
||||
const refreshToken = 'rt-super-secret-refresh-token-xyz';
|
||||
|
||||
vault.setConnectorCredential('github', {
|
||||
type: 'oauth2',
|
||||
value: 'gho_access_token_123',
|
||||
refreshToken,
|
||||
expiresAt: '2099-01-01T00:00:00Z',
|
||||
scopes: ['repo', 'user'],
|
||||
});
|
||||
|
||||
// Read raw vault.json and verify the refresh token is NOT in plaintext
|
||||
const rawContent = fs.readFileSync(path.join(dir, 'vault.json'), 'utf-8');
|
||||
expect(rawContent).not.toContain(refreshToken);
|
||||
|
||||
// The metadata for the main connector entry must NOT contain refreshToken
|
||||
const parsed = JSON.parse(rawContent);
|
||||
const mainEntry = parsed['connector:github'];
|
||||
expect(mainEntry).toBeDefined();
|
||||
expect(mainEntry.metadata).not.toHaveProperty('refreshToken');
|
||||
|
||||
// The refresh token should be stored as a separate encrypted entry
|
||||
const refreshEntry = parsed['connector:github:refresh'];
|
||||
expect(refreshEntry).toBeDefined();
|
||||
expect(refreshEntry.encrypted).toMatch(/^[0-9a-f]+:[0-9a-f]+:[0-9a-f]+$/);
|
||||
});
|
||||
|
||||
it('getConnectorCredential — returns decrypted refresh token correctly', () => {
|
||||
const dir = makeTempDir();
|
||||
const vault = new VaultStore(dir);
|
||||
const accessToken = 'gho_access_token_456';
|
||||
const refreshToken = 'rt-secret-refresh-token-abc';
|
||||
|
||||
vault.setConnectorCredential('github', {
|
||||
type: 'oauth2',
|
||||
value: accessToken,
|
||||
refreshToken,
|
||||
expiresAt: '2099-01-01T00:00:00Z',
|
||||
scopes: ['repo'],
|
||||
});
|
||||
|
||||
const cred = vault.getConnectorCredential('github');
|
||||
expect(cred).not.toBeNull();
|
||||
expect(cred!.value).toBe(accessToken);
|
||||
expect(cred!.refreshToken).toBe(refreshToken);
|
||||
expect(cred!.type).toBe('oauth2');
|
||||
expect(cred!.expiresAt).toBe('2099-01-01T00:00:00Z');
|
||||
expect(cred!.scopes).toEqual(['repo']);
|
||||
expect(cred!.isExpired).toBe(false);
|
||||
});
|
||||
|
||||
it('setConnectorCredential — without refresh token does not create refresh entry', () => {
|
||||
const dir = makeTempDir();
|
||||
const vault = new VaultStore(dir);
|
||||
|
||||
vault.setConnectorCredential('slack', {
|
||||
type: 'bearer',
|
||||
value: 'xoxb-token-123',
|
||||
});
|
||||
|
||||
const rawContent = fs.readFileSync(path.join(dir, 'vault.json'), 'utf-8');
|
||||
const parsed = JSON.parse(rawContent);
|
||||
expect(parsed['connector:slack']).toBeDefined();
|
||||
expect(parsed['connector:slack:refresh']).toBeUndefined();
|
||||
|
||||
const cred = vault.getConnectorCredential('slack');
|
||||
expect(cred).not.toBeNull();
|
||||
expect(cred!.value).toBe('xoxb-token-123');
|
||||
expect(cred!.refreshToken).toBeUndefined();
|
||||
});
|
||||
|
||||
it('setConnectorCredential — clears refresh token when re-set without one', () => {
|
||||
const dir = makeTempDir();
|
||||
const vault = new VaultStore(dir);
|
||||
|
||||
// First set with refresh token
|
||||
vault.setConnectorCredential('github', {
|
||||
type: 'oauth2',
|
||||
value: 'gho_token_1',
|
||||
refreshToken: 'rt-old-refresh',
|
||||
});
|
||||
expect(vault.getConnectorCredential('github')!.refreshToken).toBe('rt-old-refresh');
|
||||
|
||||
// Re-set without refresh token
|
||||
vault.setConnectorCredential('github', {
|
||||
type: 'oauth2',
|
||||
value: 'gho_token_2',
|
||||
});
|
||||
const cred = vault.getConnectorCredential('github');
|
||||
expect(cred!.value).toBe('gho_token_2');
|
||||
expect(cred!.refreshToken).toBeUndefined();
|
||||
expect(vault.has('connector:github:refresh')).toBe(false);
|
||||
});
|
||||
|
||||
it('corrupted key file — truncated hex throws clear error', () => {
|
||||
const dir = makeTempDir();
|
||||
const keyPath = path.join(dir, '.vault-key');
|
||||
|
||||
Reference in New Issue
Block a user