From f36be7254e37106b4933e75ca6faa8a67bf6bd54 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Fri, 7 Nov 2025 00:51:10 +0000
Subject: [PATCH] Add auth retry tests

---
 src/cli.ts                   | 10 ++++++++-
 tests/cli-auth-retry.test.ts | 39 ++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 tests/cli-auth-retry.test.ts

diff --git a/src/cli.ts b/src/cli.ts
index f488026..a35d4ee 100644
--- a/src/cli.ts
+++ b/src/cli.ts
@@ -791,7 +791,7 @@ export async function handleAuth(runtime: Awaited<ReturnType<typeof createRuntim
       logInfo(`Authorization complete. ${tools.length} tool${tools.length === 1 ? '' : 's'} available.`);
       return;
     } catch (error) {
-      if (attempt === 0 && error instanceof Error && /Unauthorized/i.test(error.message)) {
+      if (attempt === 0 && shouldRetryAuthError(error)) {
         logWarn('Server signaled OAuth after the initial attempt. Retrying with browser flow...');
         continue;
       }
@@ -801,6 +801,14 @@ export async function handleAuth(runtime: Awaited<ReturnType<typeof createRuntim
   }
 }
 
+function shouldRetryAuthError(error: unknown): boolean {
+  const message = error instanceof Error ? error.message : typeof error === 'string' ? error : '';
+  if (!message) {
+    return false;
+  }
+  return /unauthorized|invalid[_-]?token|\b(401|403)\b/i.test(message);
+}
+
 function looksLikeHttpUrl(value: string): boolean {
   return /^https?:\/\//i.test(value);
 }
diff --git a/tests/cli-auth-retry.test.ts b/tests/cli-auth-retry.test.ts
new file mode 100644
index 0000000..70970a1
--- /dev/null
+++ b/tests/cli-auth-retry.test.ts
@@ -0,0 +1,39 @@
+import { describe, expect, it, vi } from 'vitest';
+
+process.env.MCPORTER_DISABLE_AUTORUN = '1';
+const cliModulePromise = import('../src/cli.js');
+
+const baseDefinition = {
+  name: 'adhoc-server',
+  command: { kind: 'http' as const, url: new URL('https://example.com/mcp') },
+  source: { kind: 'local' as const, path: '<adhoc>' },
+};
+
+describe('handleAuth retry logic', () => {
+  it('retries once when the first attempt is unauthorized', async () => {
+    const { handleAuth } = await cliModulePromise;
+    const runtime = {
+      registerDefinition: vi.fn(),
+      getDefinition: vi.fn().mockReturnValue(baseDefinition),
+      listTools: vi
+        .fn()
+        .mockRejectedValueOnce(new Error('SSE error: Non-200 status code (401)'))
+        .mockResolvedValueOnce([{ name: 'ok' }]),
+    } as unknown as Awaited<ReturnType<typeof import('../src/runtime.js')['createRuntime']>>;
+
+    await expect(handleAuth(runtime, ['adhoc-server'])).resolves.toBeUndefined();
+    expect(runtime.listTools).toHaveBeenCalledTimes(2);
+  });
+
+  it('throws after the second unauthorized attempt', async () => {
+    const { handleAuth } = await cliModulePromise;
+    const runtime = {
+      registerDefinition: vi.fn(),
+      getDefinition: vi.fn().mockReturnValue(baseDefinition),
+      listTools: vi.fn().mockRejectedValue(new Error('SSE error: Non-200 status code (401)')),
+    } as unknown as Awaited<ReturnType<typeof import('../src/runtime.js')['createRuntime']>>;
+
+    await expect(handleAuth(runtime, ['adhoc-server'])).rejects.toThrow(/Failed to authorize/);
+    expect(runtime.listTools).toHaveBeenCalledTimes(2);
+  });
+});