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

Merge branch 'master' of https://github.com/NodeBB/NodeBB

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2022-02-04 10:38:06 -05:00
parent dcb201dfa8 aa8914a153
commit 45ca046533
3 changed files with 132 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/controllers/write/users.js
View File

@@ -265,16 +265,21 @@ Users.getEmail = async (req, res) => {
};
Users.confirmEmail = async (req, res) => {
const [exists, canManage] = await Promise.all([
db.isSortedSetMember('email:uid', req.params.email.toLowerCase()),
const [pending, current, canManage] = await Promise.all([
user.email.isValidationPending(req.params.uid, req.params.email),
user.getUserField(req.params.uid, 'email'),
privileges.admin.can('admin:users', req.uid),
]);
if (!canManage) {
helpers.notAllowed(req, res);
return helpers.notAllowed(req, res);
}
if (exists) {
if (pending) { // has active confirmation request
const code = await db.get(`confirm:byUid:${req.params.uid}`);
await user.email.confirmByCode(code, req.session.id);
helpers.formatApiResponse(200, res);
} else if (current && current === req.params.email) { // email in user hash (i.e. email passed into user.create)
await user.email.confirmByUid(req.params.uid);
helpers.formatApiResponse(200, res);
} else {