Merge branch 'main' of http://124.221.157.197:3345/Novault/Novault-Frontend-web

src/pages/GitHubCallback/index.ts

@@ -1 +0,0 @@
-export { default } from './GitHubCallback';

src/pages/OAuthCallback/OAuthCallback.css

@@ -1,4 +1,4 @@
-.github-callback-page {
+.oauth-callback-page {
   min-height: 100vh;
   display: flex;
   align-items: center;
@@ -7,7 +7,7 @@
   padding: 1rem;
 }
 
-.github-callback-container {
+.oauth-callback-container {
   background: var(--card-bg);
   border-radius: 1rem;
   padding: 3rem 2rem;

src/pages/OAuthCallback/OAuthCallback.tsx

@@ -1,14 +1,23 @@
 import { useEffect, useState } from 'react';
-import { useNavigate, useSearchParams } from 'react-router-dom';
+import { useNavigate, useSearchParams, useLocation } from 'react-router-dom';
 import { Icon } from '@iconify/react';
 import authService from '../../services/authService';
-import './GitHubCallback.css';
+import './OAuthCallback.css';
 
-export default function GitHubCallback() {
+interface OAuthCallbackProps {
+  provider?: 'github' | 'gitee';
+}
+
+export default function OAuthCallback({ provider: propProvider }: OAuthCallbackProps) {
   const navigate = useNavigate();
+  const location = useLocation();
   const [searchParams] = useSearchParams();
   const [error, setError] = useState('');
 
+  // Determine provider from prop or path
+  const provider = propProvider || (location.pathname.includes('gitee') ? 'gitee' : 'github');
+  const providerName = provider === 'github' ? 'GitHub' : 'Gitee';
+
   useEffect(() => {
     const handleCallback = async () => {
       const errorParam = searchParams.get('error');
@@ -16,7 +25,7 @@ export default function GitHubCallback() {
       const refreshToken = searchParams.get('refresh_token');
 
       if (errorParam) {
-        setError('GitHub 授权失败');
+        setError(`${providerName} 授权失败`);
         setTimeout(() => navigate('/login'), 2000);
         return;
       }
@@ -41,20 +50,24 @@ export default function GitHubCallback() {
       }
 
       try {
+        if (provider === 'gitee') {
+          await authService.handleGiteeCallback(code);
+        } else {
           await authService.handleGitHubCallback(code);
+        }
         navigate('/home');
       } catch (err) {
-        setError(err instanceof Error ? err.message : 'GitHub 登录失败');
+        setError(err instanceof Error ? err.message : `${providerName} 登录失败`);
         setTimeout(() => navigate('/login'), 2000);
       }
     };
 
     handleCallback();
-  }, [searchParams, navigate]);
+  }, [searchParams, navigate, provider, providerName]);
 
   return (
-    <div className="github-callback-page">
+    <div className="oauth-callback-page">
-      <div className="github-callback-container">
+      <div className="oauth-callback-container">
         {error ? (
           <>
             <Icon icon="solar:close-circle-bold-duotone" width="48" className="callback-icon error" />
@@ -65,7 +78,7 @@ export default function GitHubCallback() {
         ) : (
           <>
             <Icon icon="svg-spinners:ring-resize" width="48" className="callback-icon" />
-            <h2 className="callback-title">正在处理 GitHub 登录</h2>
+            <h2 className="callback-title">正在处理 {providerName} 登录</h2>
             <p className="callback-message">请稍候...</p>
           </>
         )}

src/pages/OAuthCallback/index.ts

@@ -0,0 +1 @@
+export { default } from './OAuthCallback';