fix: tighten pending oauth email routing and binding state
This commit is contained in:
@@ -179,6 +179,8 @@ import { useAuthStore, useAppStore } from '@/stores'
|
||||
import {
|
||||
persistOAuthTokenContext,
|
||||
getPublicSettings,
|
||||
isOAuthLoginCompletion,
|
||||
type PendingOAuthSendVerifyCodeResponse,
|
||||
sendPendingOAuthVerifyCode,
|
||||
sendVerifyCode,
|
||||
} from '@/api/auth'
|
||||
@@ -216,10 +218,13 @@ type PendingAuthSessionSummary = {
|
||||
redirect?: string
|
||||
}
|
||||
type PendingOAuthCreateAccountResponse = {
|
||||
auth_result?: string
|
||||
access_token: string
|
||||
refresh_token?: string
|
||||
expires_in?: number
|
||||
token_type?: string
|
||||
provider?: string
|
||||
redirect?: string
|
||||
}
|
||||
|
||||
const email = ref<string>('')
|
||||
@@ -353,6 +358,46 @@ function onTurnstileError(): void {
|
||||
errors.value.turnstile = t('auth.turnstileFailed')
|
||||
}
|
||||
|
||||
function isPendingOAuthFlow(): boolean {
|
||||
return Boolean(pendingProvider.value.trim())
|
||||
}
|
||||
|
||||
function shouldBypassRegistrationEmailPolicy(): boolean {
|
||||
return isPendingOAuthFlow() || Boolean(pendingAuthToken.value.trim())
|
||||
}
|
||||
|
||||
function resolvePendingOAuthCallbackRoute(provider: string): string {
|
||||
switch (provider.trim().toLowerCase()) {
|
||||
case 'linuxdo':
|
||||
return '/auth/linuxdo/callback'
|
||||
case 'oidc':
|
||||
return '/auth/oidc/callback'
|
||||
case 'wechat':
|
||||
return '/auth/wechat/callback'
|
||||
default:
|
||||
return '/auth/callback'
|
||||
}
|
||||
}
|
||||
|
||||
function isPendingOAuthSessionResponse(data: PendingOAuthCreateAccountResponse): boolean {
|
||||
return data.auth_result === 'pending_session'
|
||||
}
|
||||
|
||||
function getPendingOAuthSendCodeSessionResponse(
|
||||
data: PendingOAuthSendVerifyCodeResponse,
|
||||
): PendingOAuthSendVerifyCodeResponse | null {
|
||||
return data.auth_result === 'pending_session' ? data : null
|
||||
}
|
||||
|
||||
function persistPendingOAuthSession(provider: string, redirect?: string): void {
|
||||
authStore.setPendingAuthSession({
|
||||
token: pendingAuthToken.value,
|
||||
token_field: pendingAuthTokenField.value,
|
||||
provider: provider.trim() || pendingProvider.value.trim(),
|
||||
redirect: redirect || pendingRedirect.value || undefined,
|
||||
})
|
||||
}
|
||||
|
||||
// ==================== Send Code ====================
|
||||
|
||||
async function sendCode(): Promise<void> {
|
||||
@@ -360,7 +405,7 @@ async function sendCode(): Promise<void> {
|
||||
errorMessage.value = ''
|
||||
|
||||
try {
|
||||
if (!pendingAuthToken.value && !isRegistrationEmailSuffixAllowed(email.value, registrationEmailSuffixWhitelist.value)) {
|
||||
if (!shouldBypassRegistrationEmailPolicy() && !isRegistrationEmailSuffixAllowed(email.value, registrationEmailSuffixWhitelist.value)) {
|
||||
errorMessage.value = buildEmailSuffixNotAllowedMessage()
|
||||
appStore.showError(errorMessage.value)
|
||||
return
|
||||
@@ -372,10 +417,25 @@ async function sendCode(): Promise<void> {
|
||||
// 优先使用重发时新获取的 token(因为初始 token 可能已被使用)
|
||||
turnstile_token: resendTurnstileToken.value || initialTurnstileToken.value || undefined
|
||||
} as Parameters<typeof sendVerifyCode>[0]
|
||||
const response = pendingAuthToken.value
|
||||
const response = isPendingOAuthFlow()
|
||||
? await sendPendingOAuthVerifyCode(requestPayload)
|
||||
: await sendVerifyCode(requestPayload)
|
||||
|
||||
const pendingSendCodeSession = isPendingOAuthFlow()
|
||||
? getPendingOAuthSendCodeSessionResponse(response as PendingOAuthSendVerifyCodeResponse)
|
||||
: null
|
||||
if (pendingSendCodeSession) {
|
||||
sessionStorage.removeItem('register_data')
|
||||
persistPendingOAuthSession(
|
||||
pendingSendCodeSession.provider || pendingProvider.value,
|
||||
pendingSendCodeSession.redirect,
|
||||
)
|
||||
await router.push(
|
||||
resolvePendingOAuthCallbackRoute(pendingSendCodeSession.provider || pendingProvider.value),
|
||||
)
|
||||
return
|
||||
}
|
||||
|
||||
codeSent.value = true
|
||||
startCountdown(response.countdown)
|
||||
|
||||
@@ -438,13 +498,13 @@ async function handleVerify(): Promise<void> {
|
||||
isLoading.value = true
|
||||
|
||||
try {
|
||||
if (!isRegistrationEmailSuffixAllowed(email.value, registrationEmailSuffixWhitelist.value)) {
|
||||
if (!shouldBypassRegistrationEmailPolicy() && !isRegistrationEmailSuffixAllowed(email.value, registrationEmailSuffixWhitelist.value)) {
|
||||
errorMessage.value = buildEmailSuffixNotAllowedMessage()
|
||||
appStore.showError(errorMessage.value)
|
||||
return
|
||||
}
|
||||
|
||||
if (pendingProvider.value) {
|
||||
if (isPendingOAuthFlow()) {
|
||||
const { data } = await apiClient.post<PendingOAuthCreateAccountResponse>(
|
||||
'/auth/oauth/pending/create-account',
|
||||
{
|
||||
@@ -456,6 +516,16 @@ async function handleVerify(): Promise<void> {
|
||||
adopt_avatar: pendingAdoptionDecision.value?.adoptAvatar
|
||||
}
|
||||
)
|
||||
if (isPendingOAuthSessionResponse(data)) {
|
||||
sessionStorage.removeItem('register_data')
|
||||
persistPendingOAuthSession(data.provider || pendingProvider.value, data.redirect)
|
||||
await router.push(resolvePendingOAuthCallbackRoute(data.provider || pendingProvider.value))
|
||||
return
|
||||
}
|
||||
if (!isOAuthLoginCompletion(data)) {
|
||||
throw new Error(t('auth.verifyFailed'))
|
||||
}
|
||||
|
||||
persistOAuthTokenContext(data)
|
||||
await authStore.setToken(data.access_token)
|
||||
authStore.clearPendingAuthSession?.()
|
||||
|
||||
Reference in New Issue
Block a user