fix: address PR #121 review feedback for auth status --json (#123)

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>

Author: scottlovegrove

src/__tests__/auth.test.ts

@@ -2,10 +2,14 @@ import { Command } from 'commander'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
 // Mock the auth module
-vi.mock('../lib/auth.js', () => ({
-    saveApiToken: vi.fn(),
-    clearApiToken: vi.fn(),
-}))
+vi.mock('../lib/auth.js', async (importOriginal) => {
+    const actual = await importOriginal<typeof import('../lib/auth.js')>()
+    return {
+        ...actual,
+        saveApiToken: vi.fn(),
+        clearApiToken: vi.fn(),
+    }
+})
 
 // Mock the api module
 vi.mock('../lib/api/core.js', () => ({
@@ -54,7 +58,7 @@ import { createInterface, type Interface } from 'node:readline'
 import open from 'open'
 import { registerAuthCommand } from '../commands/auth.js'
 import { getApi } from '../lib/api/core.js'
-import { clearApiToken, saveApiToken } from '../lib/auth.js'
+import { NoTokenError, clearApiToken, saveApiToken } from '../lib/auth.js'
 import { startCallbackServer } from '../lib/oauth-server.js'
 import { exchangeCodeForToken } from '../lib/oauth.js'
 import { createMockApi } from './helpers/mock-api.js'
@@ -88,6 +92,7 @@ describe('auth command', () => {
     afterEach(() => {
         consoleSpy.mockRestore()
         errorSpy.mockRestore()
+        process.exitCode = undefined
     })
 
     describe('token subcommand', () => {
@@ -328,18 +333,37 @@ describe('auth command', () => {
 
         it('outputs JSON error when --json flag is used and not authenticated', async () => {
             const program = createProgram()
-            mockGetApi.mockRejectedValue(new Error('No API token found'))
+            mockGetApi.mockRejectedValue(new NoTokenError())
 
             await program.parseAsync(['node', 'td', 'auth', 'status', '--json'])
 
             expect(consoleSpy).toHaveBeenCalledWith(
                 JSON.stringify({ error: 'Not authenticated' }, null, 2),
             )
+            expect(process.exitCode).toBe(1)
+        })
+
+        it('rethrows non-auth errors in JSON mode', async () => {
+            const program = createProgram()
+            mockGetApi.mockRejectedValue(new Error('Network timeout'))
+
+            await expect(
+                program.parseAsync(['node', 'td', 'auth', 'status', '--json']),
+            ).rejects.toThrow('Network timeout')
+        })
+
+        it('rethrows non-auth errors in human-readable mode', async () => {
+            const program = createProgram()
+            mockGetApi.mockRejectedValue(new Error('Network timeout'))
+
+            await expect(program.parseAsync(['node', 'td', 'auth', 'status'])).rejects.toThrow(
+                'Network timeout',
+            )
         })
 
         it('shows not authenticated when no token', async () => {
             const program = createProgram()
-            mockGetApi.mockRejectedValue(new Error('No API token found'))
+            mockGetApi.mockRejectedValue(new NoTokenError())
 
             await program.parseAsync(['node', 'td', 'auth', 'status'])
 

src/__tests__/lib-auth.test.ts

@@ -312,7 +312,8 @@ describe('lib/auth', () => {
 
         const { getApiToken } = await import('../lib/auth.js')
 
-        await expect(getApiToken()).rejects.toThrow('No API token found')
+        const { NoTokenError } = await import('../lib/auth.js')
+        await expect(getApiToken()).rejects.toBeInstanceOf(NoTokenError)
         expect(keyringState.deleteCalls).toBe(1)
         expect(keyringState.getCalls).toBe(0)
         expect(keyringState.token).toBeNull()

src/commands/auth.ts

@@ -3,7 +3,7 @@ import chalk from 'chalk'
 import { Command } from 'commander'
 import open from 'open'
 import { getApi } from '../lib/api/core.js'
-import { clearApiToken, saveApiToken, type TokenStorageResult } from '../lib/auth.js'
+import { NoTokenError, clearApiToken, saveApiToken, type TokenStorageResult } from '../lib/auth.js'
 import { startCallbackServer } from '../lib/oauth-server.js'
 import { buildAuthorizationUrl, exchangeCodeForToken } from '../lib/oauth.js'
 import { generateCodeChallenge, generateCodeVerifier, generateState } from '../lib/pkce.js'
@@ -89,13 +89,24 @@ async function showStatus(options: { json?: boolean }): Promise<void> {
             console.log(`  Email: ${user.email}`)
             console.log(`  Name:  ${user.fullName}`)
         }
-    } catch {
+    } catch (error) {
+        const isAuthError = error instanceof NoTokenError
         if (options.json) {
-            console.log(JSON.stringify({ error: 'Not authenticated' }, null, 2))
-            process.exitCode = 1
+            if (isAuthError) {
+                console.log(JSON.stringify({ error: 'Not authenticated' }, null, 2))
+                process.exitCode = 1
+            } else {
+                throw error
+            }
         } else {
-            console.log(chalk.yellow('Not authenticated'))
-            console.log(chalk.dim('Run `td auth login` or `td auth token <token>` to authenticate'))
+            if (isAuthError) {
+                console.log(chalk.yellow('Not authenticated'))
+                console.log(
+                    chalk.dim('Run `td auth login` or `td auth token <token>` to authenticate'),
+                )
+            } else {
+                throw error
+            }
         }
     }
 }

src/lib/auth.ts

@@ -10,6 +10,15 @@ import {
 export const CONFIG_PATH = join(homedir(), '.config', 'todoist-cli', 'config.json')
 export const TOKEN_ENV_VAR = 'TODOIST_API_TOKEN'
 
+export class NoTokenError extends Error {
+    constructor() {
+        super(
+            `No API token found. Set ${TOKEN_ENV_VAR} or run \`td auth login\` or \`td auth token <token>\`.`,
+        )
+        this.name = 'NoTokenError'
+    }
+}
+
 export type TokenStorageLocation = 'secure-store' | 'config-file'
 
 export interface TokenStorageResult {
@@ -70,9 +79,7 @@ export async function getApiToken(): Promise<string> {
             }
         }
 
-        throw new Error(
-            `No API token found. Set ${TOKEN_ENV_VAR} or run \`td auth login\` or \`td auth token <token>\`.`,
-        )
+        throw new NoTokenError()
     }
 
     try {