Skip to content

fix: correct password reset endpoint query logic #250

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
NickMonrad merged 1 commit into from
Jun 6, 2026
+16 −9
Merged

fix: correct password reset endpoint query logic #250

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
25 changes: 16 additions & 9 deletions server/src/routes/auth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,22 +131,29 @@ router.post('/reset-password', validate(resetPasswordSchema), asyncHandler(async

const tokenHash = crypto.createHash('sha256').update(token).digest('hex')

// Atomic update: only succeeds if usedAt IS NULL (prevents race condition)
const resetToken = await prisma.passwordResetToken.update({
where: { tokenHash, usedAt: null },
data: { usedAt: new Date() },
}).catch(() => null)
// Fetch the token record
const resetToken = await prisma.passwordResetToken.findUnique({
where: { tokenHash },
})

if (!resetToken || resetToken.expiresAt < new Date()) {
if (!resetToken || resetToken.usedAt !== null || resetToken.expiresAt < new Date()) {
res.status(400).json({ error: 'Invalid or expired reset token' })
return
}

const hashed = await bcrypt.hash(password, 10)

await prisma.user.update({
where: { id: resetToken.userId },
data: { password: hashed },
// Mark token as used and update password atomically
await prisma.$transaction(async (tx) => {
await tx.passwordResetToken.update({
where: { tokenHash },
data: { usedAt: new Date() },
})

await tx.user.update({
where: { id: resetToken.userId },
data: { password: hashed },
})
})

logger.info({ userId: resetToken.userId }, 'Password reset successfully')
Expand Down
Loading