mirror of
https://github.com/NoFxAiOS/nofx.git
synced 2026-07-11 06:46:59 +08:00
d3cbc023cc
修复密码验证UI组件与验证逻辑之间的特殊字符不一致问题。 问题描述: - PasswordChecklist组件默认接受所有特殊字符（如^_-~等） - 实际验证函数isStrongPassword()仅接受@#$%!&*?共8个特殊字符 - 导致用户输入包含其他特殊字符时，UI显示绿色勾选但注册按钮仍禁用 修改内容: - 在RegisterPage.tsx的PasswordChecklist组件添加specialCharsRegex属性 - 限制特殊字符为/[@#$%!&*?]/，与isStrongPassword()保持一致 影响范围: - 仅影响注册页面的密码验证UI显示 - 不影响后端验证逻辑 - 提升用户体验，避免误导性的UI反馈 Closes #859 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-authored-by: Claude <noreply@anthropic.com>
567 lines
21 KiB
TypeScript
567 lines
21 KiB
TypeScript
import React, { useState, useEffect } from 'react'
|
||
import { useAuth } from '../contexts/AuthContext'
|
||
import { useLanguage } from '../contexts/LanguageContext'
|
||
import { t } from '../i18n/translations'
|
||
import { getSystemConfig } from '../lib/config'
|
||
import HeaderBar from './landing/HeaderBar'
|
||
import { Eye, EyeOff } from 'lucide-react'
|
||
import { Input } from './ui/input'
|
||
import PasswordChecklist from 'react-password-checklist'
|
||
|
||
export function RegisterPage() {
|
||
const { language } = useLanguage()
|
||
const { register, completeRegistration } = useAuth()
|
||
const [step, setStep] = useState<'register' | 'setup-otp' | 'verify-otp'>(
|
||
'register'
|
||
)
|
||
const [email, setEmail] = useState('')
|
||
const [password, setPassword] = useState('')
|
||
const [confirmPassword, setConfirmPassword] = useState('')
|
||
const [betaCode, setBetaCode] = useState('')
|
||
const [betaMode, setBetaMode] = useState(false)
|
||
const [otpCode, setOtpCode] = useState('')
|
||
const [userID, setUserID] = useState('')
|
||
const [otpSecret, setOtpSecret] = useState('')
|
||
const [qrCodeURL, setQrCodeURL] = useState('')
|
||
const [error, setError] = useState('')
|
||
const [loading, setLoading] = useState(false)
|
||
const [passwordValid, setPasswordValid] = useState(false)
|
||
const [showPassword, setShowPassword] = useState(false)
|
||
const [showConfirmPassword, setShowConfirmPassword] = useState(false)
|
||
|
||
useEffect(() => {
|
||
// 获取系统配置，检查是否开启内测模式
|
||
getSystemConfig()
|
||
.then((config) => {
|
||
setBetaMode(config.beta_mode || false)
|
||
})
|
||
.catch((err) => {
|
||
console.error('Failed to fetch system config:', err)
|
||
})
|
||
}, [])
|
||
|
||
const handleRegister = async (e: React.FormEvent) => {
|
||
e.preventDefault()
|
||
setError('')
|
||
|
||
// 客户端强校验：长度>=8，包含大小写、数字、特殊字符，且两次一致
|
||
const strong = isStrongPassword(password)
|
||
if (!strong || password !== confirmPassword) {
|
||
setError(t('passwordNotMeetRequirements', language))
|
||
return
|
||
}
|
||
|
||
if (betaMode && !betaCode.trim()) {
|
||
setError('内测期间，注册需要提供内测码')
|
||
return
|
||
}
|
||
|
||
setLoading(true)
|
||
|
||
const result = await register(email, password, betaCode.trim() || undefined)
|
||
|
||
if (result.success && result.userID) {
|
||
setUserID(result.userID)
|
||
setOtpSecret(result.otpSecret || '')
|
||
setQrCodeURL(result.qrCodeURL || '')
|
||
setStep('setup-otp')
|
||
} else {
|
||
setError(result.message || t('registrationFailed', language))
|
||
}
|
||
|
||
setLoading(false)
|
||
}
|
||
|
||
const handleSetupComplete = () => {
|
||
setStep('verify-otp')
|
||
}
|
||
|
||
const handleOTPVerify = async (e: React.FormEvent) => {
|
||
e.preventDefault()
|
||
setError('')
|
||
setLoading(true)
|
||
|
||
const result = await completeRegistration(userID, otpCode)
|
||
|
||
if (!result.success) {
|
||
setError(result.message || t('registrationFailed', language))
|
||
}
|
||
// 成功的话AuthContext会自动处理登录状态
|
||
|
||
setLoading(false)
|
||
}
|
||
|
||
const copyToClipboard = (text: string) => {
|
||
navigator.clipboard.writeText(text)
|
||
}
|
||
|
||
return (
|
||
<div className="min-h-screen" style={{ background: 'var(--brand-black)' }}>
|
||
<HeaderBar
|
||
isLoggedIn={false}
|
||
isHomePage={false}
|
||
currentPage="register"
|
||
language={language}
|
||
onLanguageChange={() => {}}
|
||
onPageChange={(page) => {
|
||
console.log('RegisterPage onPageChange called with:', page)
|
||
if (page === 'competition') {
|
||
window.location.href = '/competition'
|
||
}
|
||
}}
|
||
/>
|
||
|
||
<div
|
||
className="flex items-center justify-center pt-20"
|
||
style={{ minHeight: 'calc(100vh - 80px)' }}
|
||
>
|
||
<div className="w-full max-w-md">
|
||
{/* Logo */}
|
||
<div className="text-center mb-8">
|
||
<div className="w-16 h-16 mx-auto mb-4 flex items-center justify-center">
|
||
<img
|
||
src="/icons/nofx.svg"
|
||
alt="NoFx Logo"
|
||
className="w-16 h-16 object-contain"
|
||
/>
|
||
</div>
|
||
<h1 className="text-2xl font-bold" style={{ color: '#EAECEF' }}>
|
||
{t('appTitle', language)}
|
||
</h1>
|
||
<p className="text-sm mt-2" style={{ color: '#848E9C' }}>
|
||
{step === 'register' && t('registerTitle', language)}
|
||
{step === 'setup-otp' && t('setupTwoFactor', language)}
|
||
{step === 'verify-otp' && t('verifyOTP', language)}
|
||
</p>
|
||
</div>
|
||
|
||
{/* Registration Form */}
|
||
<div
|
||
className="rounded-lg p-6"
|
||
style={{
|
||
background: 'var(--panel-bg)',
|
||
border: '1px solid var(--panel-border)',
|
||
}}
|
||
>
|
||
{step === 'register' && (
|
||
<form onSubmit={handleRegister} className="space-y-4">
|
||
<div>
|
||
<label
|
||
className="block text-sm font-semibold mb-2"
|
||
style={{ color: 'var(--brand-light-gray)' }}
|
||
>
|
||
{t('email', language)}
|
||
</label>
|
||
<Input
|
||
type="email"
|
||
value={email}
|
||
onChange={(e) => setEmail(e.target.value)}
|
||
placeholder={t('emailPlaceholder', language)}
|
||
required
|
||
/>
|
||
</div>
|
||
|
||
<div>
|
||
<label
|
||
className="block text-sm font-semibold mb-2"
|
||
style={{ color: 'var(--brand-light-gray)' }}
|
||
>
|
||
{t('password', language)}
|
||
</label>
|
||
<div className="relative">
|
||
<Input
|
||
type={showPassword ? 'text' : 'password'}
|
||
value={password}
|
||
onChange={(e) => setPassword(e.target.value)}
|
||
className="pr-10"
|
||
placeholder={t('passwordPlaceholder', language)}
|
||
required
|
||
/>
|
||
<button
|
||
type="button"
|
||
aria-label={showPassword ? '隐藏密码' : '显示密码'}
|
||
onMouseDown={(e) => e.preventDefault()}
|
||
onClick={() => setShowPassword((v) => !v)}
|
||
className="absolute inset-y-0 right-2 w-8 h-10 flex items-center justify-center rounded bg-transparent p-0 m-0 border-0 outline-none focus:outline-none focus:ring-0 appearance-none cursor-pointer btn-icon"
|
||
style={{ color: 'var(--text-secondary)' }}
|
||
>
|
||
{showPassword ? <EyeOff size={18} /> : <Eye size={18} />}
|
||
</button>
|
||
</div>
|
||
</div>
|
||
|
||
<div>
|
||
<label
|
||
className="block text-sm font-semibold mb-2"
|
||
style={{ color: 'var(--brand-light-gray)' }}
|
||
>
|
||
{t('confirmPassword', language)}
|
||
</label>
|
||
<div className="relative">
|
||
<Input
|
||
type={showConfirmPassword ? 'text' : 'password'}
|
||
value={confirmPassword}
|
||
onChange={(e) => setConfirmPassword(e.target.value)}
|
||
className="pr-10"
|
||
placeholder={t('confirmPasswordPlaceholder', language)}
|
||
required
|
||
/>
|
||
<button
|
||
type="button"
|
||
aria-label={showConfirmPassword ? '隐藏密码' : '显示密码'}
|
||
onMouseDown={(e) => e.preventDefault()}
|
||
onClick={() => setShowConfirmPassword((v) => !v)}
|
||
className="absolute inset-y-0 right-2 w-8 h-10 flex items-center justify-center rounded bg-transparent p-0 m-0 border-0 outline-none focus:outline-none focus:ring-0 appearance-none cursor-pointer btn-icon"
|
||
style={{ color: 'var(--text-secondary)' }}
|
||
>
|
||
{showConfirmPassword ? (
|
||
<EyeOff size={18} />
|
||
) : (
|
||
<Eye size={18} />
|
||
)}
|
||
</button>
|
||
</div>
|
||
</div>
|
||
|
||
{/* 密码规则清单（通过才允许提交） */}
|
||
<div
|
||
className="mt-1 text-xs"
|
||
style={{ color: 'var(--text-secondary)' }}
|
||
>
|
||
<div
|
||
className="mb-1"
|
||
style={{ color: 'var(--brand-light-gray)' }}
|
||
>
|
||
{t('passwordRequirements', language)}
|
||
</div>
|
||
<PasswordChecklist
|
||
rules={[
|
||
'minLength',
|
||
'capital',
|
||
'lowercase',
|
||
'number',
|
||
'specialChar',
|
||
'match',
|
||
]}
|
||
minLength={8}
|
||
specialCharsRegex={/[@#$%!&*?]/}
|
||
value={password}
|
||
valueAgain={confirmPassword}
|
||
messages={{
|
||
minLength: t('passwordRuleMinLength', language),
|
||
capital: t('passwordRuleUppercase', language),
|
||
lowercase: t('passwordRuleLowercase', language),
|
||
number: t('passwordRuleNumber', language),
|
||
specialChar: t('passwordRuleSpecial', language),
|
||
match: t('passwordRuleMatch', language),
|
||
}}
|
||
className="space-y-1"
|
||
onChange={(isValid) => setPasswordValid(isValid)}
|
||
/>
|
||
</div>
|
||
|
||
{betaMode && (
|
||
<div>
|
||
<label
|
||
className="block text-sm font-semibold mb-2"
|
||
style={{ color: '#EAECEF' }}
|
||
>
|
||
内测码 *
|
||
</label>
|
||
<input
|
||
type="text"
|
||
value={betaCode}
|
||
onChange={(e) =>
|
||
setBetaCode(
|
||
e.target.value
|
||
.replace(/[^a-z0-9]/gi, '')
|
||
.toLowerCase()
|
||
)
|
||
}
|
||
className="w-full px-3 py-2 rounded font-mono"
|
||
style={{
|
||
background: '#0B0E11',
|
||
border: '1px solid #2B3139',
|
||
color: '#EAECEF',
|
||
}}
|
||
placeholder="请输入6位内测码"
|
||
maxLength={6}
|
||
required={betaMode}
|
||
/>
|
||
<p className="text-xs mt-1" style={{ color: '#848E9C' }}>
|
||
内测码由6位字母数字组成，区分大小写
|
||
</p>
|
||
</div>
|
||
)}
|
||
|
||
{error && (
|
||
<div
|
||
className="text-sm px-3 py-2 rounded"
|
||
style={{
|
||
background: 'var(--binance-red-bg)',
|
||
color: 'var(--binance-red)',
|
||
}}
|
||
>
|
||
{error}
|
||
</div>
|
||
)}
|
||
|
||
<button
|
||
type="submit"
|
||
disabled={
|
||
loading || (betaMode && !betaCode.trim()) || !passwordValid
|
||
}
|
||
className="w-full px-4 py-2 rounded text-sm font-semibold transition-all hover:scale-105 disabled:opacity-50"
|
||
style={{
|
||
background: 'var(--brand-yellow)',
|
||
color: 'var(--brand-black)',
|
||
}}
|
||
>
|
||
{loading
|
||
? t('loading', language)
|
||
: t('registerButton', language)}
|
||
</button>
|
||
</form>
|
||
)}
|
||
|
||
{step === 'setup-otp' && (
|
||
<div className="space-y-4">
|
||
<div className="text-center">
|
||
<div className="text-4xl mb-2">📱</div>
|
||
<h3
|
||
className="text-lg font-semibold mb-2"
|
||
style={{ color: '#EAECEF' }}
|
||
>
|
||
{t('setupTwoFactor', language)}
|
||
</h3>
|
||
<p className="text-sm" style={{ color: '#848E9C' }}>
|
||
{t('setupTwoFactorDesc', language)}
|
||
</p>
|
||
</div>
|
||
|
||
<div className="space-y-3">
|
||
<div
|
||
className="p-3 rounded"
|
||
style={{
|
||
background: 'var(--brand-black)',
|
||
border: '1px solid var(--panel-border)',
|
||
}}
|
||
>
|
||
<p
|
||
className="text-sm font-semibold mb-2"
|
||
style={{ color: 'var(--brand-light-gray)' }}
|
||
>
|
||
{t('authStep1Title', language)}
|
||
</p>
|
||
<p
|
||
className="text-xs"
|
||
style={{ color: 'var(--text-secondary)' }}
|
||
>
|
||
{t('authStep1Desc', language)}
|
||
</p>
|
||
</div>
|
||
|
||
<div
|
||
className="p-3 rounded"
|
||
style={{
|
||
background: 'var(--brand-black)',
|
||
border: '1px solid var(--panel-border)',
|
||
}}
|
||
>
|
||
<p
|
||
className="text-sm font-semibold mb-2"
|
||
style={{ color: 'var(--brand-light-gray)' }}
|
||
>
|
||
{t('authStep2Title', language)}
|
||
</p>
|
||
<p className="text-xs mb-2" style={{ color: '#848E9C' }}>
|
||
{t('authStep2Desc', language)}
|
||
</p>
|
||
|
||
{qrCodeURL && (
|
||
<div className="mt-2">
|
||
<p
|
||
className="text-xs mb-2"
|
||
style={{ color: '#848E9C' }}
|
||
>
|
||
{t('qrCodeHint', language)}
|
||
</p>
|
||
<div className="bg-white p-2 rounded text-center">
|
||
<img
|
||
src={`https://api.qrserver.com/v1/create-qr-code/?size=150x150&data=${encodeURIComponent(qrCodeURL)}`}
|
||
alt="QR Code"
|
||
className="mx-auto"
|
||
/>
|
||
</div>
|
||
</div>
|
||
)}
|
||
|
||
<div className="mt-2">
|
||
<p className="text-xs mb-1" style={{ color: '#848E9C' }}>
|
||
{t('otpSecret', language)}
|
||
</p>
|
||
<div className="flex items-center gap-2">
|
||
<code
|
||
className="flex-1 px-2 py-1 text-xs rounded font-mono"
|
||
style={{
|
||
background: 'var(--panel-bg-hover)',
|
||
color: 'var(--brand-light-gray)',
|
||
}}
|
||
>
|
||
{otpSecret}
|
||
</code>
|
||
<button
|
||
onClick={() => copyToClipboard(otpSecret)}
|
||
className="px-2 py-1 text-xs rounded"
|
||
style={{
|
||
background: 'var(--brand-yellow)',
|
||
color: 'var(--brand-black)',
|
||
}}
|
||
>
|
||
{t('copy', language)}
|
||
</button>
|
||
</div>
|
||
</div>
|
||
</div>
|
||
|
||
<div
|
||
className="p-3 rounded"
|
||
style={{
|
||
background: 'var(--brand-black)',
|
||
border: '1px solid var(--panel-border)',
|
||
}}
|
||
>
|
||
<p
|
||
className="text-sm font-semibold mb-2"
|
||
style={{ color: 'var(--brand-light-gray)' }}
|
||
>
|
||
{t('authStep3Title', language)}
|
||
</p>
|
||
<p
|
||
className="text-xs"
|
||
style={{ color: 'var(--text-secondary)' }}
|
||
>
|
||
{t('authStep3Desc', language)}
|
||
</p>
|
||
</div>
|
||
</div>
|
||
|
||
<button
|
||
onClick={handleSetupComplete}
|
||
className="w-full px-4 py-2 rounded text-sm font-semibold transition-all hover:scale-105"
|
||
style={{ background: '#F0B90B', color: '#000' }}
|
||
>
|
||
{t('setupCompleteContinue', language)}
|
||
</button>
|
||
</div>
|
||
)}
|
||
|
||
{step === 'verify-otp' && (
|
||
<form onSubmit={handleOTPVerify} className="space-y-4">
|
||
<div className="text-center mb-4">
|
||
<div className="text-4xl mb-2">🔐</div>
|
||
<p className="text-sm" style={{ color: '#848E9C' }}>
|
||
{t('enterOTPCode', language)}
|
||
<br />
|
||
{t('completeRegistrationSubtitle', language)}
|
||
</p>
|
||
</div>
|
||
|
||
<div>
|
||
<label
|
||
className="block text-sm font-semibold mb-2"
|
||
style={{ color: 'var(--brand-light-gray)' }}
|
||
>
|
||
{t('otpCode', language)}
|
||
</label>
|
||
<input
|
||
type="text"
|
||
value={otpCode}
|
||
onChange={(e) =>
|
||
setOtpCode(e.target.value.replace(/\D/g, '').slice(0, 6))
|
||
}
|
||
className="w-full px-3 py-2 rounded text-center text-2xl font-mono"
|
||
style={{
|
||
background: 'var(--brand-black)',
|
||
border: '1px solid var(--panel-border)',
|
||
color: 'var(--brand-light-gray)',
|
||
}}
|
||
placeholder={t('otpPlaceholder', language)}
|
||
maxLength={6}
|
||
required
|
||
/>
|
||
</div>
|
||
|
||
{error && (
|
||
<div
|
||
className="text-sm px-3 py-2 rounded"
|
||
style={{
|
||
background: 'var(--binance-red-bg)',
|
||
color: 'var(--binance-red)',
|
||
}}
|
||
>
|
||
{error}
|
||
</div>
|
||
)}
|
||
|
||
<div className="flex gap-3">
|
||
<button
|
||
type="button"
|
||
onClick={() => setStep('setup-otp')}
|
||
className="flex-1 px-4 py-2 rounded text-sm font-semibold"
|
||
style={{
|
||
background: 'var(--panel-bg-hover)',
|
||
color: 'var(--text-secondary)',
|
||
}}
|
||
>
|
||
{t('back', language)}
|
||
</button>
|
||
<button
|
||
type="submit"
|
||
disabled={loading || otpCode.length !== 6}
|
||
className="flex-1 px-4 py-2 rounded text-sm font-semibold transition-all hover:scale-105 disabled:opacity-50"
|
||
style={{ background: '#F0B90B', color: '#000' }}
|
||
>
|
||
{loading
|
||
? t('loading', language)
|
||
: t('completeRegistration', language)}
|
||
</button>
|
||
</div>
|
||
</form>
|
||
)}
|
||
</div>
|
||
|
||
{/* Login Link */}
|
||
{step === 'register' && (
|
||
<div className="text-center mt-6">
|
||
<p className="text-sm" style={{ color: 'var(--text-secondary)' }}>
|
||
已有账户？{' '}
|
||
<button
|
||
onClick={() => {
|
||
window.history.pushState({}, '', '/login')
|
||
window.dispatchEvent(new PopStateEvent('popstate'))
|
||
}}
|
||
className="font-semibold hover:underline transition-colors"
|
||
style={{ color: 'var(--brand-yellow)' }}
|
||
>
|
||
立即登录
|
||
</button>
|
||
</p>
|
||
</div>
|
||
)}
|
||
</div>
|
||
</div>
|
||
</div>
|
||
)
|
||
}
|
||
|
||
// 本地密码强度校验（与 UI 规则一致）
|
||
function isStrongPassword(pwd: string): boolean {
|
||
if (!pwd || pwd.length < 8) return false
|
||
const hasUpper = /[A-Z]/.test(pwd)
|
||
const hasLower = /[a-z]/.test(pwd)
|
||
const hasNumber = /\d/.test(pwd)
|
||
const hasSpecial = /[@#$%!&*?]/.test(pwd)
|
||
return hasUpper && hasLower && hasNumber && hasSpecial
|
||
}
|