mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-11-18 03:31:03 +01:00
refactor(emails): more work in update email interstitial, interstitial skipping, email change on confirmation, deprecation of requireEmailConfirmation
This commit is contained in:
@@ -8,7 +8,6 @@ const api = require('../../api');
|
||||
const groups = require('../../groups');
|
||||
const user = require('../../user');
|
||||
const events = require('../../events');
|
||||
const meta = require('../../meta');
|
||||
const translator = require('../../translator');
|
||||
const sockets = require('..');
|
||||
|
||||
@@ -81,10 +80,6 @@ User.sendValidationEmail = async function (socket, uids) {
|
||||
throw new Error('[[error:invalid-data]]');
|
||||
}
|
||||
|
||||
if (!meta.config.requireEmailConfirmation) {
|
||||
throw new Error('[[error:email-confirmations-are-disabled]]');
|
||||
}
|
||||
|
||||
const failed = [];
|
||||
let errorLogged = false;
|
||||
await async.eachLimit(uids, 50, async (uid) => {
|
||||
|
||||
@@ -48,10 +48,6 @@ SocketUser.emailConfirm = async function (socket) {
|
||||
throw new Error('[[error:no-privileges]]');
|
||||
}
|
||||
|
||||
if (!meta.config.requireEmailConfirmation) {
|
||||
throw new Error('[[error:email-confirmations-are-disabled]]');
|
||||
}
|
||||
|
||||
return await user.email.sendValidationEmail(socket.uid);
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user