gogcli-mcp 2.7.1 → 2.18.0

package/tests/tools/auth.test.ts

@@ -1,34 +1,34 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { registerAuthTools } from '../../src/tools/auth.js';
+import { registerAuthTools, authToolsFor } from '../../src/tools/auth.js';
 import * as runner from '../../src/runner.js';
-import { setupHandlers as setupHandlersBase, type ToolHandler } from '../helpers/test-harness.js';
+import { createTestHarness } from '@chrischall/mcp-utils/test';
 
 vi.mock('../../src/runner.js');
 
-const setupHandlers = () => setupHandlersBase(registerAuthTools);
+const setupHandlers = () => createTestHarness(registerAuthTools);
 
 beforeEach(() => vi.clearAllMocks());
 
 describe('gog_auth_list', () => {
   it('calls run with auth list args', async () => {
     vi.mocked(runner.run).mockResolvedValue('user@gmail.com\nadmin@example.com');
-    const handlers = setupHandlers();
-    const result = await handlers.get('gog_auth_list')!({});
+    const harness = await setupHandlers();
+    const result = await harness.callTool('gog_auth_list', {});
     expect(runner.run).toHaveBeenCalledWith(['auth', 'list']);
     expect(result.content[0].text).toBe('user@gmail.com\nadmin@example.com');
   });
 
   it('returns error text on failure', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('No accounts configured'));
-    const handlers = setupHandlers();
-    const result = await handlers.get('gog_auth_list')!({});
+    const harness = await setupHandlers();
+    const result = await harness.callTool('gog_auth_list', {});
     expect(result.content[0].text).toBe('Error: No accounts configured');
   });
 
   it('handles non-Error rejection', async () => {
     vi.mocked(runner.run).mockRejectedValue('something went wrong');
-    const handlers = setupHandlers();
-    const result = await handlers.get('gog_auth_list')!({});
+    const harness = await setupHandlers();
+    const result = await harness.callTool('gog_auth_list', {});
     expect(result.content[0].text).toBe('something went wrong');
   });
 });
@@ -36,16 +36,16 @@ describe('gog_auth_list', () => {
 describe('gog_auth_status', () => {
   it('calls run with auth status args', async () => {
     vi.mocked(runner.run).mockResolvedValue('keyring: system\ncredentials: ~/.config/gog');
-    const handlers = setupHandlers();
-    const result = await handlers.get('gog_auth_status')!({});
+    const harness = await setupHandlers();
+    const result = await harness.callTool('gog_auth_status', {});
     expect(runner.run).toHaveBeenCalledWith(['auth', 'status']);
     expect(result.content[0].text).toContain('keyring');
   });
 
   it('returns error text on failure', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('Status failed'));
-    const handlers = setupHandlers();
-    const result = await handlers.get('gog_auth_status')!({});
+    const harness = await setupHandlers();
+    const result = await harness.callTool('gog_auth_status', {});
     expect(result.content[0].text).toBe('Error: Status failed');
   });
 });
@@ -53,16 +53,16 @@ describe('gog_auth_status', () => {
 describe('gog_auth_services', () => {
   it('calls run with auth services args', async () => {
     vi.mocked(runner.run).mockResolvedValue('sheets: spreadsheets.readonly');
-    const handlers = setupHandlers();
-    const result = await handlers.get('gog_auth_services')!({});
+    const harness = await setupHandlers();
+    const result = await harness.callTool('gog_auth_services', {});
     expect(runner.run).toHaveBeenCalledWith(['auth', 'services']);
     expect(result.content[0].text).toContain('sheets');
   });
 
   it('returns error text on failure', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('Services failed'));
-    const handlers = setupHandlers();
-    const result = await handlers.get('gog_auth_services')!({});
+    const harness = await setupHandlers();
+    const result = await harness.callTool('gog_auth_services', {});
     expect(result.content[0].text).toBe('Error: Services failed');
   });
 });
