github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-03-22 02:04:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1865 from overleaf/ta-group-invite-self-view

Browse source 
Return User Data when Inviting Self in Group

GitOrigin-RevId: 5aeb9f0b21b84184a612ed730ac08dcb1c434f6e
This commit is contained in:
Simon Detheridge 2019-06-17 15:46:08 +01:00 committed by sharelatex
parent 7e1b4195c5
commit d189dad162
3 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
services/web/app/src/Features/Subscription/TeamInvitesController.js
View file

@ -37,14 +37,11 @@ module.exports = {
teamManagerId,
subscription,
email,
function(err, invite) {
function(err, inviteUserData) {
if (err != null) {
return next(err)
}
const inviteView = {
user: { email: invite.email, sentAt: invite.sentAt, invite: true }
}
return res.json(inviteView)
return res.json({ user: inviteUserData })
}
)
},

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

@ -161,7 +161,15 @@ var createInvite = function(subscription, email, inviter, callback) {
}
// legacy: remove any invite that might have been created in the past
removeInviteFromTeam(subscription._id, email, callback)
removeInviteFromTeam(subscription._id, email, error => {
const inviteUserData = {
email: inviter.email,
first_name: inviter.first_name,
last_name: inviter.last_name,
invite: false
}
callback(error, inviteUserData)
})
}
)
}
@ -194,9 +202,10 @@ var createInvite = function(subscription, email, inviter, callback) {
}/`,
appName: settings.appName
}
EmailHandler.sendEmail('verifyEmailToJoinTeam', opts, error =>
EmailHandler.sendEmail('verifyEmailToJoinTeam', opts, error => {
Object.assign(invite, { invite: true })
callback(error, invite)
)
})
})
})
}

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

@ -139,6 +139,7 @@ describe('TeamInvitesHandler', function() {
expect(invite.inviterName).to.eq(
'Daenerys Targaryen (daenerys@example.com)'
)
expect(invite.invite).to.be.true
expect(this.subscription.teamInvites).to.deep.include(invite)
done()
}
@ -220,6 +221,11 @@ describe('TeamInvitesHandler', function() {
this.manager._id
)
sinon.assert.notCalled(this.subscription.save)
expect(invite.token).to.not.exist
expect(invite.email).to.eq(this.manager.email)
expect(invite.first_name).to.eq(this.manager.first_name)
expect(invite.last_name).to.eq(this.manager.last_name)
expect(invite.invite).to.be.false
done(err)
}
)