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 #762 from sharelatex/afc-fix-domain-team-invites

Browse source 
Fix domain licences invites
This commit is contained in:
Alberto Fernández-Capel 2018-07-16 15:16:24 +01:00 committed by GitHub
commit 85999bbbec
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/web/app/coffee/Features/Subscription/TeamInvitesHandler.coffee
View file

@ -76,7 +76,7 @@ module.exports = TeamInvitesHandler =
return callback(err) if err?
return callback(new Errors.NotFoundError('invite not found')) unless invite?
SubscriptionUpdater.addUserToGroup subscription.admin_id, userId, (err) ->
SubscriptionUpdater.addUserToGroup subscription._id, userId, (err) ->
return callback(err) if err?
removeInviteFromTeam(subscription.id, invite.email, callback)

4
services/web/test/unit/coffee/Subscription/SubscriptionGroupHandlerTests.coffee
View file

@ -88,8 +88,8 @@ describe "SubscriptionGroupHandler", ->
done()
it "should add the user to the group", (done)->
@Handler.addUserToGroup @adminUser_id, @newEmail, (err)=>
@SubscriptionUpdater.addUserToGroup.calledWith(@adminUser_id, @user._id).should.equal true
@Handler.addUserToGroup @subscription_id, @newEmail, (err)=>
@SubscriptionUpdater.addUserToGroup.calledWith(@subscription_id, @user._id).should.equal true
done()
it "should not add the user to the group if the limit has been reached", (done)->

3
services/web/test/unit/coffee/Subscription/TeamInvitesHandlerTests.coffee
View file

@ -26,6 +26,7 @@ describe "TeamInvitesHandler", ->
@subscription = {
id: "55153a8014829a865bbf700d",
_id: new ObjectId("55153a8014829a865bbf700d"),
admin_id: @manager.id,
groupPlan: true,
member_ids: [],
@ -210,7 +211,7 @@ describe "TeamInvitesHandler", ->
it "adds the user to the team", (done) ->
@TeamInvitesHandler.acceptInvite "dddddddd", @user.id, =>
@SubscriptionUpdater.addUserToGroup.calledWith(@manager.id, @user.id).should.eq true
@SubscriptionUpdater.addUserToGroup.calledWith(@subscription._id, @user.id).should.eq true
done()
it "removes the invite from the subscription", (done) ->