mirror of
https://github.com/yu-i-i/overleaf-cep.git
synced 2025-07-22 20:00:06 +02:00
[web] Remove promises exports from Controller modules (#22242)
* Remove promises object from CollaboratorsInviteController.mjs * Define functions at root * Remove mentions of undefined `revokeInviteForUser` * Remove unused `doLogout` * Remove promises object from UserController.js * Remove unused `makeChangePreview` * Remove promises object from SubscriptionController.js (`getRecommendedCurrency` and `getLatamCountryBannerDetails`) * Remove promises object from CollabratecController.mjs * Remove promises object from SSOController.mjs * Remove promises object from ReferencesApiController.mjs * Remove promises object from MetricsEmailController.mjs * Remove promises object from InstitutionHubsController.mjs * Remove promises object from DocumentUpdaterController.mjs * Remove promises object from SubscriptionAdminController.mjs * Fixup unit tests * Add expects that controllers don't error * Promisify `ensureAffiliationMiddleware` GitOrigin-RevId: 311c8afa7d5c8e4f051408d305b6b4147a020edc
This commit is contained in:
Antoine Clausse
Copybot
parent
ae34c4b8cc
commit
b9fb636f0b
9 changed files with 487 additions and 540 deletions
|
|
@ -1,4 +1,3 @@
|
|||
import { callbackify } from 'node:util'
|
||||
import ProjectGetter from '../Project/ProjectGetter.js'
|
||||
import LimitationsManager from '../Subscription/LimitationsManager.js'
|
||||
import UserGetter from '../User/UserGetter.js'
|
||||
|
|
@ -34,16 +33,15 @@ const rateLimiter = new RateLimiter('invite-to-project-by-user-id', {
|
|||
duration: 60 * 30,
|
||||
})
|
||||
|
||||
const CollaboratorsInviteController = {
|
||||
async getAllInvites(req, res) {
|
||||
async function getAllInvites(req, res) {
|
||||
const projectId = req.params.Project_id
|
||||
logger.debug({ projectId }, 'getting all active invites for project')
|
||||
const invites =
|
||||
await CollaboratorsInviteGetter.promises.getAllInvites(projectId)
|
||||
res.json({ invites })
|
||||
},
|
||||
}
|
||||
|
||||
async _checkShouldInviteEmail(email) {
|
||||
async function _checkShouldInviteEmail(email) {
|
||||
if (Settings.restrictInvitesToExistingAccounts === true) {
|
||||
logger.debug({ email }, 'checking if user exists with this email')
|
||||
const user = await UserGetter.promises.getUserByAnyEmail(email, {
|
||||
|
|
@ -54,9 +52,9 @@ const CollaboratorsInviteController = {
|
|||
} else {
|
||||
return true
|
||||
}
|
||||
},
|
||||
}
|
||||
|
||||
async _checkRateLimit(userId) {
|
||||
async function _checkRateLimit(userId) {
|
||||
let collabLimit =
|
||||
await LimitationsManager.promises.allowedNumberOfCollaboratorsForUser(
|
||||
userId
|
||||
|
|
@ -81,9 +79,9 @@ const CollaboratorsInviteController = {
|
|||
}
|
||||
}
|
||||
return true
|
||||
},
|
||||
}
|
||||
|
||||
async inviteToProject(req, res) {
|
||||
async function inviteToProject(req, res) {
|
||||
const projectId = req.params.Project_id
|
||||
let { email, privileges } = req.body
|
||||
const sendingUser = SessionManager.getSessionUser(req.session)
|
||||
|
|
@ -180,14 +178,12 @@ const CollaboratorsInviteController = {
|
|||
|
||||
logger.debug({ projectId, email, sendingUserId }, 'invite created')
|
||||
|
||||
EditorRealTimeController.emitToRoom(
|
||||
projectId,
|
||||
'project:membership:changed',
|
||||
{ invites: true }
|
||||
)
|
||||
EditorRealTimeController.emitToRoom(projectId, 'project:membership:changed', {
|
||||
invites: true,
|
||||
})
|
||||
res.json({ invite })
|
||||
},
|
||||
async revokeInvite(req, res) {
|
||||
}
|
||||
async function revokeInvite(req, res) {
|
||||
const projectId = req.params.Project_id
|
||||
const inviteId = req.params.invite_id
|
||||
const user = SessionManager.getSessionUser(req.session)
|
||||
|
|
@ -218,9 +214,9 @@ const CollaboratorsInviteController = {
|
|||
}
|
||||
|
||||
res.sendStatus(204)
|
||||
},
|
||||
}
|
||||
|
||||
async generateNewInvite(req, res) {
|
||||
async function generateNewInvite(req, res) {
|
||||
const projectId = req.params.Project_id
|
||||
const inviteId = req.params.invite_id
|
||||
const user = SessionManager.getSessionUser(req.session)
|
||||
|
|
@ -240,11 +236,9 @@ const CollaboratorsInviteController = {
|
|||
inviteId
|
||||
)
|
||||
|
||||
EditorRealTimeController.emitToRoom(
|
||||
projectId,
|
||||
'project:membership:changed',
|
||||
{ invites: true }
|
||||
)
|
||||
EditorRealTimeController.emitToRoom(projectId, 'project:membership:changed', {
|
||||
invites: true,
|
||||
})
|
||||
|
||||
if (invite != null) {
|
||||
ProjectAuditLogHandler.addEntryInBackground(
|
||||
|
|
@ -262,9 +256,9 @@ const CollaboratorsInviteController = {
|
|||
} else {
|
||||
res.sendStatus(404)
|
||||
}
|
||||
},
|
||||
}
|
||||
|
||||
async viewInvite(req, res) {
|
||||
async function viewInvite(req, res) {
|
||||
const projectId = req.params.Project_id
|
||||
const { token } = req.params
|
||||
const _renderInvalidPage = function () {
|
||||
|
|
@ -341,9 +335,9 @@ const CollaboratorsInviteController = {
|
|||
owner,
|
||||
title: 'Project Invite',
|
||||
})
|
||||
},
|
||||
}
|
||||
|
||||
async acceptInvite(req, res) {
|
||||
async function acceptInvite(req, res) {
|
||||
const { Project_id: projectId, token } = req.params
|
||||
const currentUser = SessionManager.getSessionUser(req.session)
|
||||
logger.debug(
|
||||
|
|
@ -395,24 +389,17 @@ const CollaboratorsInviteController = {
|
|||
} else {
|
||||
res.redirect(`/project/${projectId}`)
|
||||
}
|
||||
},
|
||||
}
|
||||
|
||||
export default {
|
||||
promises: CollaboratorsInviteController,
|
||||
getAllInvites: expressify(CollaboratorsInviteController.getAllInvites),
|
||||
inviteToProject: expressify(CollaboratorsInviteController.inviteToProject),
|
||||
revokeInvite: expressify(CollaboratorsInviteController.revokeInvite),
|
||||
revokeInviteForUser: expressify(
|
||||
CollaboratorsInviteController.revokeInviteForUser
|
||||
),
|
||||
generateNewInvite: expressify(
|
||||
CollaboratorsInviteController.generateNewInvite
|
||||
),
|
||||
viewInvite: expressify(CollaboratorsInviteController.viewInvite),
|
||||
acceptInvite: expressify(CollaboratorsInviteController.acceptInvite),
|
||||
_checkShouldInviteEmail: callbackify(
|
||||
CollaboratorsInviteController._checkShouldInviteEmail
|
||||
),
|
||||
_checkRateLimit: callbackify(CollaboratorsInviteController._checkRateLimit),
|
||||
const CollaboratorsInviteController = {
|
||||
getAllInvites: expressify(getAllInvites),
|
||||
inviteToProject: expressify(inviteToProject),
|
||||
revokeInvite: expressify(revokeInvite),
|
||||
generateNewInvite: expressify(generateNewInvite),
|
||||
viewInvite: expressify(viewInvite),
|
||||
acceptInvite: expressify(acceptInvite),
|
||||
_checkShouldInviteEmail,
|
||||
_checkRateLimit,
|
||||
}
|
||||
|
||||
export default CollaboratorsInviteController
|
||||
|
|
|
|||
|
|
@ -44,7 +44,4 @@ async function getDoc(req, res) {
|
|||
|
||||
export default {
|
||||
getDoc: expressify(getDoc),
|
||||
promises: {
|
||||
getDoc,
|
||||
},
|
||||
}
|
||||
|
|
|
|||
|
|
@ -544,7 +544,7 @@ async function redirectToHostedPage(req, res) {
|
|||
res.redirect(url)
|
||||
}
|
||||
|
||||
async function _getRecommendedCurrency(req, res) {
|
||||
async function getRecommendedCurrency(req, res) {
|
||||
const userId = SessionManager.getLoggedInUserId(req.session)
|
||||
let ip = req.ip
|
||||
if (
|
||||
|
|
@ -683,8 +683,6 @@ module.exports = {
|
|||
purchaseAddon,
|
||||
removeAddon,
|
||||
makeChangePreview,
|
||||
promises: {
|
||||
getRecommendedCurrency: _getRecommendedCurrency,
|
||||
getRecommendedCurrency,
|
||||
getLatamCountryBannerDetails,
|
||||
},
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ const HttpErrorHandler = require('../Errors/HttpErrorHandler')
|
|||
const OError = require('@overleaf/o-error')
|
||||
const EmailHandler = require('../Email/EmailHandler')
|
||||
const UrlHelper = require('../Helpers/UrlHelper')
|
||||
const { promisify, callbackify } = require('util')
|
||||
const { promisify } = require('util')
|
||||
const { expressify } = require('@overleaf/promise-utils')
|
||||
const {
|
||||
acceptsJson,
|
||||
|
|
@ -212,11 +212,7 @@ async function ensureAffiliationMiddleware(req, res, next) {
|
|||
return next()
|
||||
}
|
||||
}
|
||||
try {
|
||||
await ensureAffiliation(user)
|
||||
} catch (error) {
|
||||
return next(error)
|
||||
}
|
||||
return next()
|
||||
}
|
||||
|
||||
|
|
@ -505,13 +501,9 @@ module.exports = {
|
|||
subscribe: expressify(subscribe),
|
||||
unsubscribe: expressify(unsubscribe),
|
||||
updateUserSettings: expressify(updateUserSettings),
|
||||
doLogout: callbackify(doLogout),
|
||||
logout: expressify(logout),
|
||||
expireDeletedUser: expressify(expireDeletedUser),
|
||||
expireDeletedUsersAfterDuration: expressify(expireDeletedUsersAfterDuration),
|
||||
promises: {
|
||||
doLogout,
|
||||
ensureAffiliationMiddleware: expressify(ensureAffiliationMiddleware),
|
||||
ensureAffiliation,
|
||||
ensureAffiliationMiddleware,
|
||||
},
|
||||
}
|
||||
|
|
|
|||
|
|
@ -314,7 +314,7 @@ async function initialize(webRouter, privateApiRouter, publicApiRouter) {
|
|||
'/user/emails',
|
||||
AuthenticationController.requireLogin(),
|
||||
PermissionsController.useCapabilities(),
|
||||
UserController.promises.ensureAffiliationMiddleware,
|
||||
UserController.ensureAffiliationMiddleware,
|
||||
UserEmailsController.list
|
||||
)
|
||||
webRouter.get(
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ const query = {
|
|||
|
||||
async function _handleEnsureAffiliation(user) {
|
||||
try {
|
||||
await UserController.promises.ensureAffiliation(user)
|
||||
await UserController.ensureAffiliation(user)
|
||||
console.log(`✔ ${user._id}`)
|
||||
success.push(user._id)
|
||||
} catch (error) {
|
||||
|
|
|
|||
|
|
@ -238,17 +238,17 @@ describe('CollaboratorsInviteController', function () {
|
|||
})
|
||||
|
||||
describe('when all goes well', function (done) {
|
||||
beforeEach(function (done) {
|
||||
this.CollaboratorsInviteController.promises._checkShouldInviteEmail =
|
||||
sinon.stub().resolves(true)
|
||||
this.CollaboratorsInviteController.promises._checkRateLimit = sinon
|
||||
beforeEach(async function () {
|
||||
this.CollaboratorsInviteController._checkShouldInviteEmail = sinon
|
||||
.stub()
|
||||
.resolves(true)
|
||||
this.res.callback = () => done()
|
||||
this.CollaboratorsInviteController.inviteToProject(
|
||||
this.CollaboratorsInviteController._checkRateLimit = sinon
|
||||
.stub()
|
||||
.resolves(true)
|
||||
|
||||
await this.CollaboratorsInviteController.inviteToProject(
|
||||
this.req,
|
||||
this.res,
|
||||
done
|
||||
this.res
|
||||
)
|
||||
})
|
||||
|
||||
|
|
@ -269,10 +269,11 @@ describe('CollaboratorsInviteController', function () {
|
|||
})
|
||||
|
||||
it('should have called _checkShouldInviteEmail', function () {
|
||||
this.CollaboratorsInviteController.promises._checkShouldInviteEmail.callCount.should.equal(
|
||||
this.CollaboratorsInviteController._checkShouldInviteEmail.callCount.should.equal(
|
||||
1
|
||||
)
|
||||
this.CollaboratorsInviteController.promises._checkShouldInviteEmail
|
||||
|
||||
this.CollaboratorsInviteController._checkShouldInviteEmail
|
||||
.calledWith(this.targetEmail)
|
||||
.should.equal(true)
|
||||
})
|
||||
|
|
@ -322,9 +323,10 @@ describe('CollaboratorsInviteController', function () {
|
|||
describe('readAndWrite collaborator', function () {
|
||||
beforeEach(function (done) {
|
||||
this.privileges = 'readAndWrite'
|
||||
this.CollaboratorsInviteController.promises._checkShouldInviteEmail =
|
||||
sinon.stub().resolves(true)
|
||||
this.CollaboratorsInviteController.promises._checkRateLimit = sinon
|
||||
this.CollaboratorsInviteController._checkShouldInviteEmail = sinon
|
||||
.stub()
|
||||
.resolves(true)
|
||||
this.CollaboratorsInviteController._checkRateLimit = sinon
|
||||
.stub()
|
||||
.resolves(true)
|
||||
this.res.callback = () => done()
|
||||
|
|
@ -343,10 +345,10 @@ describe('CollaboratorsInviteController', function () {
|
|||
})
|
||||
|
||||
it('should not have called _checkShouldInviteEmail', function () {
|
||||
this.CollaboratorsInviteController.promises._checkShouldInviteEmail.callCount.should.equal(
|
||||
this.CollaboratorsInviteController._checkShouldInviteEmail.callCount.should.equal(
|
||||
0
|
||||
)
|
||||
this.CollaboratorsInviteController.promises._checkShouldInviteEmail
|
||||
this.CollaboratorsInviteController._checkShouldInviteEmail
|
||||
.calledWith(this.currentUser, this.targetEmail)
|
||||
.should.equal(false)
|
||||
})
|
||||
|
|
@ -364,9 +366,10 @@ describe('CollaboratorsInviteController', function () {
|
|||
email: this.targetEmail,
|
||||
privileges: (this.privileges = 'readOnly'),
|
||||
}
|
||||
this.CollaboratorsInviteController.promises._checkShouldInviteEmail =
|
||||
sinon.stub().resolves(true)
|
||||
this.CollaboratorsInviteController.promises._checkRateLimit = sinon
|
||||
this.CollaboratorsInviteController._checkShouldInviteEmail = sinon
|
||||
.stub()
|
||||
.resolves(true)
|
||||
this.CollaboratorsInviteController._checkRateLimit = sinon
|
||||
.stub()
|
||||
.resolves(true)
|
||||
this.res.callback = () => done()
|
||||
|
|
@ -391,10 +394,10 @@ describe('CollaboratorsInviteController', function () {
|
|||
})
|
||||
|
||||
it('should have called _checkShouldInviteEmail', function () {
|
||||
this.CollaboratorsInviteController.promises._checkShouldInviteEmail.callCount.should.equal(
|
||||
this.CollaboratorsInviteController._checkShouldInviteEmail.callCount.should.equal(
|
||||
1
|
||||
)
|
||||
this.CollaboratorsInviteController.promises._checkShouldInviteEmail
|
||||
this.CollaboratorsInviteController._checkShouldInviteEmail
|
||||
.calledWith(this.targetEmail)
|
||||
.should.equal(true)
|
||||
})
|
||||
|
|
@ -438,9 +441,10 @@ describe('CollaboratorsInviteController', function () {
|
|||
|
||||
describe('when all goes well', function (done) {
|
||||
beforeEach(function (done) {
|
||||
this.CollaboratorsInviteController.promises._checkShouldInviteEmail =
|
||||
sinon.stub().resolves(true)
|
||||
this.CollaboratorsInviteController.promises._checkRateLimit = sinon
|
||||
this.CollaboratorsInviteController._checkShouldInviteEmail = sinon
|
||||
.stub()
|
||||
.resolves(true)
|
||||
this.CollaboratorsInviteController._checkRateLimit = sinon
|
||||
.stub()
|
||||
.resolves(true)
|
||||
this.res.callback = () => done()
|
||||
|
|
@ -468,10 +472,10 @@ describe('CollaboratorsInviteController', function () {
|
|||
})
|
||||
|
||||
it('should have called _checkShouldInviteEmail', function () {
|
||||
this.CollaboratorsInviteController.promises._checkShouldInviteEmail.callCount.should.equal(
|
||||
this.CollaboratorsInviteController._checkShouldInviteEmail.callCount.should.equal(
|
||||
1
|
||||
)
|
||||
this.CollaboratorsInviteController.promises._checkShouldInviteEmail
|
||||
this.CollaboratorsInviteController._checkShouldInviteEmail
|
||||
.calledWith(this.targetEmail)
|
||||
.should.equal(true)
|
||||
})
|
||||
|
|
@ -513,9 +517,10 @@ describe('CollaboratorsInviteController', function () {
|
|||
|
||||
describe('when the user is not allowed to add more collaborators', function () {
|
||||
beforeEach(function (done) {
|
||||
this.CollaboratorsInviteController.promises._checkShouldInviteEmail =
|
||||
sinon.stub().resolves(true)
|
||||
this.CollaboratorsInviteController.promises._checkRateLimit = sinon
|
||||
this.CollaboratorsInviteController._checkShouldInviteEmail = sinon
|
||||
.stub()
|
||||
.resolves(true)
|
||||
this.CollaboratorsInviteController._checkRateLimit = sinon
|
||||
.stub()
|
||||
.resolves(true)
|
||||
this.LimitationsManager.promises.canAddXCollaborators.resolves(false)
|
||||
|
|
@ -533,10 +538,10 @@ describe('CollaboratorsInviteController', function () {
|
|||
})
|
||||
|
||||
it('should not have called _checkShouldInviteEmail', function () {
|
||||
this.CollaboratorsInviteController.promises._checkShouldInviteEmail.callCount.should.equal(
|
||||
this.CollaboratorsInviteController._checkShouldInviteEmail.callCount.should.equal(
|
||||
0
|
||||
)
|
||||
this.CollaboratorsInviteController.promises._checkShouldInviteEmail
|
||||
this.CollaboratorsInviteController._checkShouldInviteEmail
|
||||
.calledWith(this.currentUser, this.targetEmail)
|
||||
.should.equal(false)
|
||||
})
|
||||
|
|
@ -550,9 +555,10 @@ describe('CollaboratorsInviteController', function () {
|
|||
|
||||
describe('when canAddXCollaborators produces an error', function () {
|
||||
beforeEach(function (done) {
|
||||
this.CollaboratorsInviteController.promises._checkShouldInviteEmail =
|
||||
sinon.stub().resolves(true)
|
||||
this.CollaboratorsInviteController.promises._checkRateLimit = sinon
|
||||
this.CollaboratorsInviteController._checkShouldInviteEmail = sinon
|
||||
.stub()
|
||||
.resolves(true)
|
||||
this.CollaboratorsInviteController._checkRateLimit = sinon
|
||||
.stub()
|
||||
.resolves(true)
|
||||
this.LimitationsManager.promises.canAddXCollaborators.rejects(
|
||||
|
|
@ -572,10 +578,10 @@ describe('CollaboratorsInviteController', function () {
|
|||
})
|
||||
|
||||
it('should not have called _checkShouldInviteEmail', function () {
|
||||
this.CollaboratorsInviteController.promises._checkShouldInviteEmail.callCount.should.equal(
|
||||
this.CollaboratorsInviteController._checkShouldInviteEmail.callCount.should.equal(
|
||||
0
|
||||
)
|
||||
this.CollaboratorsInviteController.promises._checkShouldInviteEmail
|
||||
this.CollaboratorsInviteController._checkShouldInviteEmail
|
||||
.calledWith(this.currentUser, this.targetEmail)
|
||||
.should.equal(false)
|
||||
})
|
||||
|
|
@ -589,9 +595,10 @@ describe('CollaboratorsInviteController', function () {
|
|||
|
||||
describe('when inviteToProject produces an error', function () {
|
||||
beforeEach(function (done) {
|
||||
this.CollaboratorsInviteController.promises._checkShouldInviteEmail =
|
||||
sinon.stub().resolves(true)
|
||||
this.CollaboratorsInviteController.promises._checkRateLimit = sinon
|
||||
this.CollaboratorsInviteController._checkShouldInviteEmail = sinon
|
||||
.stub()
|
||||
.resolves(true)
|
||||
this.CollaboratorsInviteController._checkRateLimit = sinon
|
||||
.stub()
|
||||
.resolves(true)
|
||||
this.CollaboratorsInviteHandler.promises.inviteToProject.rejects(
|
||||
|
|
@ -620,10 +627,10 @@ describe('CollaboratorsInviteController', function () {
|
|||
})
|
||||
|
||||
it('should have called _checkShouldInviteEmail', function () {
|
||||
this.CollaboratorsInviteController.promises._checkShouldInviteEmail.callCount.should.equal(
|
||||
this.CollaboratorsInviteController._checkShouldInviteEmail.callCount.should.equal(
|
||||
1
|
||||
)
|
||||
this.CollaboratorsInviteController.promises._checkShouldInviteEmail
|
||||
this.CollaboratorsInviteController._checkShouldInviteEmail
|
||||
.calledWith(this.targetEmail)
|
||||
.should.equal(true)
|
||||
})
|
||||
|
|
@ -645,9 +652,10 @@ describe('CollaboratorsInviteController', function () {
|
|||
|
||||
describe('when _checkShouldInviteEmail disallows the invite', function () {
|
||||
beforeEach(function (done) {
|
||||
this.CollaboratorsInviteController.promises._checkShouldInviteEmail =
|
||||
sinon.stub().resolves(false)
|
||||
this.CollaboratorsInviteController.promises._checkRateLimit = sinon
|
||||
this.CollaboratorsInviteController._checkShouldInviteEmail = sinon
|
||||
.stub()
|
||||
.resolves(false)
|
||||
this.CollaboratorsInviteController._checkRateLimit = sinon
|
||||
.stub()
|
||||
.resolves(true)
|
||||
this.res.callback = () => done()
|
||||
|
|
@ -667,10 +675,10 @@ describe('CollaboratorsInviteController', function () {
|
|||
})
|
||||
|
||||
it('should have called _checkShouldInviteEmail', function () {
|
||||
this.CollaboratorsInviteController.promises._checkShouldInviteEmail.callCount.should.equal(
|
||||
this.CollaboratorsInviteController._checkShouldInviteEmail.callCount.should.equal(
|
||||
1
|
||||
)
|
||||
this.CollaboratorsInviteController.promises._checkShouldInviteEmail
|
||||
this.CollaboratorsInviteController._checkShouldInviteEmail
|
||||
.calledWith(this.targetEmail)
|
||||
.should.equal(true)
|
||||
})
|
||||
|
|
@ -684,9 +692,10 @@ describe('CollaboratorsInviteController', function () {
|
|||
|
||||
describe('when _checkShouldInviteEmail produces an error', function () {
|
||||
beforeEach(function (done) {
|
||||
this.CollaboratorsInviteController.promises._checkShouldInviteEmail =
|
||||
sinon.stub().rejects(new Error('woops'))
|
||||
this.CollaboratorsInviteController.promises._checkRateLimit = sinon
|
||||
this.CollaboratorsInviteController._checkShouldInviteEmail = sinon
|
||||
.stub()
|
||||
.rejects(new Error('woops'))
|
||||
this.CollaboratorsInviteController._checkRateLimit = sinon
|
||||
.stub()
|
||||
.resolves(true)
|
||||
this.next.callsFake(() => done())
|
||||
|
|
@ -703,10 +712,10 @@ describe('CollaboratorsInviteController', function () {
|
|||
})
|
||||
|
||||
it('should have called _checkShouldInviteEmail', function () {
|
||||
this.CollaboratorsInviteController.promises._checkShouldInviteEmail.callCount.should.equal(
|
||||
this.CollaboratorsInviteController._checkShouldInviteEmail.callCount.should.equal(
|
||||
1
|
||||
)
|
||||
this.CollaboratorsInviteController.promises._checkShouldInviteEmail
|
||||
this.CollaboratorsInviteController._checkShouldInviteEmail
|
||||
.calledWith(this.targetEmail)
|
||||
.should.equal(true)
|
||||
})
|
||||
|
|
@ -721,9 +730,10 @@ describe('CollaboratorsInviteController', function () {
|
|||
describe('when the user invites themselves to the project', function () {
|
||||
beforeEach(function () {
|
||||
this.req.body.email = this.currentUser.email
|
||||
this.CollaboratorsInviteController.promises._checkShouldInviteEmail =
|
||||
sinon.stub().resolves(true)
|
||||
this.CollaboratorsInviteController.promises._checkRateLimit = sinon
|
||||
this.CollaboratorsInviteController._checkShouldInviteEmail = sinon
|
||||
.stub()
|
||||
.resolves(true)
|
||||
this.CollaboratorsInviteController._checkRateLimit = sinon
|
||||
.stub()
|
||||
.resolves(true)
|
||||
this.CollaboratorsInviteController.inviteToProject(
|
||||
|
|
@ -748,7 +758,7 @@ describe('CollaboratorsInviteController', function () {
|
|||
})
|
||||
|
||||
it('should not have called _checkShouldInviteEmail', function () {
|
||||
this.CollaboratorsInviteController.promises._checkShouldInviteEmail.callCount.should.equal(
|
||||
this.CollaboratorsInviteController._checkShouldInviteEmail.callCount.should.equal(
|
||||
0
|
||||
)
|
||||
})
|
||||
|
|
@ -765,14 +775,14 @@ describe('CollaboratorsInviteController', function () {
|
|||
})
|
||||
|
||||
describe('when _checkRateLimit returns false', function () {
|
||||
beforeEach(function (done) {
|
||||
this.CollaboratorsInviteController.promises._checkShouldInviteEmail =
|
||||
sinon.stub().resolves(true)
|
||||
this.CollaboratorsInviteController.promises._checkRateLimit = sinon
|
||||
beforeEach(async function () {
|
||||
this.CollaboratorsInviteController._checkShouldInviteEmail = sinon
|
||||
.stub()
|
||||
.resolves(true)
|
||||
this.CollaboratorsInviteController._checkRateLimit = sinon
|
||||
.stub()
|
||||
.resolves(false)
|
||||
this.res.callback = () => done()
|
||||
this.CollaboratorsInviteController.inviteToProject(
|
||||
await this.CollaboratorsInviteController.inviteToProject(
|
||||
this.req,
|
||||
this.res,
|
||||
this.next
|
||||
|
|
@ -1281,7 +1291,7 @@ describe('CollaboratorsInviteController', function () {
|
|||
Project_id: this.projectId,
|
||||
invite_id: this.invite._id.toString(),
|
||||
}
|
||||
this.CollaboratorsInviteController.promises._checkRateLimit = sinon
|
||||
this.CollaboratorsInviteController._checkRateLimit = sinon
|
||||
.stub()
|
||||
.resolves(true)
|
||||
})
|
||||
|
|
@ -1316,7 +1326,7 @@ describe('CollaboratorsInviteController', function () {
|
|||
})
|
||||
|
||||
it('should check the rate limit', function () {
|
||||
this.CollaboratorsInviteController.promises._checkRateLimit.callCount.should.equal(
|
||||
this.CollaboratorsInviteController._checkRateLimit.callCount.should.equal(
|
||||
1
|
||||
)
|
||||
})
|
||||
|
|
@ -1600,12 +1610,8 @@ describe('CollaboratorsInviteController', function () {
|
|||
describe('when we should be restricting to existing accounts', function () {
|
||||
beforeEach(function () {
|
||||
this.settings.restrictInvitesToExistingAccounts = true
|
||||
this.call = callback => {
|
||||
this.CollaboratorsInviteController._checkShouldInviteEmail(
|
||||
this.email,
|
||||
callback
|
||||
)
|
||||
}
|
||||
this.call = () =>
|
||||
this.CollaboratorsInviteController._checkShouldInviteEmail(this.email)
|
||||
})
|
||||
|
||||
describe('when user account is present', function () {
|
||||
|
|
@ -1614,12 +1620,12 @@ describe('CollaboratorsInviteController', function () {
|
|||
this.UserGetter.promises.getUserByAnyEmail.resolves(this.user)
|
||||
})
|
||||
|
||||
it('should callback with `true`', function (done) {
|
||||
this.call((err, shouldAllow) => {
|
||||
expect(err).to.equal(null)
|
||||
it('should callback with `true`', async function () {
|
||||
const shouldAllow =
|
||||
await this.CollaboratorsInviteController._checkShouldInviteEmail(
|
||||
this.email
|
||||
)
|
||||
expect(shouldAllow).to.equal(true)
|
||||
done()
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
|
|
@ -1629,25 +1635,22 @@ describe('CollaboratorsInviteController', function () {
|
|||
this.UserGetter.promises.getUserByAnyEmail.resolves(this.user)
|
||||
})
|
||||
|
||||
it('should callback with `false`', function (done) {
|
||||
this.call((err, shouldAllow) => {
|
||||
expect(err).to.equal(null)
|
||||
it('should callback with `false`', async function () {
|
||||
const shouldAllow =
|
||||
await this.CollaboratorsInviteController._checkShouldInviteEmail(
|
||||
this.email
|
||||
)
|
||||
expect(shouldAllow).to.equal(false)
|
||||
done()
|
||||
})
|
||||
})
|
||||
|
||||
it('should have called getUser', function (done) {
|
||||
this.call((err, shouldAllow) => {
|
||||
if (err) {
|
||||
return done(err)
|
||||
}
|
||||
it('should have called getUser', async function () {
|
||||
await this.CollaboratorsInviteController._checkShouldInviteEmail(
|
||||
this.email
|
||||
)
|
||||
this.UserGetter.promises.getUserByAnyEmail.callCount.should.equal(1)
|
||||
this.UserGetter.promises.getUserByAnyEmail
|
||||
.calledWith(this.email, { _id: 1 })
|
||||
.should.equal(true)
|
||||
done()
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
|
|
@ -1657,13 +1660,12 @@ describe('CollaboratorsInviteController', function () {
|
|||
this.UserGetter.promises.getUserByAnyEmail.rejects(new Error('woops'))
|
||||
})
|
||||
|
||||
it('should callback with an error', function (done) {
|
||||
this.call((err, shouldAllow) => {
|
||||
expect(err).to.not.equal(null)
|
||||
expect(err).to.be.instanceof(Error)
|
||||
expect(shouldAllow).to.equal(undefined)
|
||||
done()
|
||||
})
|
||||
it('should callback with an error', async function () {
|
||||
await expect(
|
||||
this.CollaboratorsInviteController._checkShouldInviteEmail(
|
||||
this.email
|
||||
)
|
||||
).to.be.rejected
|
||||
})
|
||||
})
|
||||
})
|
||||
|
|
@ -1678,91 +1680,61 @@ describe('CollaboratorsInviteController', function () {
|
|||
.resolves(17)
|
||||
})
|
||||
|
||||
it('should callback with `true` when rate limit under', function (done) {
|
||||
this.CollaboratorsInviteController._checkRateLimit(
|
||||
this.currentUserId,
|
||||
(err, result) => {
|
||||
if (err) {
|
||||
return done(err)
|
||||
}
|
||||
it('should callback with `true` when rate limit under', async function () {
|
||||
const result = await this.CollaboratorsInviteController._checkRateLimit(
|
||||
this.currentUserId
|
||||
)
|
||||
expect(this.rateLimiter.consume).to.have.been.calledWith(
|
||||
this.currentUserId
|
||||
)
|
||||
result.should.equal(true)
|
||||
done()
|
||||
}
|
||||
)
|
||||
})
|
||||
|
||||
it('should callback with `false` when rate limit hit', function (done) {
|
||||
it('should callback with `false` when rate limit hit', async function () {
|
||||
this.rateLimiter.consume.rejects({ remainingPoints: 0 })
|
||||
this.CollaboratorsInviteController._checkRateLimit(
|
||||
this.currentUserId,
|
||||
(err, result) => {
|
||||
if (err) {
|
||||
return done(err)
|
||||
}
|
||||
const result = await this.CollaboratorsInviteController._checkRateLimit(
|
||||
this.currentUserId
|
||||
)
|
||||
expect(this.rateLimiter.consume).to.have.been.calledWith(
|
||||
this.currentUserId
|
||||
)
|
||||
result.should.equal(false)
|
||||
done()
|
||||
}
|
||||
)
|
||||
})
|
||||
|
||||
it('should allow 10x the collaborators', function (done) {
|
||||
this.CollaboratorsInviteController._checkRateLimit(
|
||||
this.currentUserId,
|
||||
(err, result) => {
|
||||
if (err) {
|
||||
return done(err)
|
||||
}
|
||||
it('should allow 10x the collaborators', async function () {
|
||||
await this.CollaboratorsInviteController._checkRateLimit(
|
||||
this.currentUserId
|
||||
)
|
||||
expect(this.rateLimiter.consume).to.have.been.calledWith(
|
||||
this.currentUserId,
|
||||
Math.floor(40000 / 170)
|
||||
)
|
||||
done()
|
||||
}
|
||||
)
|
||||
})
|
||||
|
||||
it('should allow 200 requests when collaborators is -1', function (done) {
|
||||
it('should allow 200 requests when collaborators is -1', async function () {
|
||||
this.LimitationsManager.promises.allowedNumberOfCollaboratorsForUser
|
||||
.withArgs(this.currentUserId)
|
||||
.resolves(-1)
|
||||
this.CollaboratorsInviteController._checkRateLimit(
|
||||
this.currentUserId,
|
||||
(err, result) => {
|
||||
if (err) {
|
||||
return done(err)
|
||||
}
|
||||
await this.CollaboratorsInviteController._checkRateLimit(
|
||||
this.currentUserId
|
||||
)
|
||||
expect(this.rateLimiter.consume).to.have.been.calledWith(
|
||||
this.currentUserId,
|
||||
Math.floor(40000 / 200)
|
||||
)
|
||||
done()
|
||||
}
|
||||
)
|
||||
})
|
||||
|
||||
it('should allow 10 requests when user has no collaborators set', function (done) {
|
||||
it('should allow 10 requests when user has no collaborators set', async function () {
|
||||
this.LimitationsManager.promises.allowedNumberOfCollaboratorsForUser
|
||||
.withArgs(this.currentUserId)
|
||||
.resolves(null)
|
||||
this.CollaboratorsInviteController._checkRateLimit(
|
||||
this.currentUserId,
|
||||
(err, result) => {
|
||||
if (err) {
|
||||
return done(err)
|
||||
}
|
||||
await this.CollaboratorsInviteController._checkRateLimit(
|
||||
this.currentUserId
|
||||
)
|
||||
expect(this.rateLimiter.consume).to.have.been.calledWith(
|
||||
this.currentUserId,
|
||||
Math.floor(40000 / 10)
|
||||
)
|
||||
done()
|
||||
}
|
||||
)
|
||||
})
|
||||
})
|
||||
})
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@ describe('DocumentUpdaterController', function () {
|
|||
}
|
||||
this.lines = ['test', '', 'testing']
|
||||
this.res = new MockResponse()
|
||||
this.next = sinon.stub()
|
||||
this.doc = { name: 'myfile.tex' }
|
||||
})
|
||||
|
||||
|
|
@ -53,8 +54,7 @@ describe('DocumentUpdaterController', function () {
|
|||
})
|
||||
|
||||
it('should call the document updater handler with the project_id and doc_id', async function () {
|
||||
await this.controller.promises.getDoc(this.req, this.res)
|
||||
|
||||
await this.controller.getDoc(this.req, this.res, this.next)
|
||||
expect(
|
||||
this.DocumentUpdaterHandler.promises.getDocument
|
||||
).to.have.been.calledOnceWith(
|
||||
|
|
@ -65,13 +65,14 @@ describe('DocumentUpdaterController', function () {
|
|||
})
|
||||
|
||||
it('should return the content', async function () {
|
||||
await this.controller.promises.getDoc(this.req, this.res)
|
||||
await this.controller.getDoc(this.req, this.res)
|
||||
expect(this.next).to.not.have.been.called
|
||||
expect(this.res.statusCode).to.equal(200)
|
||||
expect(this.res.body).to.equal('test\n\ntesting')
|
||||
})
|
||||
|
||||
it('should find the doc in the project', async function () {
|
||||
await this.controller.promises.getDoc(this.req, this.res)
|
||||
await this.controller.getDoc(this.req, this.res)
|
||||
expect(
|
||||
this.ProjectLocator.promises.findElement
|
||||
).to.have.been.calledOnceWith({
|
||||
|
|
@ -82,7 +83,7 @@ describe('DocumentUpdaterController', function () {
|
|||
})
|
||||
|
||||
it('should set the Content-Disposition header', async function () {
|
||||
await this.controller.promises.getDoc(this.req, this.res)
|
||||
await this.controller.getDoc(this.req, this.res)
|
||||
expect(this.res.setContentDisposition).to.have.been.calledWith(
|
||||
'attachment',
|
||||
{ filename: this.doc.name }
|
||||
|
|
|
|||
|
|
@ -916,7 +916,7 @@ describe('UserController', function () {
|
|||
describe('ensureAffiliationMiddleware', function () {
|
||||
describe('without affiliations feature', function () {
|
||||
beforeEach(async function () {
|
||||
await this.UserController.promises.ensureAffiliationMiddleware(
|
||||
await this.UserController.ensureAffiliationMiddleware(
|
||||
this.req,
|
||||
this.res,
|
||||
this.next
|
||||
|
|
@ -938,7 +938,7 @@ describe('UserController', function () {
|
|||
describe('without ensureAffiliation query parameter', function () {
|
||||
beforeEach(async function () {
|
||||
this.Features.hasFeature.withArgs('affiliations').returns(true)
|
||||
await this.UserController.promises.ensureAffiliationMiddleware(
|
||||
await this.UserController.ensureAffiliationMiddleware(
|
||||
this.req,
|
||||
this.res,
|
||||
this.next
|
||||
|
|
@ -968,7 +968,7 @@ describe('UserController', function () {
|
|||
]
|
||||
this.Features.hasFeature.withArgs('affiliations').returns(true)
|
||||
this.req.query.ensureAffiliation = true
|
||||
await this.UserController.promises.ensureAffiliationMiddleware(
|
||||
await this.UserController.ensureAffiliationMiddleware(
|
||||
this.req,
|
||||
this.res,
|
||||
this.next
|
||||
|
|
@ -1005,7 +1005,7 @@ describe('UserController', function () {
|
|||
this.Features.hasFeature.withArgs('affiliations').returns(true)
|
||||
this.req.query.ensureAffiliation = true
|
||||
this.req.assertPermission = sinon.stub()
|
||||
await this.UserController.promises.ensureAffiliationMiddleware(
|
||||
await this.UserController.ensureAffiliationMiddleware(
|
||||
this.req,
|
||||
this.res,
|
||||
this.next
|
||||
|
|
@ -1047,7 +1047,7 @@ describe('UserController', function () {
|
|||
this.Features.hasFeature.withArgs('affiliations').returns(true)
|
||||
this.req.query.ensureAffiliation = true
|
||||
this.req.assertPermission = sinon.stub()
|
||||
await this.UserController.promises.ensureAffiliationMiddleware(
|
||||
await this.UserController.ensureAffiliationMiddleware(
|
||||
this.req,
|
||||
this.res,
|
||||
this.next
|
||||
|
|
@ -1089,7 +1089,7 @@ describe('UserController', function () {
|
|||
this.Features.hasFeature.withArgs('affiliations').returns(true)
|
||||
this.req.query.ensureAffiliation = true
|
||||
this.req.assertPermission = sinon.stub()
|
||||
await this.UserController.promises.ensureAffiliationMiddleware(
|
||||
await this.UserController.ensureAffiliationMiddleware(
|
||||
this.req,
|
||||
this.res,
|
||||
this.next
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue