Merge branch 'master' into develop

This commit is contained in:
Barış Soner Uşaklı
2025-04-12 14:16:58 -04:00
7 changed files with 35 additions and 22 deletions

View File

@@ -235,12 +235,6 @@ Controllers.confirmEmail = async (req, res) => {
return renderPage();
}
try {
if (req.loggedIn) {
const emailValidated = await user.getUserField(req.uid, 'email:confirmed');
if (emailValidated) {
return renderPage({ alreadyValidated: true });
}
}
await user.email.confirmByCode(req.params.code, req.session.id);
if (req.session.registration) {
// After confirmation, no need to send user back to email change form