feat: 6-digit email verification code, fix missing script+route includes
This commit is contained in:
@@ -47,18 +47,17 @@ router.post('/register', validateLengths({
|
||||
}
|
||||
|
||||
const hashed = await bcrypt.hash(password, 10);
|
||||
const verifyToken = uuid();
|
||||
const verifyExpires = new Date(Date.now() + 24 * 3600 * 1000).toISOString().replace('T', ' ').slice(0, 19);
|
||||
const verifyCode = String(Math.floor(100000 + Math.random() * 900000));
|
||||
const verifyExpires = new Date(Date.now() + 30 * 60000).toISOString().replace('T', ' ').slice(0, 19);
|
||||
|
||||
await query(
|
||||
'INSERT INTO users(username, password, email, game_name, game_uid, active, email_verified, verify_token, verify_expires, source) VALUES (?,?,?,?,?,?,?,?,?,?)',
|
||||
[username, hashed, email, game_name, game_uid, 0, 0, verifyToken, verifyExpires, source || 'netease']
|
||||
[username, hashed, email, game_name, game_uid, 0, 0, verifyCode, verifyExpires, source || 'netease']
|
||||
);
|
||||
|
||||
const siteUrl = await getSiteUrl();
|
||||
const sent = await sendEmail(email, 'verify_email', {
|
||||
username, game_name, game_uid,
|
||||
verify_link: `${siteUrl}#/verify?token=${verifyToken}`,
|
||||
verify_link: verifyCode,
|
||||
});
|
||||
|
||||
if (!sent) {
|
||||
@@ -73,19 +72,16 @@ router.post('/register', validateLengths({
|
||||
}
|
||||
});
|
||||
|
||||
router.get('/verify-email', async (req, res) => {
|
||||
router.post('/verify-email', async (req, res) => {
|
||||
try {
|
||||
const { token } = req.query;
|
||||
if (!token) return res.status(400).json({ error: '无效的验证链接' });
|
||||
const { code } = req.body;
|
||||
if (!code) return res.status(400).json({ error: '请输入验证码' });
|
||||
|
||||
const user = await getRow('SELECT * FROM users WHERE verify_token = ? AND verify_expires > NOW()', [token]);
|
||||
if (!user) return res.status(400).json({ error: '验证链接无效或已过期' });
|
||||
const user = await getRow('SELECT * FROM users WHERE verify_token = ? AND verify_expires > NOW()', [code]);
|
||||
if (!user) return res.status(400).json({ error: '验证码无效或已过期' });
|
||||
|
||||
await query('UPDATE users SET email_verified = 1, active = 1, verify_token = NULL, verify_expires = NULL WHERE id = ?', [user.id]);
|
||||
await query(
|
||||
'INSERT INTO audit_logs(user_id, username, action, entity_type, entity_id, details) VALUES (?,?,?,?,?,?)',
|
||||
[user.id, user.username, 'verify_email', 'user', user.id, '邮箱验证通过']
|
||||
);
|
||||
await query('INSERT INTO audit_logs(user_id, username, action, entity_type, entity_id, details) VALUES (?,?,?,?,?,?)', [user.id, user.username, 'verify_email', 'user', user.id, '邮箱验证通过']);
|
||||
|
||||
res.json({ message: '邮箱验证成功,现在可以登录了' });
|
||||
} catch (err) {
|
||||
@@ -93,6 +89,7 @@ router.get('/verify-email', async (req, res) => {
|
||||
res.status(500).json({ error: '服务器内部错误' });
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
router.post('/login', async (req, res) => {
|
||||
try {
|
||||
|
||||
Reference in New Issue
Block a user