refactor: improve GitHub OAuth handling and update authentication flow

This commit is contained in:
shiyu
2025-05-19 12:16:53 +08:00
parent b65f1e4bbb
commit ab83c519c4
12 changed files with 488 additions and 454 deletions

View File

@@ -24,6 +24,7 @@ http {
proxy_set_header Connection keep-alive;
proxy_set_header Host $host;
proxy_cache_bypass $http_upgrade;
proxy_ssl_verify off;
}
location /uploads {
@@ -33,6 +34,7 @@ http {
proxy_set_header Connection keep-alive;
proxy_set_header Host $host;
proxy_cache_bypass $http_upgrade;
proxy_ssl_verify off;
}
}
}

View File

@@ -1,5 +1,5 @@
import { type BaseResult, type AuthResponse, type LoginRequest, type RegisterRequest, type UserProfile } from './types';
import { fetchApi, BASE_URL } from './fetchClient';
import {type BaseResult, type AuthResponse, type LoginRequest, type RegisterRequest, type UserProfile} from './types';
import {fetchApi, BASE_URL} from './fetchClient';
// 认证数据本地存储键
const TOKEN_KEY = 'token';
@@ -19,13 +19,13 @@ export async function login(data: LoginRequest): Promise<BaseResult<AuthResponse
method: 'POST',
body: JSON.stringify(data),
});
if (response.success && response.data) {
clearAuthData(); // 清除旧的认证数据
console.log('登录成功,保存认证数据:', response.data);
saveAuthData(response.data); // 保存新的认证数据
}
return response;
}
@@ -96,7 +96,7 @@ export const getToken = (): string | null => {
};
// 处理GitHub OAuth回调接收token并保存
export function handleOAuthCallback(): boolean {
export async function handleOAuthCallback(): Promise<boolean> {
const urlParams = new URLSearchParams(window.location.search);
const token = urlParams.get('token');
const error = urlParams.get('error');
@@ -104,52 +104,40 @@ export function handleOAuthCallback(): boolean {
if (error) return false;
if (token) {
const githubUser = parseJwt(token);
if (githubUser) {
// 保存token
localStorage.setItem('token', token);
// 保存用户信息
if (githubUser.unique_name && githubUser.email) {
const user: UserProfile = {
id: parseInt(githubUser.nameid),
userName: githubUser.unique_name,
email: githubUser.email,
roleName: ''
try {
// 保存临时token用于API调用
localStorage.setItem(TOKEN_KEY, token);
// 获取完整的用户信息
const userResponse = await getCurrentUser();
if (userResponse.success && userResponse.data) {
// 构造完整的认证响应并保存
const authResponse: AuthResponse = {
token: token,
user: userResponse.data
};
localStorage.setItem('user', JSON.stringify(user));
saveAuthData(authResponse);
// 清除URL中的token参数
const url = new URL(window.location.href);
url.searchParams.delete('token');
window.history.replaceState({}, document.title, url.toString());
return true;
}
// 清除URL中的token参数
const url = new URL(window.location.href);
url.searchParams.delete('token');
window.history.replaceState({}, document.title, url.toString());
return true;
return false;
} catch (error) {
console.error('第三方登录处理失败:', error);
clearAuthData(); // 清除可能部分保存的数据
return false;
}
}
return false;
}
// 解析JWT获取用户信息
function parseJwt(token: string) {
try {
const base64Url = token.split('.')[1];
const base64 = base64Url.replace(/-/g, '+').replace(/_/g, '/');
const jsonPayload = decodeURIComponent(
atob(base64)
.split('')
.map(c => '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2))
.join('')
);
return JSON.parse(jsonPayload);
} catch {
return null;
}
}
// 获取GitHub登录URL
export function getGitHubLoginUrl(): string {
return `${BASE_URL}/auth/github/login?returnUrl=${window.location.origin}/api/auth/github/callback`;
}
return `${BASE_URL}/auth/github/login`;
}

View File

@@ -1,305 +1,331 @@
import React, { useState, useEffect } from 'react';
import { Form, Input, Button, Checkbox, Typography, Row, Col, Divider, message } from 'antd';
import { UserOutlined, LockOutlined, GithubOutlined, GoogleOutlined } from '@ant-design/icons';
import { useNavigate, Link } from 'react-router';
import { login, saveAuthData, isAuthenticated, handleOAuthCallback, getGitHubLoginUrl } from '../../api';
import React, {useState, useEffect} from 'react';
import {Form, Input, Button, Checkbox, Typography, Row, Col, Divider, message} from 'antd';
import {UserOutlined, LockOutlined, GithubOutlined, GoogleOutlined} from '@ant-design/icons';
import {useNavigate, Link} from 'react-router';
import {login, saveAuthData, isAuthenticated, handleOAuthCallback, getGitHubLoginUrl} from '../../api';
import useIsMobile from '../../hooks/useIsMobile';
const { Title, Text } = Typography;
const {Title, Text} = Typography;
const Login: React.FC = () => {
const [loading, setLoading] = useState(false);
const navigate = useNavigate();
const isMobile = useIsMobile();
const [loading, setLoading] = useState(false);
const navigate = useNavigate();
const isMobile = useIsMobile();
useEffect(() => {
if (handleOAuthCallback()) {
message.success('GitHub登录成功');
navigate('/');
return;
}
if (isAuthenticated()) {
navigate('/');
}
}, [navigate]);
const onFinish = async (values: any) => {
setLoading(true);
try {
const response = await login({
email: values.email,
password: values.password
});
if (response.success && response.data) {
// 保存认证信息
saveAuthData(response.data);
useEffect(() => {
const checkOAuthCallback = async () => {
try {
if (await handleOAuthCallback()) {
message.success('第三方登录成功!');
navigate('/');
return;
}
if (isAuthenticated()) {
navigate('/');
}
} catch (error) {
console.error('处理登录回调失败:', error);
message.error('登录过程中出现错误');
}
};
// 显示成功消息
message.success(response.message || '登录成功!');
// 跳转到首页
navigate('/');
} else {
// 显示错误消息
message.error(response.message || '登录失败,请检查账号和密码');
}
} catch (error) {
console.error('登录出错:', error);
message.error('登录过程中出现错误,请稍后重试');
} finally {
setLoading(false);
}
};
checkOAuthCallback();
}, [navigate]);
const handleGitHubLogin = () => {
window.location.href = getGitHubLoginUrl();
};
const onFinish = async (values: any) => {
setLoading(true);
try {
const response = await login({
email: values.email,
password: values.password
});
return (
<Row style={{ height: '100vh', overflow: 'hidden' }}>
{/* 左侧登录表单 */}
<Col
xs={24}
md={isMobile ? 24 : 12}
style={{
padding: isMobile ? '20px' : '40px',
display: 'flex',
flexDirection: 'column',
justifyContent: 'center',
maxWidth: isMobile ? '100%' : '650px',
margin: '0 auto'
}}
>
<div style={{
maxWidth: isMobile ? '100%' : '400px',
width: '100%',
margin: '0 auto',
paddingBottom: isMobile ? '40px' : 0
}}>
<div style={{ marginBottom: '40px', textAlign: 'center' }}>
<Title level={2} style={{
marginBottom: '8px',
fontWeight: 700,
background: 'linear-gradient(120deg, #18181b, #444444)',
WebkitBackgroundClip: 'text',
WebkitTextFillColor: 'transparent'
}}>
Foxel
</Title>
<Text style={{ fontSize: '16px', color: '#666' }}>
使
</Text>
</div>
if (response.success && response.data) {
// 保存认证信息
saveAuthData(response.data);
<Form
name="login_form"
initialValues={{ remember: true }}
onFinish={onFinish}
size="large"
layout="vertical"
>
<Form.Item
name="email"
rules={[{ required: true, message: '请输入您的邮箱' }]}
>
<Input
prefix={<UserOutlined style={{ color: '#bfbfbf' }} />}
placeholder="邮箱"
style={{
height: '50px',
borderRadius: '10px',
backgroundColor: '#f8f9fa',
border: '1px solid #eaeaea'
}}
/>
</Form.Item>
// 显示成功消息
message.success(response.message || '登录成功!');
<Form.Item
name="password"
rules={[{ required: true, message: '请输入您的密码' }]}
>
<Input.Password
prefix={<LockOutlined style={{ color: '#bfbfbf' }} />}
placeholder="密码"
style={{
height: '50px',
borderRadius: '10px',
backgroundColor: '#f8f9fa',
border: '1px solid #eaeaea'
}}
/>
</Form.Item>
// 跳转到首页
navigate('/');
} else {
// 显示错误消息
message.error(response.message || '登录失败,请检查账号和密码');
}
} catch (error) {
console.error('登录出错:', error);
message.error('登录过程中出现错误,请稍后重试');
} finally {
setLoading(false);
}
};
<Form.Item>
<div style={{ display: 'flex', justifyContent: 'space-between' }}>
<Checkbox name="remember"></Checkbox>
<a href="#forgot" style={{ color: '#18181b' }}></a>
</div>
</Form.Item>
const handleGitHubLogin = () => {
window.location.href = getGitHubLoginUrl();
};
<Form.Item>
<Button
type="primary"
htmlType="submit"
loading={loading}
style={{
width: '100%',
height: '50px',
borderRadius: '10px',
fontWeight: 500,
fontSize: '16px',
boxShadow: '0 4px 12px rgba(0,0,0,0.15)'
return (
<Row style={{height: '100vh', overflow: 'hidden'}}>
{/* 左侧登录表单 */}
<Col
xs={24}
md={isMobile ? 24 : 12}
style={{
padding: isMobile ? '20px' : '40px',
display: 'flex',
flexDirection: 'column',
justifyContent: 'center',
maxWidth: isMobile ? '100%' : '650px',
margin: '0 auto'
}}
>
</Button>
</Form.Item>
>
<div style={{
maxWidth: isMobile ? '100%' : '400px',
width: '100%',
margin: '0 auto',
paddingBottom: isMobile ? '40px' : 0
}}>
<div style={{marginBottom: '40px', textAlign: 'center'}}>
<Title level={2} style={{
marginBottom: '8px',
fontWeight: 700,
background: 'linear-gradient(120deg, #18181b, #444444)',
WebkitBackgroundClip: 'text',
WebkitTextFillColor: 'transparent'
}}>
Foxel
</Title>
<Text style={{fontSize: '16px', color: '#666'}}>
使
</Text>
</div>
<Divider plain style={{ color: '#999', fontSize: '14px' }}>
使
</Divider>
<Form
name="login_form"
initialValues={{remember: true}}
onFinish={onFinish}
size="large"
layout="vertical"
>
<Form.Item
name="email"
rules={[{required: true, message: '请输入您的邮箱'}]}
>
<Input
prefix={<UserOutlined style={{color: '#bfbfbf'}}/>}
placeholder="邮箱"
style={{
height: '50px',
borderRadius: '10px',
backgroundColor: '#f8f9fa',
border: '1px solid #eaeaea'
}}
/>
</Form.Item>
<div style={{ display: 'flex', justifyContent: 'center', gap: '20px', margin: '20px 0' }}>
<Button
icon={<GithubOutlined />}
size="large"
shape="circle"
onClick={handleGitHubLogin}
style={{
backgroundColor: '#f6f6f6',
border: 'none',
boxShadow: '0 2px 8px rgba(0,0,0,0.06)'
}}
/>
<Button
icon={<GoogleOutlined />}
size="large"
shape="circle"
style={{
backgroundColor: '#f6f6f6',
border: 'none',
boxShadow: '0 2px 8px rgba(0,0,0,0.06)'
}}
/>
</div>
<Form.Item
name="password"
rules={[{required: true, message: '请输入您的密码'}]}
>
<Input.Password
prefix={<LockOutlined style={{color: '#bfbfbf'}}/>}
placeholder="密码"
style={{
height: '50px',
borderRadius: '10px',
backgroundColor: '#f8f9fa',
border: '1px solid #eaeaea'
}}
/>
</Form.Item>
<div style={{ textAlign: 'center', marginTop: '30px' }}>
<Text style={{ color: '#666' }}>
<Link to="/register" style={{ color: '#18181b', fontWeight: 500 }}></Link>
</Text>
<div style={{ marginTop: '15px' }}>
<Link to="/anonymous" style={{ color: '#666' }}>
<Button type="link" style={{ padding: '0', fontWeight: 500 }}></Button>
</Link>
</div>
</div>
</Form>
</div>
</Col>
<Form.Item>
<div style={{display: 'flex', justifyContent: 'space-between'}}>
<Checkbox name="remember"></Checkbox>
<a href="#forgot" style={{color: '#18181b'}}></a>
</div>
</Form.Item>
{/* 右侧视觉区域 - 仅在非移动设备上显示 */}
{!isMobile && (
<Col md={12} style={{
background: 'linear-gradient(135deg, #18181b 0%, #444444 100%)',
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
position: 'relative',
overflow: 'hidden',
height: '100vh'
}}>
<div style={{
position: 'absolute',
width: '600px',
height: '600px',
background: 'radial-gradient(circle, rgba(255,255,255,0.1) 0%, rgba(255,255,255,0) 70%)',
top: '20%',
left: '30%'
}}></div>
<div style={{
position: 'absolute',
width: '400px',
height: '400px',
background: 'radial-gradient(circle, rgba(255,255,255,0.08) 0%, rgba(255,255,255,0) 70%)',
bottom: '10%',
right: '20%'
}}></div>
<div style={{
padding: '40px',
textAlign: 'center',
color: 'white',
position: 'relative',
zIndex: 1,
maxWidth: '500px'
}}>
<Title level={2} style={{
color: 'white',
marginBottom: '25px',
fontWeight: 700,
letterSpacing: '1px'
}}>
</Title>
<Text style={{
fontSize: '18px',
color: 'rgba(255,255,255,0.8)',
lineHeight: '1.8',
display: 'block',
marginBottom: '30px'
}}>
Foxel
</Text>
{/* 图片管理界面预览 */}
<div style={{
width: '100%',
height: '300px',
background: 'rgba(255,255,255,0.1)',
borderRadius: '20px',
boxShadow: '0 20px 40px rgba(0,0,0,0.3)',
backdropFilter: 'blur(20px)',
border: '1px solid rgba(255,255,255,0.2)',
position: 'relative',
overflow: 'hidden'
}}>
<div style={{
position: 'absolute',
top: '12px',
left: '12px',
right: '12px',
height: '30px',
borderRadius: '8px 8px 0 0',
display: 'flex',
alignItems: 'center',
gap: '8px',
paddingLeft: '12px'
}}>
<div style={{ width: '10px', height: '10px', borderRadius: '50%', background: 'rgba(255,255,255,0.6)' }} />
<div style={{ width: '10px', height: '10px', borderRadius: '50%', background: 'rgba(255,255,255,0.6)' }} />
<div style={{ width: '10px', height: '10px', borderRadius: '50%', background: 'rgba(255,255,255,0.6)' }} />
</div>
<div style={{
position: 'absolute',
top: '50%',
left: '50%',
transform: 'translate(-50%, -50%)',
fontSize: '24px',
fontWeight: 'bold',
color: 'rgba(255,255,255,0.7)'
}}>
Foxel
</div>
</div>
</div>
</Col>
)}
</Row>
);
<Form.Item>
<Button
type="primary"
htmlType="submit"
loading={loading}
style={{
width: '100%',
height: '50px',
borderRadius: '10px',
fontWeight: 500,
fontSize: '16px',
boxShadow: '0 4px 12px rgba(0,0,0,0.15)'
}}
>
</Button>
</Form.Item>
<Divider plain style={{color: '#999', fontSize: '14px'}}>
使
</Divider>
<div style={{display: 'flex', justifyContent: 'center', gap: '20px', margin: '20px 0'}}>
<Button
icon={<GithubOutlined/>}
size="large"
shape="circle"
onClick={handleGitHubLogin}
style={{
backgroundColor: '#f6f6f6',
border: 'none',
boxShadow: '0 2px 8px rgba(0,0,0,0.06)'
}}
/>
<Button
icon={<GoogleOutlined/>}
size="large"
shape="circle"
style={{
backgroundColor: '#f6f6f6',
border: 'none',
boxShadow: '0 2px 8px rgba(0,0,0,0.06)'
}}
/>
</div>
<div style={{textAlign: 'center', marginTop: '30px'}}>
<Text style={{color: '#666'}}>
<Link to="/register"
style={{color: '#18181b', fontWeight: 500}}></Link>
</Text>
<div style={{marginTop: '15px'}}>
<Link to="/anonymous" style={{color: '#666'}}>
<Button type="link" style={{padding: '0', fontWeight: 500}}></Button>
</Link>
</div>
</div>
</Form>
</div>
</Col>
{/* 右侧视觉区域 - 仅在非移动设备上显示 */}
{!isMobile && (
<Col md={12} style={{
background: 'linear-gradient(135deg, #18181b 0%, #444444 100%)',
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
position: 'relative',
overflow: 'hidden',
height: '100vh'
}}>
<div style={{
position: 'absolute',
width: '600px',
height: '600px',
background: 'radial-gradient(circle, rgba(255,255,255,0.1) 0%, rgba(255,255,255,0) 70%)',
top: '20%',
left: '30%'
}}></div>
<div style={{
position: 'absolute',
width: '400px',
height: '400px',
background: 'radial-gradient(circle, rgba(255,255,255,0.08) 0%, rgba(255,255,255,0) 70%)',
bottom: '10%',
right: '20%'
}}></div>
<div style={{
padding: '40px',
textAlign: 'center',
color: 'white',
position: 'relative',
zIndex: 1,
maxWidth: '500px'
}}>
<Title level={2} style={{
color: 'white',
marginBottom: '25px',
fontWeight: 700,
letterSpacing: '1px'
}}>
</Title>
<Text style={{
fontSize: '18px',
color: 'rgba(255,255,255,0.8)',
lineHeight: '1.8',
display: 'block',
marginBottom: '30px'
}}>
Foxel
</Text>
{/* 图片管理界面预览 */}
<div style={{
width: '100%',
height: '300px',
background: 'rgba(255,255,255,0.1)',
borderRadius: '20px',
boxShadow: '0 20px 40px rgba(0,0,0,0.3)',
backdropFilter: 'blur(20px)',
border: '1px solid rgba(255,255,255,0.2)',
position: 'relative',
overflow: 'hidden'
}}>
<div style={{
position: 'absolute',
top: '12px',
left: '12px',
right: '12px',
height: '30px',
borderRadius: '8px 8px 0 0',
display: 'flex',
alignItems: 'center',
gap: '8px',
paddingLeft: '12px'
}}>
<div style={{
width: '10px',
height: '10px',
borderRadius: '50%',
background: 'rgba(255,255,255,0.6)'
}}/>
<div style={{
width: '10px',
height: '10px',
borderRadius: '50%',
background: 'rgba(255,255,255,0.6)'
}}/>
<div style={{
width: '10px',
height: '10px',
borderRadius: '50%',
background: 'rgba(255,255,255,0.6)'
}}/>
</div>
<div style={{
position: 'absolute',
top: '50%',
left: '50%',
transform: 'translate(-50%, -50%)',
fontSize: '24px',
fontWeight: 'bold',
color: 'rgba(255,255,255,0.7)'
}}>
Foxel
</div>
</div>
</div>
</Col>
)}
</Row>
);
};
export default Login;

View File

@@ -13,16 +13,24 @@ const Register: React.FC = () => {
const isMobile = useIsMobile();
useEffect(() => {
// 处理可能的OAuth回调
if (handleOAuthCallback()) {
message.success('使用GitHub账号注册成功');
navigate('/');
return;
}
const checkOAuthCallback = async () => {
try {
if (await handleOAuthCallback()) {
message.success('使用GitHub账号注册成功');
navigate('/');
return;
}
if (isAuthenticated()) {
navigate('/');
}
if (isAuthenticated()) {
navigate('/');
}
} catch (error) {
console.error('处理登录回调失败:', error);
message.error('登录过程中出现错误');
}
};
checkOAuthCallback();
}, [navigate]);
const onFinish = async (values: any) => {

View File

@@ -138,12 +138,14 @@ const SystemConfig: React.FC = () => {
groupName="Authentication"
configs={{
"GitHubClientId": configs.Authentication?.["GitHubClientId"] || '',
"GitHubClientSecret": configs.Authentication?.["GitHubClientSecret"] || ''
"GitHubClientSecret": configs.Authentication?.["GitHubClientSecret"] || '',
"GitHubCallbackUrl": configs.Authentication?.["GitHubCallbackUrl"] || ''
}}
onSave={(_group, key, value) => handleSaveConfig('Authentication', key, value)}
descriptions={{
"GitHubClientId": 'GitHub OAuth 应用客户端ID',
"GitHubClientSecret": 'GitHub OAuth 应用客户端密钥'
"GitHubClientSecret": 'GitHub OAuth 应用客户端密钥',
"GitHubCallbackUrl": 'GitHub OAuth 认证回调地址'
}}
/>
</TabPane>