From 01f0d5cb5914b6e8481c957eb2593510f7aaf273 Mon Sep 17 00:00:00 2001
From: Yoahoug <yyy225272@gmail.com>
Date: Fri, 16 Jan 2026 17:54:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20Codex=20OAuth=20?=
 =?UTF-8?q?=E5=9B=9E=E8=B0=83=E7=9B=91=E5=90=AC=EF=BC=8C=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=AE=8C=E6=88=90=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/auth/oauth-handlers.js | 54 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/src/auth/oauth-handlers.js b/src/auth/oauth-handlers.js
index 9f71665..068d996 100644
--- a/src/auth/oauth-handlers.js
+++ b/src/auth/oauth-handlers.js
@@ -2366,6 +2366,59 @@ export async function handleCodexOAuth(currentConfig, options = {}) {
             createdAt: Date.now()
         });
 
+        // 监听回调服务器的 auth-success 事件，自动完成 OAuth 流程
+        server.once('auth-success', async (result) => {
+            try {
+                console.log('[Codex Auth] Received auth callback, completing OAuth flow...');
+                
+                const session = global.codexOAuthSessions.get(sessionId);
+                if (!session) {
+                    console.error('[Codex Auth] Session not found');
+                    return;
+                }
+
+                // 完成 OAuth 流程
+                const credentials = await auth.completeOAuthFlow(result.code, result.state, session.state, session.pkce);
+
+                // 清理会话
+                global.codexOAuthSessions.delete(sessionId);
+
+                // 广播认证成功事件
+                broadcastEvent('oauth_success', {
+                    provider: 'openai-codex-oauth',
+                    credPath: credentials.credPath,
+                    relativePath: credentials.relativePath,
+                    timestamp: new Date().toISOString(),
+                    email: credentials.email,
+                    accountId: credentials.account_id
+                });
+
+                // 自动关联新生成的凭据到 Pools
+                await autoLinkProviderConfigs(CONFIG);
+
+                console.log('[Codex Auth] OAuth flow completed successfully');
+            } catch (error) {
+                console.error('[Codex Auth] Failed to complete OAuth flow:', error.message);
+                
+                // 广播认证失败事件
+                broadcastEvent('oauth_error', {
+                    provider: 'openai-codex-oauth',
+                    error: error.message
+                });
+            }
+        });
+
+        // 监听 auth-error 事件
+        server.once('auth-error', (error) => {
+            console.error('[Codex Auth] Auth error:', error.message);
+            global.codexOAuthSessions.delete(sessionId);
+            
+            broadcastEvent('oauth_error', {
+                provider: 'openai-codex-oauth',
+                error: error.message
+            });
+        });
+
         // 10 分钟后自动清理会话
         setTimeout(() => {
             if (global.codexOAuthSessions.has(sessionId)) {
@@ -2386,6 +2439,7 @@ export async function handleCodexOAuth(currentConfig, options = {}) {
                 method: 'oauth2-pkce',
                 sessionId: sessionId,
                 redirectUri: 'http://localhost:1455/auth/callback',
+                port: 1455,
                 instructions: [
                     '1. 点击下方按钮在浏览器中打开授权链接',
                     '2. 使用您的 OpenAI 账户登录',