Files
NightSpire/web-next/lib/change-email.ts
T
Inna c255724ebf Aceptar el correo en MAYÚSCULAS y mostrar las cuentas como WOW1, no 17#1
Dos fallos que se juntaban justo en «recuperar nombre de cuenta»:

- La validación de Gmail era sensible a mayúsculas (`/@gmail\.com$/` sin la `i`),
  así que NOVAWOW86@GMAIL.COM se rechazaba con invalidEmail. Y desde que los
  correos muestran la cuenta en MAYÚSCULAS, quien la copiara de ahí y la pegara
  no podía recuperar la cuenta, ni registrarse, ni cambiar el correo: la misma
  regex estaba repetida en register/change-email/recover. Ahora es una sola, con
  la `i`, en lib/bnet.ts (junto a normalizeEmail). El dominio de un correo NO
  distingue mayúsculas.

- Los correos enseñaban el username interno («17#1»), que no le dice nada a
  nadie, en vez del nombre visible («WOW1»). Afectaba a DOS plantillas: la de
  nombres de cuenta y la de la lista de tokens. La conversión existía, pero como
  helper local de my-account; sube a lib/bnet.ts como `gameAccountDisplayName`
  (el inverso de `makeGameAccountUsername`) y la aplican las propias plantillas,
  para que ningún sitio que las use pueda olvidarse.

Verificado: la regex acepta las 3 variantes de caja y sigue rechazando no-Gmail;
los dos correos renderizados muestran «Cuenta: WOW1 / WOW2».

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-07-15 18:53:09 +00:00

104 lines
4.1 KiB
TypeScript

import crypto from 'node:crypto'
import type { RowDataPacket, ResultSetHeader } from 'mysql2'
import { db, DB } from './db'
import { authenticate } from './auth'
import { bnetMakeRegistration, normalizeEmail, GMAIL_RE } from './bnet'
import { checkSecurityToken } from './security-token'
import { sendMail } from './mail'
import { confirmNewEmailHtml, confirmOldEmailHtml } from './emails'
import type { SessionData } from './session'
export interface Result {
success: boolean
error?: string
}
export async function requestEmailChange(
session: SessionData,
curPassword: string,
curEmail: string,
newEmail: string,
confEmail: string,
token: string,
): Promise<Result> {
const current = session.bnetEmail ?? '' // ya normalizado (MAYÚS)
const userId = session.accountId ?? 0
if (!curPassword || !curEmail || !newEmail || !confEmail || !token) return { success: false, error: 'missingFields' }
if (normalizeEmail(curEmail) !== current) return { success: false, error: 'wrongCurrentEmail' }
if (newEmail !== confEmail || !GMAIL_RE.test(newEmail)) return { success: false, error: 'invalidEmail' }
if (!(await checkSecurityToken(userId, token))) return { success: false, error: 'invalidToken' }
if (!(await authenticate(current, curPassword))) return { success: false, error: 'wrongCurrentPassword' }
const oldHash = crypto.randomBytes(16).toString('hex')
const newHash = crypto.randomBytes(16).toString('hex')
await db(DB.default).query(
'INSERT INTO accountactivation (username, email, old_email, password, recruiter_id, hash, old_email_hash, is_used, is_new_email_used, created_at) ' +
'VALUES (?, ?, ?, ?, ?, ?, ?, 0, 0, NOW())',
[session.username ?? null, newEmail, current, curPassword, userId, newHash, oldHash],
)
const site = process.env.SITE_URL || ''
const link = `${site}/confirm-old-email?hash=${oldHash}`
await sendMail(
current,
`Confirma el cambio de correo - NightSpire`,
confirmOldEmailHtml(session.username ?? current, newEmail, link),
)
return { success: true }
}
export async function confirmOldEmail(hash: string): Promise<Result> {
const [rows] = await db(DB.default).query<RowDataPacket[]>(
'SELECT id, email, hash, username FROM accountactivation WHERE old_email_hash = ? AND is_used = 0',
[hash],
)
const act = rows[0]
if (!act) return { success: false, error: 'invalidLink' }
await db(DB.default).query('UPDATE accountactivation SET is_used = 1 WHERE id = ?', [act.id])
const site = process.env.SITE_URL || ''
const link = `${site}/confirm-new-email?hash=${act.hash}`
await sendMail(
act.email,
`Confirma tu nuevo correo - NightSpire`,
confirmNewEmailHtml(act.username ?? act.email, link),
)
return { success: true }
}
export async function confirmNewEmail(hash: string): Promise<Result> {
const [rows] = await db(DB.default).query<RowDataPacket[]>(
'SELECT id, email, old_email, password FROM accountactivation WHERE hash = ? AND is_new_email_used = 0 AND old_email IS NOT NULL',
[hash],
)
const act = rows[0]
if (!act) return { success: false, error: 'invalidLink' }
await db(DB.default).query('UPDATE accountactivation SET is_new_email_used = 1 WHERE id = ?', [act.id])
const newNorm = normalizeEmail(act.email)
const oldNorm = normalizeEmail(act.old_email || '')
try {
const reg = bnetMakeRegistration(newNorm, act.password)
const [bnetRows] = await db(DB.auth).query<RowDataPacket[]>(
'SELECT id FROM battlenet_accounts WHERE email = ?',
[oldNorm],
)
if (!bnetRows[0]) return { success: false, error: 'accountNotFound' }
const bnetId = bnetRows[0].id
await db(DB.auth).query<ResultSetHeader>(
'UPDATE battlenet_accounts SET email = ?, srp_version = ?, salt = ?, verifier = ? WHERE id = ?',
[newNorm, reg.srpVersion, reg.salt, reg.verifier, bnetId],
)
await db(DB.auth).query('UPDATE account SET email = ?, reg_mail = ? WHERE battlenet_account = ?', [
newNorm,
newNorm,
bnetId,
])
} catch {
return { success: false, error: 'genericError' }
}
await db(DB.default).query('DELETE FROM accountactivation WHERE id = ?', [act.id])
return { success: true }
}