Skip to content

fix(auth): Account signup email used in change 2fa endpoint #19552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vpomerleau merged 1 commit into from
Oct 8, 2025
Merged

fix(auth): Account signup email used in change 2fa endpoint #19552

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 5 additions & 17 deletions packages/fxa-auth-server/lib/routes/totp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1023,21 +1023,15 @@ module.exports = (
handler: async function (request) {
log.begin('totp.replace.create', request);

const { uid } = request.auth.credentials;
const account = await db.account(uid);
const { uid, email } = request.auth.credentials;

const { tokenVerified, tokenVerificationId } =
request.auth.credentials || {};
if (tokenVerificationId || tokenVerified === false) {
throw errors.unverifiedSession();
}

await customs.checkAuthenticated(
request,
uid,
account.email,
'totpCreate'
);
await customs.checkAuthenticated(request, uid, email, 'totpCreate');

// the opposite of `/totp/create` this requires that the user already has
// a verified TOTP token to be replaced.
Expand Down Expand Up @@ -1082,7 +1076,7 @@ module.exports = (
log.info('totpToken.replace.created', { uid });
await request.emitMetricsEvent('totpToken.replace.created', { uid });

const otpauth = authenticator.keyuri(account.email, service, secret);
const otpauth = authenticator.keyuri(email, service, secret);

const qrCodeUrl = await qrcode.toDataURL(otpauth, qrCodeOptions);

Expand Down Expand Up @@ -1152,21 +1146,15 @@ module.exports = (
log.begin('totp.replace.confirm', request);

const code = request.payload.code;
const { uid } = request.auth.credentials;
const account = await db.account(uid);
Copy link
Contributor

@vbudhram vbudhram Oct 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Saves a db call 👍🏽

const { uid, email } = request.auth.credentials;

const { tokenVerified, tokenVerificationId } =
request.auth.credentials || {};
if (tokenVerificationId || tokenVerified === false) {
throw errors.unverifiedSession();
}

await customs.checkAuthenticated(
request,
uid,
account.email,
'totpReplace'
);
await customs.checkAuthenticated(request, uid, email, 'totpReplace');
// check the redis cache for the NEW secret. Since the existing code
// is verified and stored in the db we must use the redis cache
const newSharedSecret = await authServerCacheRedis.get(
Expand Down