diff --git a/.env.example b/.env.example index 873ff68..5a95d73 100644 --- a/.env.example +++ b/.env.example @@ -8,4 +8,7 @@ BOOTSTRAP_ADMIN_USERNAME=admin BOOTSTRAP_ADMIN_PASSWORD=123456qaz GITHUB_CLIENT_ID=your_github_client_id GITHUB_CLIENT_SECRET=your_github_client_secret +GITEA_CLIENT_ID=your_gitea_client_id +GITEA_CLIENT_SECRET=your_gitea_client_secret +GITEA_URL=https://gitea.com APP_URL=http://localhost:3399 \ No newline at end of file diff --git a/app/pages/auth/login.vue b/app/pages/auth/login.vue index dec62ae..a9d2f50 100644 --- a/app/pages/auth/login.vue +++ b/app/pages/auth/login.vue @@ -7,21 +7,6 @@ const route = useRoute() const { $toast } = useNuxtApp() const redirect = computed(() => route.query.redirect as string || '/') -onMounted(() => { - const url = new URL(window.location.href) - if (url.searchParams.get('oauth_success') === '1') { - refresh(true) - router.push('/') - } - if (url.searchParams.get('oauth_error')) { - const error = url.searchParams.get('oauth_error') - console.error('OAuth error:', error) - url.searchParams.delete('oauth_error') - window.history.replaceState({}, document.title, url.href); - $toast.error(`OAuth 登录失败: ${error}`) - } -}) - const loginForm = reactive({ username: '', password: '', @@ -43,6 +28,10 @@ async function loginWithGithub() { window.location.href = '/api/auth/oauth/github/authorize'; } +async function loginWithGitea() { + window.location.href = '/api/auth/oauth/gitea/authorize'; +} + async function fetchCaptcha() { captcha.loading = true try { @@ -82,6 +71,7 @@ async function handleLogin() { onMounted(() => { fetchCaptcha() + const url = new URL(window.location.href) if (url.searchParams.get('oauth_success') === '1') { refresh(true) @@ -90,6 +80,9 @@ onMounted(() => { if (url.searchParams.get('oauth_error')) { const error = url.searchParams.get('oauth_error') console.error('OAuth error:', error) + url.searchParams.delete('oauth_error') + window.history.replaceState({}, document.title, url.href) + $toast.error(`OAuth 登录失败: ${error}`) } }) @@ -155,12 +148,22 @@ onMounted(() => { - +
+ + + +

还没有账户？立即注册 @@ -557,29 +560,39 @@ onMounted(() => { letter-spacing: 1px; } +.social-row { + display: flex; + gap: 12px; +} + .social-btn { + flex: 1; display: flex; align-items: center; justify-content: center; - gap: 12px; - width: 100%; - padding: 16px 20px; + gap: 10px; + padding: 14px 16px; font-family: var(--font-body); font-size: 14px; font-weight: 500; - color: var(--color-ink); + color: var(--color-muted); background: var(--color-canvas); border: 1.5px solid var(--color-hairline); - border-radius: 8px; + border-radius: 10px; cursor: pointer; - transition: background 0.2s ease, border-color 0.2s ease; + transition: all 0.2s ease; } .social-btn:hover { + color: var(--color-ink); background: var(--color-surface-soft); border-color: var(--color-hairline-soft); } +.social-btn:active { + transform: scale(0.97); +} + .form-footer { text-align: center; margin-top: 24px; diff --git a/server/api/auth/oauth/[provider]/callback.get.ts b/server/api/auth/oauth/[provider]/callback.get.ts index bba13d4..3d50966 100644 --- a/server/api/auth/oauth/[provider]/callback.get.ts +++ b/server/api/auth/oauth/[provider]/callback.get.ts @@ -20,9 +20,9 @@ export default defineWrappedResponseHandler(async (event) => { setSessionCookie(event, result.sessionId); } - return sendRedirect(event, `${FRONTEND_LOGIN_PATH}??oauth_success=1`); + return sendRedirect(event, `${FRONTEND_LOGIN_PATH}?oauth_success=1`); } catch (error) { const errorCode = error instanceof OAuthError ? error.code : 'OAUTH_UNKNOWN'; - return sendRedirect(event, `${FRONTEND_LOGIN_PATH}??oauth_error=${errorCode}`); + return sendRedirect(event, `${FRONTEND_LOGIN_PATH}?oauth_error=${errorCode}`); } }); \ No newline at end of file diff --git a/server/service/oauth/oauth-manager.ts b/server/service/oauth/oauth-manager.ts index 2554e02..b5562ec 100644 --- a/server/service/oauth/oauth-manager.ts +++ b/server/service/oauth/oauth-manager.ts @@ -46,8 +46,11 @@ export type OAuthProviderConfig = { tokenUrl: string; userInfoUrl: string; scopes: string[]; + responseType?: string; redirectUri: string; userInfoMapping: FieldMapping; + grant_type?: string; + headers?: object; }; const providers: Record = { @@ -68,6 +71,25 @@ const providers: Record = { avatar: 'avatar_url', }, }, + gitea: { + name: 'gitea', + icon: 'gitea', // 或者使用自定义图标 + clientId: process.env.GITEA_CLIENT_ID || '', + clientSecret: process.env.GITEA_CLIENT_SECRET || '', + authorizeUrl: `${process.env.GITEA_URL}/login/oauth/authorize`, + tokenUrl: `${process.env.GITEA_URL}/login/oauth/access_token`, + userInfoUrl: `${process.env.GITEA_URL}/api/v1/user`, + scopes: ['read:user', 'user:email'], + grant_type: "authorization_code", + responseType: "code", + redirectUri: `${process.env.APP_URL}/api/auth/oauth/gitea/callback`, + userInfoMapping: { + providerUserId: 'id', + username: 'login', + email: 'email', + avatar: 'avatar_url', + }, + }, }; export class OAuthManager { @@ -102,6 +124,10 @@ export class OAuthManager { state, }); + if (provider.responseType) { + params.set('response_type', provider.responseType); + } + return `${provider.authorizeUrl}?${params.toString()}`; } @@ -260,11 +286,13 @@ export class OAuthManager { headers: { 'Content-Type': 'application/json', Accept: 'application/json', + ...(provider.headers || {}) }, body: JSON.stringify({ client_id: provider.clientId, client_secret: provider.clientSecret, code, + ...(provider.grant_type ? { grant_type: provider.grant_type } : {}), redirect_uri: provider.redirectUri, }), });