From 3f6aa2369d57ebe93a7c3e9e5c1b0db7ba80cb10 Mon Sep 17 00:00:00 2001 From: Miguel Serrano Date: Wed, 8 Jan 2025 11:08:40 +0100 Subject: [PATCH] Merge pull request #21031 from overleaf/msm-clean-collabratec-tokens [web] cleanup collabratec tokens GitOrigin-RevId: 0ad73ca5d4c4c82d79e2ec7119c5b77a83b7086f --- services/web/app/src/Features/User/UserDeleter.js | 4 ++++ services/web/test/unit/src/User/UserDeleterTests.js | 11 +++++++++++ 2 files changed, 15 insertions(+) diff --git a/services/web/app/src/Features/User/UserDeleter.js b/services/web/app/src/Features/User/UserDeleter.js index d5437243a9..22d90f7b31 100644 --- a/services/web/app/src/Features/User/UserDeleter.js +++ b/services/web/app/src/Features/User/UserDeleter.js @@ -158,4 +158,8 @@ async function _cleanupUser(user) { await InstitutionsAPI.promises.deleteAffiliations(user._id) await SubscriptionUpdater.promises.removeUserFromAllGroups(user._id) await UserMembershipsHandler.promises.removeUserFromAllEntities(user._id) + await Modules.promises.hooks.fire('cleanupPersonalAccessTokens', user._id, [ + 'collabratec', + 'git_bridge', + ]) } diff --git a/services/web/test/unit/src/User/UserDeleterTests.js b/services/web/test/unit/src/User/UserDeleterTests.js index 31e7d70b2a..6489fea035 100644 --- a/services/web/test/unit/src/User/UserDeleterTests.js +++ b/services/web/test/unit/src/User/UserDeleterTests.js @@ -236,6 +236,17 @@ describe('UserDeleter', function () { ).to.have.been.calledWith(this.userId) }) + it('should cleanup collabratec access tokens', async function () { + await this.UserDeleter.promises.deleteUser(this.userId, { + ipAddress: this.ipAddress, + }) + expect(this.Modules.promises.hooks.fire).to.have.been.calledWith( + 'cleanupPersonalAccessTokens', + this.userId, + ['collabratec', 'git_bridge'] + ) + }) + it('should fire the deleteUser hook for modules', async function () { await this.UserDeleter.promises.deleteUser(this.userId, { ipAddress: this.ipAddress,