github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #11965 from overleaf/lg-deleteFeedback

Browse source 
[web] Delete user data from feedbacks collection when user is deleted

GitOrigin-RevId: 39a98cffb2e42c261c7095d8937fb6cdaf0977f9
This commit is contained in:
ilkin-overleaf 2023-02-28 11:24:26 +02:00 committed by Copybot
parent 38cdd77890
commit fed5ad87a1
2 changed files with 24 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
services/web/app/src/Features/User/UserDeleter.js
View file

@ -4,6 +4,7 @@ const moment = require('moment')
const { User } = require('../../models/User')
const { DeletedUser } = require('../../models/DeletedUser')
const { UserAuditLogEntry } = require('../../models/UserAuditLogEntry')
const { Feedback } = require('../../models/Feedback')
const NewsletterManager = require('../Newsletter/NewsletterManager')
const ProjectDeleter = require('../Project/ProjectDeleter')
const SubscriptionHandler = require('../Subscription/SubscriptionHandler')
@ -70,6 +71,8 @@ async function expireDeletedUser(userId) {
'deleterData.deletedUserId': userId,
}).exec()
await Feedback.deleteMany({ userId }).exec()
deletedUser.user = undefined
deletedUser.deleterData.deleterIpAddress = undefined
await deletedUser.save()

30
services/web/test/unit/src/User/UserDeleterTests.js
View file

@ -92,10 +92,15 @@ describe('UserDeleter', function () {
promises: { hooks: { fire: sinon.stub().resolves() } },
}
this.Feedback = {
deleteMany: sinon.stub().returns({ exec: sinon.stub().resolves() }),
}
this.UserDeleter = SandboxedModule.require(modulePath, {
requires: {
'../../models/User': { User },
'../../models/DeletedUser': { DeletedUser },
'../../models/Feedback': { Feedback: this.Feedback },
'../Newsletter/NewsletterManager': this.NewsletterManager,
'./UserSessionsManager': this.UserSessionsManager,
'../Subscription/SubscriptionHandler': this.SubscriptionHandler,
@ -467,7 +472,7 @@ describe('UserDeleter', function () {
this.mockedDeletedUser.expects('save').resolves()
this.DeletedUserMock.expects('findOne')
.withArgs({ 'deleterData.deletedUserId': 'giraffe' })
.withArgs({ 'deleterData.deletedUserId': this.userId })
.chain('exec')
.resolves(this.deletedUser)
})
@ -477,41 +482,48 @@ describe('UserDeleter', function () {
})
it('should find the user by user ID', async function () {
await this.UserDeleter.promises.expireDeletedUser('giraffe')
await this.UserDeleter.promises.expireDeletedUser(this.userId)
this.DeletedUserMock.verify()
})
it('should remove the user data from mongo', async function () {
await this.UserDeleter.promises.expireDeletedUser('giraffe')
await this.UserDeleter.promises.expireDeletedUser(this.userId)
expect(this.deletedUser.user).not.to.exist
})
it('should remove the IP address from mongo', async function () {
await this.UserDeleter.promises.expireDeletedUser('giraffe')
await this.UserDeleter.promises.expireDeletedUser(this.userId)
expect(this.deletedUser.deleterData.ipAddress).not.to.exist
})
it('should not delete other deleterData fields', async function () {
await this.UserDeleter.promises.expireDeletedUser('giraffe')
await this.UserDeleter.promises.expireDeletedUser(this.userId)
expect(this.deletedUser.deleterData.deletedUserId).to.equal(this.userId)
})
it('should save the record to mongo', async function () {
await this.UserDeleter.promises.expireDeletedUser('giraffe')
await this.UserDeleter.promises.expireDeletedUser(this.userId)
this.mockedDeletedUser.verify()
})
it('should fire the expireDeletedUser hook for modules', async function () {
await this.UserDeleter.promises.expireDeletedUser('giraffe')
await this.UserDeleter.promises.expireDeletedUser(this.userId)
expect(this.Modules.promises.hooks.fire).to.have.been.calledWith(
'expireDeletedUser',
'giraffe'
this.userId
)
})
it('should delete Feeback', async function () {
await this.UserDeleter.promises.expireDeletedUser(this.userId)
expect(this.Feedback.deleteMany).to.have.been.calledWith({
userId: this.userId,
})
})
describe('when called as a callback', function () {
it('should expire the user', function (done) {
this.UserDeleter.expireDeletedUser('giraffe', err => {
this.UserDeleter.expireDeletedUser(this.userId, err => {
expect(err).not.to.exist
this.DeletedUserMock.verify()
this.mockedDeletedUser.verify()