refactor(emails): more work in update email interstitial, interstitial skipping, email change on confirmation, deprecation of requireEmailConfirmation

This commit is contained in:
Julian Lam
2021-06-18 11:48:39 -04:00
parent f365bc4600
commit 69c96dd23c
17 changed files with 24 additions and 30 deletions

View File

@@ -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) => {

View File

@@ -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);
};