Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-04-14 08:28:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2024-09-04 11:31:50 -04:00
parent ee715f36b2 c0b30ea4ef
commit 46950e287d
12 changed files with 104 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/controllers/index.js
View File

@@ -219,20 +219,31 @@ Controllers.registerInterstitial = async function (req, res, next) {
}
};
Controllers.confirmEmail = async (req, res, next) => {
Controllers.confirmEmail = async (req, res) => {
function renderPage(opts = {}) {
res.render('confirm', {
title: '[[pages:confirm]]',
...opts,
});
}
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
delete req.session.registration.updateEmail;
}
res.render('confirm', {
title: '[[pages:confirm]]',
});
renderPage();
} catch (e) {
if (e.message === '[[error:invalid-data]]') {
return next();
if (e.message === '[[error:invalid-data]]' || e.message === '[[error:confirm-email-expired]]') {
renderPage({ error: true });
return;
}
throw e;