github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-04-26 07:42:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2638 from overleaf/ta-subscription-change-admin-fix

Browse source 
Change Manager When Changing Admin of Individual Subscriptions

GitOrigin-RevId: 3da53789f4331c4eb8d0a458650ea41f8b2b4f97
This commit is contained in:
Timothée Alby 2020-02-28 10:08:20 -05:00 • committed by Copybot
parent bb722f3bff
commit 42aa999af6
2 changed files with 42 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
services/web/app/src/Features/Subscription/SubscriptionUpdater.js
View file

@ -12,7 +12,10 @@ const { DeletedSubscription } = require('../../models/DeletedSubscription')
const SubscriptionUpdater = {
/**
* Change the admin of the given subscription
* Change the admin of the given subscription.
*
* If the subscription is a group, add the new admin as manager while keeping
* the old admin. Otherwise, replace the manager.
*
* Validation checks are assumed to have been made:
* * subscription exists
@ -22,14 +25,18 @@ const SubscriptionUpdater = {
*
* If the subscription is Recurly, we silently do nothing.
*/
updateAdmin(subscriptionId, adminId, callback) {
updateAdmin(subscription, adminId, callback) {
const query = {
_id: ObjectId(subscriptionId),
_id: ObjectId(subscription._id),
customAccount: true
}
const update = {
$set: { admin_id: ObjectId(adminId) },
$addToSet: { manager_ids: ObjectId(adminId) }
$set: { admin_id: ObjectId(adminId) }
}
if (subscription.groupPlan) {
update.$addToSet = { manager_ids: ObjectId(adminId) }
} else {
update.$set.manager_ids = [ObjectId(adminId)]
}
Subscription.update(query, update, callback)
},

31
services/web/test/unit/src/Subscription/SubscriptionUpdaterTests.js
View file

@ -120,8 +120,9 @@ describe('SubscriptionUpdater', function() {
describe('updateAdmin', function() {
it('should update the subscription admin', function(done) {
this.subscription.groupPlan = true
this.SubscriptionUpdater.updateAdmin(
this.subscription._id,
this.subscription,
this.otherUserId,
err => {
if (err != null) {
@ -144,6 +145,34 @@ describe('SubscriptionUpdater', function() {
}
)
})
it('should remove the manager for non-group subscriptions', function(done) {
this.SubscriptionUpdater.updateAdmin(
this.subscription,
this.otherUserId,
err => {
if (err != null) {
return done(err)
}
const query = {
_id: ObjectId(this.subscription._id),
customAccount: true
}
const update = {
$set: {
admin_id: ObjectId(this.otherUserId),
manager_ids: [ObjectId(this.otherUserId)]
}
}
this.SubscriptionModel.update.should.have.been.calledOnce
this.SubscriptionModel.update.should.have.been.calledWith(
query,
update
)
done()
}
)
})
})
describe('syncSubscription', function() {