feat: 增加 GitHub 和 Google 邮箱快捷登录
This commit is contained in:
85
frontend/src/components/auth/EmailOAuthButtons.vue
Normal file
85
frontend/src/components/auth/EmailOAuthButtons.vue
Normal file
@@ -0,0 +1,85 @@
|
||||
<template>
|
||||
<div v-if="hasProviders" class="space-y-4">
|
||||
<div v-if="showDivider" class="flex items-center gap-3">
|
||||
<div class="h-px flex-1 bg-gray-200 dark:bg-dark-700"></div>
|
||||
<span class="text-xs text-gray-500 dark:text-dark-400">
|
||||
{{ t('auth.oauthOrContinue') }}
|
||||
</span>
|
||||
<div class="h-px flex-1 bg-gray-200 dark:bg-dark-700"></div>
|
||||
</div>
|
||||
|
||||
<div :class="providerGridClass">
|
||||
<button
|
||||
v-for="provider in visibleProviders"
|
||||
:key="provider"
|
||||
type="button"
|
||||
:disabled="disabled"
|
||||
class="btn btn-secondary h-12 w-full justify-center gap-2"
|
||||
@click="startLogin(provider)"
|
||||
>
|
||||
<GitHubMark v-if="provider === 'github'" class="h-5 w-5 text-gray-800 dark:text-gray-100" />
|
||||
<GoogleMark v-else class="h-5 w-5" />
|
||||
<span class="font-medium">{{ providerLabel(provider) }}</span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { computed } from 'vue'
|
||||
import { useRoute } from 'vue-router'
|
||||
import { useI18n } from 'vue-i18n'
|
||||
import GitHubMark from './GitHubMark.vue'
|
||||
import GoogleMark from './GoogleMark.vue'
|
||||
import { resolveAffiliateReferralCode, storeOAuthAffiliateCode } from '@/utils/oauthAffiliate'
|
||||
|
||||
type EmailOAuthProvider = 'github' | 'google'
|
||||
|
||||
const props = withDefaults(defineProps<{
|
||||
disabled?: boolean
|
||||
affCode?: string
|
||||
githubEnabled?: boolean
|
||||
googleEnabled?: boolean
|
||||
showDivider?: boolean
|
||||
}>(), {
|
||||
showDivider: true
|
||||
})
|
||||
|
||||
const route = useRoute()
|
||||
const { t } = useI18n()
|
||||
|
||||
const visibleProviders = computed<EmailOAuthProvider[]>(() => {
|
||||
const providers: EmailOAuthProvider[] = []
|
||||
if (props.githubEnabled) providers.push('github')
|
||||
if (props.googleEnabled) providers.push('google')
|
||||
return providers
|
||||
})
|
||||
|
||||
const hasProviders = computed(() => visibleProviders.value.length > 0)
|
||||
const hasMultipleProviders = computed(() => visibleProviders.value.length > 1)
|
||||
const providerGridClass = computed(() => [
|
||||
'grid',
|
||||
'grid-cols-1',
|
||||
'gap-3',
|
||||
hasMultipleProviders.value ? 'sm:grid-cols-2' : ''
|
||||
])
|
||||
|
||||
function providerLabel(provider: EmailOAuthProvider): string {
|
||||
const name = provider === 'github' ? 'GitHub' : 'Google'
|
||||
return hasMultipleProviders.value ? name : t('auth.emailOAuth.signIn', { providerName: name })
|
||||
}
|
||||
|
||||
function startLogin(provider: EmailOAuthProvider): void {
|
||||
const redirectTo = (route.query.redirect as string) || '/dashboard'
|
||||
const affiliateCode = resolveAffiliateReferralCode(props.affCode, route.query.aff, route.query.aff_code)
|
||||
storeOAuthAffiliateCode(affiliateCode)
|
||||
const apiBase = (import.meta.env.VITE_API_BASE_URL as string | undefined) || '/api/v1'
|
||||
const normalized = apiBase.replace(/\/$/, '')
|
||||
const params = new URLSearchParams({ redirect: redirectTo })
|
||||
if (affiliateCode) {
|
||||
params.set('aff_code', affiliateCode)
|
||||
}
|
||||
const startURL = `${normalized}/auth/oauth/${provider}/start?${params.toString()}`
|
||||
window.location.href = startURL
|
||||
}
|
||||
</script>
|
||||
7
frontend/src/components/auth/GitHubMark.vue
Normal file
7
frontend/src/components/auth/GitHubMark.vue
Normal file
@@ -0,0 +1,7 @@
|
||||
<template>
|
||||
<svg viewBox="0 0 16 16" fill="currentColor" aria-hidden="true">
|
||||
<path
|
||||
d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82A7.61 7.61 0 0 1 8 3.86c.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.01 8.01 0 0 0 16 8c0-4.42-3.58-8-8-8Z"
|
||||
/>
|
||||
</svg>
|
||||
</template>
|
||||
8
frontend/src/components/auth/GoogleMark.vue
Normal file
8
frontend/src/components/auth/GoogleMark.vue
Normal file
@@ -0,0 +1,8 @@
|
||||
<template>
|
||||
<svg viewBox="0 0 24 24" aria-hidden="true">
|
||||
<path fill="#4285F4" d="M22.56 12.25c0-.78-.07-1.53-.2-2.25H12v4.26h5.92c-.26 1.37-1.04 2.53-2.21 3.31v2.77h3.57c2.08-1.92 3.28-4.74 3.28-8.09z" />
|
||||
<path fill="#34A853" d="M12 23c2.97 0 5.46-.98 7.28-2.66l-3.57-2.77c-.98.66-2.23 1.06-3.71 1.06-2.86 0-5.29-1.93-6.16-4.53H2.18v2.84C3.99 20.53 7.7 23 12 23z" />
|
||||
<path fill="#FBBC05" d="M5.84 14.1A6.61 6.61 0 0 1 5.5 12c0-.73.12-1.43.34-2.1V7.06H2.18A10.96 10.96 0 0 0 1 12c0 1.77.42 3.45 1.18 4.94l3.66-2.84z" />
|
||||
<path fill="#EA4335" d="M12 5.38c1.62 0 3.06.56 4.21 1.64l3.15-3.15C17.45 2.09 14.97 1 12 1 7.7 1 3.99 3.47 2.18 7.06L5.84 9.9C6.71 7.31 9.14 5.38 12 5.38z" />
|
||||
</svg>
|
||||
</template>
|
||||
102
frontend/src/components/auth/__tests__/EmailOAuthButtons.spec.ts
Normal file
102
frontend/src/components/auth/__tests__/EmailOAuthButtons.spec.ts
Normal file
@@ -0,0 +1,102 @@
|
||||
import { mount } from '@vue/test-utils'
|
||||
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
import EmailOAuthButtons from '@/components/auth/EmailOAuthButtons.vue'
|
||||
|
||||
const routeState = vi.hoisted(() => ({
|
||||
query: {} as Record<string, unknown>,
|
||||
}))
|
||||
|
||||
const locationState = vi.hoisted(() => ({
|
||||
current: { href: 'http://localhost/register?aff=AFF123' } as { href: string },
|
||||
}))
|
||||
|
||||
vi.mock('vue-router', () => ({
|
||||
useRoute: () => routeState,
|
||||
}))
|
||||
|
||||
vi.mock('vue-i18n', () => ({
|
||||
useI18n: () => ({
|
||||
t: (key: string, params?: Record<string, string>) => {
|
||||
if (key === 'auth.emailOAuth.signIn') {
|
||||
return `使用 ${params?.providerName ?? ''} 登录`
|
||||
}
|
||||
return key
|
||||
},
|
||||
}),
|
||||
}))
|
||||
|
||||
describe('EmailOAuthButtons', () => {
|
||||
beforeEach(() => {
|
||||
routeState.query = { redirect: '/billing?plan=pro', aff: 'AFF123' }
|
||||
locationState.current = { href: 'http://localhost/register?aff=AFF123' }
|
||||
Object.defineProperty(window, 'location', {
|
||||
configurable: true,
|
||||
value: locationState.current,
|
||||
})
|
||||
window.localStorage.clear()
|
||||
window.sessionStorage.clear()
|
||||
})
|
||||
|
||||
it('passes the affiliate code to the email oauth start URL', async () => {
|
||||
const wrapper = mount(EmailOAuthButtons, {
|
||||
props: {
|
||||
githubEnabled: true,
|
||||
googleEnabled: false,
|
||||
},
|
||||
global: {
|
||||
stubs: {
|
||||
GitHubMark: true,
|
||||
GoogleMark: true,
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
await wrapper.get('button').trigger('click')
|
||||
|
||||
expect(locationState.current.href).toBe(
|
||||
'/api/v1/auth/oauth/github/start?redirect=%2Fbilling%3Fplan%3Dpro&aff_code=AFF123'
|
||||
)
|
||||
expect(window.sessionStorage.getItem('oauth_aff_code')).toBe('AFF123')
|
||||
})
|
||||
|
||||
it('uses a full-width descriptive button when only GitHub is enabled', () => {
|
||||
const wrapper = mount(EmailOAuthButtons, {
|
||||
props: {
|
||||
githubEnabled: true,
|
||||
googleEnabled: false,
|
||||
},
|
||||
global: {
|
||||
stubs: {
|
||||
GitHubMark: true,
|
||||
GoogleMark: true,
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
expect(wrapper.find('.grid').classes()).not.toContain('sm:grid-cols-2')
|
||||
expect(wrapper.get('button').text()).toContain('使用 GitHub 登录')
|
||||
})
|
||||
|
||||
it('uses compact labels and two columns when GitHub and Google are both enabled', () => {
|
||||
const wrapper = mount(EmailOAuthButtons, {
|
||||
props: {
|
||||
githubEnabled: true,
|
||||
googleEnabled: true,
|
||||
},
|
||||
global: {
|
||||
stubs: {
|
||||
GitHubMark: true,
|
||||
GoogleMark: true,
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
expect(wrapper.find('.grid').classes()).toContain('sm:grid-cols-2')
|
||||
const buttons = wrapper.findAll('button')
|
||||
expect(buttons).toHaveLength(2)
|
||||
expect(buttons[0].text()).toContain('GitHub')
|
||||
expect(buttons[0].text()).not.toContain('使用 GitHub 登录')
|
||||
expect(buttons[1].text()).toContain('Google')
|
||||
expect(buttons[1].text()).not.toContain('使用 Google 登录')
|
||||
})
|
||||
})
|
||||
@@ -263,7 +263,9 @@ const providerLabels = computed<Record<UserAuthProvider, string>>(() => ({
|
||||
email: t('profile.authBindings.providers.email'),
|
||||
linuxdo: t('profile.authBindings.providers.linuxdo'),
|
||||
oidc: t('profile.authBindings.providers.oidc', { providerName: props.oidcProviderName }),
|
||||
wechat: t('profile.authBindings.providers.wechat')
|
||||
wechat: t('profile.authBindings.providers.wechat'),
|
||||
github: 'GitHub',
|
||||
google: 'Google'
|
||||
}))
|
||||
|
||||
function formatCurrency(value: number): string {
|
||||
@@ -272,7 +274,13 @@ function formatCurrency(value: number): string {
|
||||
|
||||
function normalizeProvider(value: string): UserAuthProvider | null {
|
||||
const normalized = value.trim().toLowerCase()
|
||||
if (normalized === 'email' || normalized === 'linuxdo' || normalized === 'wechat') {
|
||||
if (
|
||||
normalized === 'email' ||
|
||||
normalized === 'linuxdo' ||
|
||||
normalized === 'wechat' ||
|
||||
normalized === 'github' ||
|
||||
normalized === 'google'
|
||||
) {
|
||||
return normalized
|
||||
}
|
||||
if (normalized === 'oidc' || normalized.startsWith('oidc:') || normalized.startsWith('oidc/')) {
|
||||
|
||||
Reference in New Issue
Block a user