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

Merge pull request #17153 from overleaf/ab-send-group-sso-invite-self

Browse source 
[web] Send the SSO linking invite when the group admin is adding self to the group

GitOrigin-RevId: f87ce6cfb006a0e353394e4102881e6220e5e6d9
This commit is contained in:
Alexandre Bourdin 2024-02-16 10:23:29 +01:00 committed by Copybot
parent cb5430f8b5
commit 42b5f91b9f
2 changed files with 62 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
services/web/app/src/Features/Subscription/TeamInvitesHandler.js
View file

@ -80,7 +80,9 @@ async function acceptInvite(token, userId) {
)
}
if (subscription.ssoConfig) {
const ssoConfig = await SSOConfig.findById(subscription.ssoConfig)
const ssoConfig = await SSOConfig.findById(
subscription.ssoConfig._id || subscription.ssoConfig
)
if (ssoConfig?.enabled) {
await Modules.promises.hooks.fire(
'scheduleGroupSSOReminder',
@ -153,6 +155,26 @@ async function _createInvite(subscription, email, inviter) {
// legacy: remove any invite that might have been created in the past
await _removeInviteFromTeam(subscription._id, email)
try {
if (subscription.ssoConfig) {
const ssoConfig = await SSOConfig.findById(
subscription.ssoConfig._id || subscription.ssoConfig
)
if (ssoConfig?.enabled) {
await Modules.promises.hooks.fire(
'sendGroupSSOReminder',
inviter._id,
subscription._id
)
}
}
} catch (error) {
logger.error(
{ err: error, userId: inviter._id, subscriptionId: subscription._id },
'Failed to schedule Group SSO invite for group admin'
)
}
return {
email: inviter.email,
first_name: inviter.first_name,

39
services/web/test/unit/src/Subscription/TeamInvitesHandlerTests.js
View file

@ -259,6 +259,45 @@ describe('TeamInvitesHandler', function () {
)
})
it('sends an SSO invite if SSO is enabled and inviting self', function (done) {
this.subscription.ssoConfig = new ObjectId('abc123abc123')
this.SSOConfig.findById
.withArgs(this.subscription.ssoConfig)
.resolves({ enabled: true })
this.TeamInvitesHandler.createInvite(
this.manager._id,
this.subscription,
this.manager.email,
(err, invite) => {
sinon.assert.calledWith(
this.Modules.promises.hooks.fire,
'sendGroupSSOReminder',
this.manager._id,
this.subscription._id
)
done(err)
}
)
})
it('does not send an SSO invite if SSO is disabled and inviting self', function (done) {
this.subscription.ssoConfig = new ObjectId('abc123abc123')
this.SSOConfig.findById
.withArgs(this.subscription.ssoConfig)
.resolves({ enabled: false })
this.TeamInvitesHandler.createInvite(
this.manager._id,
this.subscription,
this.manager.email,
(err, invite) => {
sinon.assert.notCalled(this.Modules.promises.hooks.fire)
done(err)
}
)
})
it('sends a notification if inviting registered user', function (done) {
const id = new ObjectId('6a6b3a8014829a865bbf700d')
const managedUsersEnabled = false