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

Fixes for "validate email" & "send validation email" in ACP (#11677)

Browse Source 
* confirmObj changes

dont expire confirm:<code>, add a expires field instead
dont expire confirm:byUid:<uid>

on admin manage users display the users email status
	1. verified
	2. verify email sent (pending)
	3. verify email sent (expired)
	4. no email entered

fix validate email in acp to use
	email in user:<uid> if they have one
	if not check if its in confirm:<code>
	if its not in above cant validate throw error

fix send validate email to use
	email in user:<uid> if they have one
	if not check if its in confirm:<code>
	if its not in above too cant validate throw error

* add back socket.io tests

* test: fix confirm tests

no longer using pexpire
return correct time left on token

* chore: update openapi

* fix: delete call

* test: mget test fixes

* test: fix tests
This commit is contained in:
Barış Soner Uşaklı
2023-06-05 12:12:48 -04:00
committed by GitHub
parent 1e137b0705
commit 04998908ba
13 changed files with 144 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/user/delete.js
View File

@@ -149,6 +149,7 @@ module.exports = function (User) {
groups.leaveAllGroups(uid),
flags.resolveFlag('user', uid, uid),
User.reset.cleanByUid(uid),
User.email.expireValidation(uid),
]);
await db.deleteAll([`followers:${uid}`, `following:${uid}`, `user:${uid}`]);
delete deletesInProgress[uid];

49
src/user/email.js
View File

@@ -44,28 +44,42 @@ UserEmail.remove = async function (uid, sessionId) {
]);
};
UserEmail.getEmailForValidation = async (uid) => {
// gets email from user:<uid> email field,
// if it isn't set fallbacks to confirm:<code> email field
let email = await user.getUserField(uid, 'email');
if (!email) {
// check email from confirmObj
const code = await db.get(`confirm:byUid:${uid}`);
const confirmObj = await db.getObject(`confirm:${code}`);
if (confirmObj && confirmObj.email && parseInt(uid, 10) === parseInt(confirmObj.uid, 10)) {
email = confirmObj.email;
}
}
return email;
};
UserEmail.isValidationPending = async (uid, email) => {
const code = await db.get(`confirm:byUid:${uid}`);
if (email) {
const confirmObj = await db.getObject(`confirm:${code}`);
return !!(confirmObj && email === confirmObj.email);
}
return !!code;
const confirmObj = await db.getObject(`confirm:${code}`);
return !!(confirmObj && (
(!email || email === confirmObj.email) && Date.now() < parseInt(confirmObj.expires, 10)
));
};
UserEmail.getValidationExpiry = async (uid) => {
const pending = await UserEmail.isValidationPending(uid);
return pending ? db.pttl(`confirm:byUid:${uid}`) : null;
const code = await db.get(`confirm:byUid:${uid}`);
const confirmObj = await db.getObject(`confirm:${code}`);
return confirmObj ? Math.max(0, confirmObj.expires - Date.now()) : null;
};
UserEmail.expireValidation = async (uid) => {
const keys = [`confirm:byUid:${uid}`];
const code = await db.get(`confirm:byUid:${uid}`);
await db.deleteAll([
`confirm:byUid:${uid}`,
`confirm:${code}`,
]);
if (code) {
keys.push(`confirm:${code}`);
}
await db.deleteAll(keys);
};
UserEmail.canSendValidation = async (uid, email) => {
@@ -78,7 +92,7 @@ UserEmail.canSendValidation = async (uid, email) => {
const max = meta.config.emailConfirmExpiry * 60 * 60 * 1000;
const interval = meta.config.emailConfirmInterval * 60 * 1000;
return ttl + interval < max;
return (ttl || Date.now()) + interval < max;
};
UserEmail.sendValidationEmail = async function (uid, options) {
@@ -134,13 +148,12 @@ UserEmail.sendValidationEmail = async function (uid, options) {
await UserEmail.expireValidation(uid);
await db.set(`confirm:byUid:${uid}`, confirm_code);
await db.pexpire(`confirm:byUid:${uid}`, emailConfirmExpiry * 60 * 60 * 1000);
await db.setObject(`confirm:${confirm_code}`, {
email: options.email.toLowerCase(),
uid: uid,
expires: Date.now() + (emailConfirmExpiry * 60 * 60 * 1000),
});
await db.pexpire(`confirm:${confirm_code}`, emailConfirmExpiry * 60 * 60 * 1000);
winston.verbose(`[user/email] Validation email for uid ${uid} sent to ${options.email}`);
events.log({
@@ -165,6 +178,10 @@ UserEmail.confirmByCode = async function (code, sessionId) {
throw new Error('[[error:invalid-data]]');
}
if (!confirmObj.expires || Date.now() > parseInt(confirmObj.expires, 10)) {
throw new Error('[[error:confirm-email-expired]]');
}
// If another uid has the same email, remove it
const oldUid = await db.sortedSetScore('email:uid', confirmObj.email.toLowerCase());
if (oldUid) {