Merge pull request #28808 from overleaf/ii-await-user-handler
[web] Promisify UserHandler GitOrigin-RevId: 2daa6f74ec566851d208bf1b3d12d89ecf183383
This commit is contained in:
@@ -654,10 +654,8 @@ function _afterLoginSessionSetup(req, user, callback) {
|
||||
const _afterLoginSessionSetupAsync = promisify(_afterLoginSessionSetup)
|
||||
|
||||
function _loginAsyncHandlers(req, user, anonymousAnalyticsId, isNewUser) {
|
||||
UserHandler.populateTeamInvites(user, err => {
|
||||
if (err != null) {
|
||||
logger.warn({ err }, 'error setting up login data')
|
||||
}
|
||||
UserHandler.promises.populateTeamInvites(user).catch(err => {
|
||||
logger.warn({ err }, 'error setting up login data')
|
||||
})
|
||||
LoginRateLimiter.recordSuccessfulLogin(user.email, () => {})
|
||||
AuthenticationController._recordSuccessfulLogin(user._id, () => {})
|
||||
|
||||
@@ -1,14 +1,13 @@
|
||||
const { callbackify, promisify } = require('@overleaf/promise-utils')
|
||||
const { callbackify } = require('util')
|
||||
const TeamInvitesHandler = require('../Subscription/TeamInvitesHandler')
|
||||
const {
|
||||
db,
|
||||
READ_PREFERENCE_SECONDARY,
|
||||
} = require('../../infrastructure/mongodb')
|
||||
|
||||
function populateTeamInvites(user, callback) {
|
||||
TeamInvitesHandler.createTeamInvitesForLegacyInvitedEmail(
|
||||
user.email,
|
||||
callback
|
||||
async function populateTeamInvites(user) {
|
||||
return await TeamInvitesHandler.promises.createTeamInvitesForLegacyInvitedEmail(
|
||||
user.email
|
||||
)
|
||||
}
|
||||
|
||||
@@ -22,10 +21,10 @@ async function countActiveUsers() {
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
populateTeamInvites,
|
||||
populateTeamInvites: callbackify(populateTeamInvites),
|
||||
countActiveUsers: callbackify(countActiveUsers),
|
||||
}
|
||||
module.exports.promises = {
|
||||
populateTeamInvites: promisify(populateTeamInvites),
|
||||
countActiveUsers,
|
||||
promises: {
|
||||
populateTeamInvites,
|
||||
countActiveUsers,
|
||||
},
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user