@@ -70,8 +70,8 @@ describe('gog_auth_services', () => {
 describe('gog_auth_add', () => {
   it('calls run with correct args, interactive true, and 5-minute timeout', async () => {
     vi.mocked(runner.run).mockResolvedValue('Authorization successful for user@gmail.com');
-    const handlers = setupHandlers();
-    const result = await handlers.get('gog_auth_add')!({ email: 'user@gmail.com' });
+    const harness = await setupHandlers();
+    const result = await harness.callTool('gog_auth_add', { email: 'user@gmail.com' });
     expect(runner.run).toHaveBeenCalledWith(
       ['auth', 'add', 'user@gmail.com', '--services', 'all'],
       { interactive: true, timeout: 300_000 },
@@ -81,8 +81,8 @@ describe('gog_auth_add', () => {
 
   it('passes custom services when provided', async () => {
     vi.mocked(runner.run).mockResolvedValue('Authorization successful');
-    const handlers = setupHandlers();
-    await handlers.get('gog_auth_add')!({ email: 'user@gmail.com', services: 'sheets,gmail' });
+    const harness = await setupHandlers();
+    await harness.callTool('gog_auth_add', { email: 'user@gmail.com', services: 'sheets,gmail' });
     expect(runner.run).toHaveBeenCalledWith(
       ['auth', 'add', 'user@gmail.com', '--services', 'sheets,gmail'],
       { interactive: true, timeout: 300_000 },
@@ -91,40 +91,196 @@ describe('gog_auth_add', () => {
 
   it('returns error text on failure', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('Auth cancelled by user'));
-    const handlers = setupHandlers();
-    const result = await handlers.get('gog_auth_add')!({ email: 'user@gmail.com' });
+    const harness = await setupHandlers();
+    const result = await harness.callTool('gog_auth_add', { email: 'user@gmail.com' });
     expect(result.content[0].text).toBe('Error: Auth cancelled by user');
   });
 
   it('returns error text on timeout', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('gog timed out after 300000ms (5 minutes)'));
-    const handlers = setupHandlers();
-    const result = await handlers.get('gog_auth_add')!({ email: 'user@gmail.com' });
+    const harness = await setupHandlers();
+    const result = await harness.callTool('gog_auth_add', { email: 'user@gmail.com' });
     expect(result.content[0].text).toContain('timed out');
     expect(result.content[0].text).toContain('5 minutes');
   });
 });
 
+describe('gog_auth_health', () => {
+  const CHECK_JSON = JSON.stringify({
+    accounts: [
+      { email: 'chris.c.hall@gmail.com', created_at: '2026-07-17T15:08:39Z', valid: true },
+    ],
+  });
+
+  it('calls run with auth list --check and formats a health summary', async () => {
+    vi.mocked(runner.run).mockResolvedValue(CHECK_JSON);
+    const harness = await setupHandlers();
+    const result = await harness.callTool('gog_auth_health', {});
+    expect(runner.run).toHaveBeenCalledWith(['auth', 'list', '--check']);
+    expect(result.content[0].text).toContain('chris.c.hall@gmail.com');
+    expect(result.content[0].text).toContain('token valid');
+  });
+
+  it('surfaces a dead-token account with re-auth guidance', async () => {
+    vi.mocked(runner.run).mockResolvedValue(JSON.stringify({
+      accounts: [{
+        email: 'chris.c.hall@gmail.com',
+        created_at: '2026-07-17T15:08:39Z',
+        valid: false,
+        error: 'refresh access token: oauth2: "invalid_grant" "Token has been expired or revoked."',
+      }],
+    }));
+    const harness = await setupHandlers();
+    const result = await harness.callTool('gog_auth_health', {});
+    expect(result.content[0].text).toContain('NEEDS RE-AUTH');
+    expect(result.content[0].text).toContain('gog_auth_add_url');
+  });
+
+  it('returns error text on failure', async () => {
+    vi.mocked(runner.run).mockRejectedValue(new Error('keyring locked'));
+    const harness = await setupHandlers();
+    const result = await harness.callTool('gog_auth_health', {});
+    expect(result.content[0].text).toBe('Error: keyring locked');
+  });
+});
+
+describe('gog_auth_add_url', () => {
+  it('runs remote step 1 with force-consent and tokens-only redaction', async () => {
+    vi.mocked(runner.run).mockResolvedValue('{"auth_url":"https://accounts.google.com/o/oauth2/auth?...","state_reused":false}');
+    const harness = await setupHandlers();
+    const result = await harness.callTool('gog_auth_add_url', { email: 'user@gmail.com' });
+    expect(runner.run).toHaveBeenCalledWith(
+      ['auth', 'add', 'user@gmail.com', '--remote', '--step', '1', '--services', 'all', '--force-consent'],
+      { redactMode: 'tokens' },
+    );
+    expect(result.content[0].text).toContain('accounts.google.com');
+  });
+
+  it('passes custom services', async () => {
+    vi.mocked(runner.run).mockResolvedValue('{"auth_url":"https://x"}');
+    const harness = await setupHandlers();
+    await harness.callTool('gog_auth_add_url', { email: 'user@gmail.com', services: 'gmail,drive' });
+    expect(runner.run).toHaveBeenCalledWith(
+      ['auth', 'add', 'user@gmail.com', '--remote', '--step', '1', '--services', 'gmail,drive', '--force-consent'],
+      { redactMode: 'tokens' },
+    );
+  });
+
+  it('returns error text on failure', async () => {
+    vi.mocked(runner.run).mockRejectedValue(new Error('client not configured'));
+    const harness = await setupHandlers();
+    const result = await harness.callTool('gog_auth_add_url', { email: 'user@gmail.com' });
+    expect(result.content[0].text).toBe('Error: client not configured');
+  });
+});
+
+describe('gog_auth_add_complete', () => {
+  it('runs remote step 2 with the pasted redirect URL', async () => {
+    vi.mocked(runner.run).mockResolvedValue('{"email":"user@gmail.com","stored":true}');
+    const harness = await setupHandlers();
+    const result = await harness.callTool('gog_auth_add_complete', {
+      email: 'user@gmail.com',
+      redirectUrl: 'http://127.0.0.1:59436/oauth2/callback?code=abc&state=xyz',
+    });
+    expect(runner.run).toHaveBeenCalledWith(
+      ['auth', 'add', 'user@gmail.com', '--remote', '--step', '2', '--auth-url',
+        'http://127.0.0.1:59436/oauth2/callback?code=abc&state=xyz', '--services', 'all', '--force-consent'],
+    );
+    expect(result.content[0].text).toContain('stored');
+  });
+
+  it('passes custom services matching step 1', async () => {
+    vi.mocked(runner.run).mockResolvedValue('{"stored":true}');
+    const harness = await setupHandlers();
+    await harness.callTool('gog_auth_add_complete', {
+      email: 'user@gmail.com',
+      redirectUrl: 'http://127.0.0.1/cb?code=c&state=s',
+      services: 'gmail,drive',
+    });
+    expect(runner.run).toHaveBeenCalledWith(
+      ['auth', 'add', 'user@gmail.com', '--remote', '--step', '2', '--auth-url',
+        'http://127.0.0.1/cb?code=c&state=s', '--services', 'gmail,drive', '--force-consent'],
+    );
+  });
+
+  it('returns error text on failure (e.g. expired state)', async () => {
+    vi.mocked(runner.run).mockRejectedValue(new Error('no matching manual auth state'));
+    const harness = await setupHandlers();
+    const result = await harness.callTool('gog_auth_add_complete', {
+      email: 'user@gmail.com',
+      redirectUrl: 'http://127.0.0.1/cb?code=c&state=s',
+    });
+    expect(result.content[0].text).toBe('Error: no matching manual auth state');
+  });
+});
+
+describe('authToolsFor (least-privilege default services)', () => {
+  const gmailHarness = () => createTestHarness(authToolsFor('gmail'));
+
+  it('gog_auth_add_url defaults services to the bound value, not "all"', async () => {
+    vi.mocked(runner.run).mockResolvedValue('{"auth_url":"https://accounts.google.com/x"}');
+    const harness = await gmailHarness();
+    await harness.callTool('gog_auth_add_url', { email: 'u@x.com' });
+    expect(runner.run).toHaveBeenCalledWith(
+      ['auth', 'add', 'u@x.com', '--remote', '--step', '1', '--services', 'gmail', '--force-consent'],
+      { redactMode: 'tokens' },
+    );
+  });
+
+  it('gog_auth_add defaults services to the bound value', async () => {
+    vi.mocked(runner.run).mockResolvedValue('ok');
+    const harness = await gmailHarness();
+    await harness.callTool('gog_auth_add', { email: 'u@x.com' });
+    expect(runner.run).toHaveBeenCalledWith(
+      ['auth', 'add', 'u@x.com', '--services', 'gmail'],
+      { interactive: true, timeout: 300_000 },
+    );
+  });
+
+  it('gog_auth_add_complete defaults services to the bound value', async () => {
+    vi.mocked(runner.run).mockResolvedValue('{"stored":true}');
+    const harness = await gmailHarness();
+    await harness.callTool('gog_auth_add_complete', {
+      email: 'u@x.com',
+      redirectUrl: 'http://127.0.0.1/cb?code=c&state=s',
+    });
+    expect(runner.run).toHaveBeenCalledWith(
+      ['auth', 'add', 'u@x.com', '--remote', '--step', '2', '--auth-url',
+        'http://127.0.0.1/cb?code=c&state=s', '--services', 'gmail', '--force-consent'],
+    );
+  });
+
+  it('still allows overriding services per call (widen when needed)', async () => {
+    vi.mocked(runner.run).mockResolvedValue('{"auth_url":"x"}');
+    const harness = await gmailHarness();
+    await harness.callTool('gog_auth_add_url', { email: 'u@x.com', services: 'gmail,drive' });
+    expect(runner.run).toHaveBeenCalledWith(
+      ['auth', 'add', 'u@x.com', '--remote', '--step', '1', '--services', 'gmail,drive', '--force-consent'],
+      { redactMode: 'tokens' },
+    );
+  });
+});
+
 describe('gog_auth_run', () => {
   it('passes subcommand and args to runner', async () => {
     vi.mocked(runner.run).mockResolvedValue('removed user@gmail.com');
-    const handlers = setupHandlers();
-    const result = await handlers.get('gog_auth_run')!({ subcommand: 'remove', args: ['user@gmail.com'] });
+    const harness = await setupHandlers();
+    const result = await harness.callTool('gog_auth_run', { subcommand: 'remove', args: ['user@gmail.com'] });
     expect(runner.run).toHaveBeenCalledWith(['auth', 'remove', 'user@gmail.com'], {});
     expect(result.content[0].text).toBe('removed user@gmail.com');
   });
 
   it('works with empty args array', async () => {
     vi.mocked(runner.run).mockResolvedValue('token info');
-    const handlers = setupHandlers();
-    await handlers.get('gog_auth_run')!({ subcommand: 'tokens', args: [] });
+    const harness = await setupHandlers();
+    await harness.callTool('gog_auth_run', { subcommand: 'tokens', args: [] });
     expect(runner.run).toHaveBeenCalledWith(['auth', 'tokens'], {});
   });
 
   it('returns error text on failure', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('Remove failed'));
-    const handlers = setupHandlers();
-    const result = await handlers.get('gog_auth_run')!({ subcommand: 'remove', args: ['x@y.com'] });
+    const harness = await setupHandlers();
+    const result = await harness.callTool('gog_auth_run', { subcommand: 'remove', args: ['x@y.com'] });
     expect(result.content[0].text).toBe('Error: Remove failed');
   });
 });