agw/overleaf-cep
1
0
Fork 0
mirror of https://github.com/yu-i-i/overleaf-cep.git synced 2026-11-12 13:13:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

[web] fix: Always unlink group SSO when a linked user leaves a group (#35895)

Browse Source 
GitOrigin-RevId: f3a9cc5fec2b8950826aef02bdfe7ed72607f56b
This commit is contained in:
Simon Gardner
2026-09-17 11:41:03 +00:00
committed by Copybot
parent be9ab57d18
commit c40952813c
2 changed files with 38 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/web/app/src/Features/Subscription/SubscriptionGroupController.mjs
+7 -4
View File
@@ -86,10 +86,13 @@ async function _removeUserFromGroup(
) {
const subscriptionId = subscription._id
const groupSSOActive = (
await Modules.promises.hooks.fire('hasGroupSSOEnabled', subscription)
)?.[0]
if (groupSSOActive) {
const userToRemove = await UserGetter.promises.getUser(userToRemoveId, {
enrollment: 1,
})
const isLinkedToGroupSSO = userToRemove?.enrollment?.sso?.some(
ssoLink => String(ssoLink.groupId) === String(subscriptionId)
)
if (isLinkedToGroupSSO) {
await Modules.promises.hooks.fire(
'unlinkUserFromGroupSSO',
userToRemoveId,
services/web/test/unit/src/Subscription/SubscriptionGroupController.test.mjs
+31 -35
View File
@@ -110,6 +110,10 @@ describe('SubscriptionGroupController', function () {
ctx.UserGetter = {
promises: {
getUserEmail: sinon.stub().resolves(ctx.user.email),
getUser: sinon.stub().resolves({
_id: ctx.user._id,
enrollment: { sso: [{ groupId: ctx.subscriptionId }] },
}),
},
}
@@ -275,20 +279,18 @@ describe('SubscriptionGroupController', function () {
})
})
it('should call the group SSO hooks with group SSO enabled', async function (ctx) {
it('should unlink the user from group SSO when they are linked, even if SSO is disabled', async function (ctx) {
await new Promise(resolve => {
const userIdToRemove = '31231'
ctx.req.params = { user_id: userIdToRemove }
ctx.req.entity = ctx.subscription
ctx.Modules.promises.hooks.fire
.withArgs('hasGroupSSOEnabled', ctx.subscription)
.resolves([true])
ctx.UserGetter.promises.getUser.resolves({
_id: userIdToRemove,
enrollment: { sso: [{ groupId: ctx.subscriptionId }] },
})
const res = {
sendStatus: () => {
ctx.Modules.promises.hooks.fire
.calledWith('hasGroupSSOEnabled', ctx.subscription)
.should.equal(true)
ctx.Modules.promises.hooks.fire
.calledWith(
'unlinkUserFromGroupSSO',
@@ -296,7 +298,6 @@ describe('SubscriptionGroupController', function () {
ctx.subscriptionId
)
.should.equal(true)
sinon.assert.calledTwice(ctx.Modules.promises.hooks.fire)
resolve()
},
}
@@ -304,21 +305,21 @@ describe('SubscriptionGroupController', function () {
})
})
it('should call the group SSO hooks with group SSO disabled', async function (ctx) {
it('should not unlink the user when they have no group SSO link', async function (ctx) {
await new Promise(resolve => {
const userIdToRemove = '31231'
ctx.req.params = { user_id: userIdToRemove }
ctx.req.entity = ctx.subscription
ctx.Modules.promises.hooks.fire
.withArgs('hasGroupSSOEnabled', ctx.subscription)
.resolves([false])
ctx.UserGetter.promises.getUser.resolves({
_id: userIdToRemove,
enrollment: { sso: [] },
})
const res = {
sendStatus: () => {
ctx.Modules.promises.hooks.fire
.calledWith('hasGroupSSOEnabled', ctx.subscription)
.should.equal(true)
sinon.assert.calledOnce(ctx.Modules.promises.hooks.fire)
.calledWith('unlinkUserFromGroupSSO')
.should.equal(false)
resolve()
},
}
@@ -379,21 +380,18 @@ describe('SubscriptionGroupController', function () {
})
})
it('should call the group SSO hooks with group SSO enabled', async function (ctx) {
it('should unlink the user from group SSO when they are linked, even if SSO is disabled', async function (ctx) {
await new Promise(resolve => {
ctx.req.query = { subscriptionId: ctx.subscriptionId }
const memberUserIdToremove = '123456789'
ctx.req.session.user._id = memberUserIdToremove
ctx.Modules.promises.hooks.fire
.withArgs('hasGroupSSOEnabled', ctx.subscription)
.resolves([true])
ctx.UserGetter.promises.getUser.resolves({
_id: memberUserIdToremove,
enrollment: { sso: [{ groupId: ctx.subscriptionId }] },
})
const res = {
sendStatus: () => {
ctx.Modules.promises.hooks.fire
.calledWith('hasGroupSSOEnabled', ctx.subscription)
.should.equal(true)
ctx.Modules.promises.hooks.fire
.calledWith(
'unlinkUserFromGroupSSO',
@@ -401,7 +399,6 @@ describe('SubscriptionGroupController', function () {
ctx.subscriptionId
)
.should.equal(true)
sinon.assert.calledTwice(ctx.Modules.promises.hooks.fire)
resolve()
},
}
@@ -409,22 +406,21 @@ describe('SubscriptionGroupController', function () {
})
})
it('should call the group SSO hooks with group SSO disabled', async function (ctx) {
it('should not unlink the user when they have no group SSO link', async function (ctx) {
await new Promise(resolve => {
const userIdToRemove = '31231'
ctx.req.session.user._id = userIdToRemove
ctx.req.params = { user_id: userIdToRemove }
ctx.req.entity = ctx.subscription
ctx.Modules.promises.hooks.fire
.withArgs('hasGroupSSOEnabled', ctx.subscription)
.resolves([false])
ctx.req.query = { subscriptionId: ctx.subscriptionId }
const memberUserIdToremove = '123456789'
ctx.req.session.user._id = memberUserIdToremove
ctx.UserGetter.promises.getUser.resolves({
_id: memberUserIdToremove,
enrollment: { sso: [] },
})
const res = {
sendStatus: () => {
ctx.Modules.promises.hooks.fire
.calledWith('hasGroupSSOEnabled', ctx.subscription)
.should.equal(true)
sinon.assert.calledOnce(ctx.Modules.promises.hooks.fire)
.calledWith('unlinkUserFromGroupSSO')
.should.equal(false)
resolve()
},
}