fix: 🧩 修复登录错误 (#51)

xun082 · web-flow · commit 083bf3c2bef3 · 2025-07-29T16:37:45.000+08:00
diff --git a/src/app/auth/callback/page.tsx b/src/app/auth/callback/page.tsx
@@ -21,8 +21,8 @@ function CallbackContent() {
     if (state) {
       try {
         return decodeURIComponent(state);
-      } catch (e) {
-        console.warn('解析state参数失败:', e);
+      } catch {
+        // 解析失败时忽略state参数
       }
     }
 
@@ -53,7 +53,6 @@ function CallbackContent() {
     saveAuthData(authData);
     setStatus('登录成功! 正在跳转...');
     setState('success');
-    console.log('认证数据:', authData);
 
     // 跳转到原来的页面
     const redirectUrl = getRedirectUrl();
@@ -97,14 +96,27 @@ function CallbackContent() {
         const code = searchParams.get('code');
 
         if (!code) {
-          setStatus('未收到授权码或Token');
+          setStatus('未收到授权码或Token，请重新尝试登录');
           setState('error');
 
           return;
         }
 
+        setStatus('正在与GitHub服务器通信...');
+
         const { data, error } = await authApi.githubCallback(code, {
-          onError: (error) => console.error('GitHub认证出错:', error),
+          onError: (error) => {
+            // 处理不同类型的错误
+            if (error instanceof Error) {
+              if (error.message.includes('超时') || error.message.includes('timeout')) {
+                setStatus('GitHub认证超时，请重试或检查网络连接');
+              } else if (error.message.includes('网络')) {
+                setStatus('网络连接错误，请检查您的网络设置');
+              } else {
+                setStatus(`认证失败: ${error.message}`);
+              }
+            }
+          },
         });
 
         if (error) {
@@ -122,9 +134,19 @@ function CallbackContent() {
           setState('error');
         }
       } catch (e) {
-        setStatus('登录过程中发生错误');
+        if (e instanceof Error) {
+          if (e.message.includes('Failed to fetch') || e.message.includes('Network')) {
+            setStatus('网络连接失败，请检查网络设置后重试');
+          } else if (e.message.includes('timeout') || e.message.includes('超时')) {
+            setStatus('请求超时，服务器响应较慢，请重试');
+          } else {
+            setStatus(`认证失败: ${e.message}`);
+          }
+        } else {
+          setStatus('登录过程中发生未知错误，请重试');
+        }
+
         setState('error');
-        console.error(e);
       }
     };
 
@@ -155,13 +177,26 @@ function CallbackContent() {
             {state === 'error' && (
               <div className="flex flex-col items-center">
                 <AlertCircle className="h-14 w-14 text-red-500 mb-4" />
-                <p className="text-lg font-medium text-gray-700">{status}</p>
-                <button
-                  className="mt-6 py-2 px-4 bg-blue-500 hover:bg-blue-600 text-white rounded-lg transition-colors"
-                  onClick={() => router.push('/auth')}
-                >
-                  返回登录
-                </button>
+                <p className="text-lg font-medium text-gray-700 text-center mb-4">{status}</p>
+                <div className="flex space-x-3">
+                  <button
+                    className="py-2 px-4 bg-blue-500 hover:bg-blue-600 text-white rounded-lg transition-colors"
+                    onClick={() => {
+                      setState('loading');
+                      setStatus('重新尝试认证...');
+                      // 重新触发认证流程
+                      window.location.reload();
+                    }}
+                  >
+                    重试
+                  </button>
+                  <button
+                    className="py-2 px-4 bg-gray-500 hover:bg-gray-600 text-white rounded-lg transition-colors"
+                    onClick={() => router.push('/auth')}
+                  >
+                    返回登录
+                  </button>
+                </div>
               </div>
             )}
           </div>
diff --git a/src/app/dashboard/more/page.tsx b/src/app/dashboard/more/page.tsx
@@ -9,9 +9,6 @@ import {
   Mail,
   ExternalLink,
 } from 'lucide-react';
-import { useEffect } from 'react';
-
-import request from '@/services/request';
 
 const moreFeatures = [
   {
@@ -74,23 +71,6 @@ const quickLinks = [
 ];
 
 export default function MorePage() {
-  useEffect(() => {
-    async function getMoreFeatures() {
-      const result = await request.get(
-        `/api/v1/documents/35/content`,
-        { cacheTime: 0 }, // 不缓存，确保数据新鲜
-        undefined, // mode
-        'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MTIzLCJuYW1lIjoiMjA0MjIwNDI4NUBxcS5jb20iLCJlbWFpbCI6IjIwNDIyMDQyODVAcXEuY29tIiwiaWF0IjoxNzUyMDUzMjMwLCJleHAiOjE3NTQ2NDUyMzB9.pz0hnKhcGdq7tDiYxeEnUooLUoPnTg1OvHJtShix78w', // 传递 token，现在 request 已经支持 SSR
-      );
-
-      console.log('result', result);
-    }
-
-    getMoreFeatures();
-
-    return () => {};
-  }, []);
-
   return (
     <div className="p-6 max-w-4xl mx-auto">
       {/* 页面头部 */}
diff --git a/src/app/docs/_components/DocumentSidebar/SettingsTab.tsx b/src/app/docs/_components/DocumentSidebar/SettingsTab.tsx
@@ -154,7 +154,6 @@ const SettingsTab = () => {
               )}
               onClick={() => {
                 // TODO: 实现具体的设置操作
-                console.log(`执行操作: ${item.action}`);
               }}
             >
               <Icon name={item.icon as any} className="h-4 w-4 text-gray-500 dark:text-gray-400" />
diff --git a/src/app/page.tsx b/src/app/page.tsx
@@ -43,6 +43,19 @@ const Page = () => {
     const token = getCookie('auth_token');
     setIsLoggedIn(!!token);
 
+    // 检查是否是GitHub OAuth回调（如果callback URL配置错误指向了根目录）
+    const urlParams = new URLSearchParams(window.location.search);
+    const code = urlParams.get('code');
+
+    if (code) {
+      // 构建完整的callback URL，保留所有参数
+      const callbackUrl = `/auth/callback${window.location.search}`;
+      // 使用replace避免在浏览器历史中留下痕迹
+      window.location.replace(callbackUrl);
+
+      return; // 早期返回，避免设置其他监听器
+    }
+
     const handleMouseMove = (e: MouseEvent) => {
       mouseX.set(e.clientX - 192);
       mouseY.set(e.clientY - 192);
@@ -238,8 +251,8 @@ const Page = () => {
       setTimeout(() => {
         setCopiedStates((prev) => ({ ...prev, [key]: false }));
       }, 2000);
-    } catch (err) {
-      console.error('复制失败', err);
+    } catch {
+      // 复制失败时静默处理
     }
   };
 
diff --git a/src/components/menus/TextMenu/TextMenu.tsx b/src/components/menus/TextMenu/TextMenu.tsx
@@ -33,7 +33,7 @@ export function TextMenu({ editor }: { editor: Editor }) {
 
     const handleUpdate = () => {
       // 暂时注释掉，避免阻塞TextMenu显示
-      // console.log('📝 编辑器更新，设置 isTyping = true');
+
       // setIsTyping(true);
 
       // 清除之前的定时器
@@ -43,7 +43,6 @@ export function TextMenu({ editor }: { editor: Editor }) {
 
       // 快速重置输入状态
       typingTimeout = window.setTimeout(() => {
-        console.log('⏰ 重置 isTyping = false');
         setIsTyping(false);
       }, 100); // 大幅减少延迟时间
     };
diff --git a/src/middleware.ts b/src/middleware.ts
@@ -6,16 +6,8 @@ export function middleware(request: NextRequest) {
   // 从cookie获取token
   const token = request.cookies.get('auth_token')?.value;
 
-  console.log('===MIDDLEWARE===', {
-    path: pathname,
-    hasToken: !!token,
-    userAgent: request.headers.get('user-agent')?.slice(0, 50),
-  });
-
   // 如果没有token，重定向到登录页
   if (!token) {
-    console.log('No token found, redirecting to /auth');
-
     // 保存原始URL到登录页的查询参数中
     const loginUrl = new URL('/auth', request.url);
     loginUrl.searchParams.set('redirect_to', encodeURIComponent(pathname + request.nextUrl.search));
@@ -26,9 +18,6 @@ export function middleware(request: NextRequest) {
   // 可以在这里添加更多的token验证逻辑
   // 比如检查token是否过期等
 
-  // Token存在，允许访问
-  console.log('Token found, allowing access to:', pathname);
-
   return NextResponse.next();
 }
 
diff --git a/src/services/auth/index.ts b/src/services/auth/index.ts
@@ -71,12 +71,12 @@ export const authApi = {
    * @returns 认证结果，包含token等信息
    */
   githubCallback: (code: string, errorHandler?: ErrorHandler) =>
-    request.get<AuthResponse>('/api/v1/auth/callback', {
+    request.get<AuthResponse>('/api/v1/auth/github/callback', {
       params: { code },
       errorHandler,
       withCredentials: true,
-      timeout: 30000, // 增加超时到30秒，GitHub OAuth可能需要更长时间
-      retries: 2, // 允许重试2次
+      timeout: 60000, // 增加超时到60秒，GitHub OAuth可能需要更长时间
+      retries: 3, // 允许重试3次
     }),
 
   /**

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,6 @@ const SettingsTab = () => {`
`154`	`154`	`)}`
`155`	`155`	`onClick={() => {`
`156`	`156`	`// TODO: 实现具体的设置操作`
`157`		- console.log(`执行操作: ${item.action}`);
`158`	`157`	`}}`
`159`	`158`	`>`
`160`	`159`	`<Icon name={item.icon as any} className="h-4 w-4 text-gray-500 dark:text-gray-400" />`