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

Merge pull request #25296 from overleaf/kh-support-upgrading-stripe-subscription

Browse Source 
[web] support upgrading Stripe subscription

GitOrigin-RevId: 2663ca8f1c028a45cf47d3ab37c387c4f4b39f9a
This commit is contained in:
M Fahru
2025-05-08 08:06:47 +00:00
committed by Copybot
parent e5e4159392
commit 38e06c527c
2 changed files with 57 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/web/app/src/Features/Subscription/SubscriptionHandler.js
+7 -7
View File
@@ -101,18 +101,18 @@ async function updateSubscription(user, planCode) {
if (
!hasSubscription ||
subscription == null ||
subscription.recurlySubscription_id == null
(subscription.recurlySubscription_id == null &&
subscription.paymentProvider?.subscriptionId == null)
) {
return
}
const recurlySubscriptionId = subscription.recurlySubscription_id
const recurlySubscription = await RecurlyClient.promises.getSubscription(
recurlySubscriptionId
await Modules.promises.hooks.fire(
'updatePaidSubscription',
subscription,
planCode,
user._id
)
const changeRequest = recurlySubscription.getRequestForPlanChange(planCode)
await RecurlyClient.promises.applySubscriptionChangeRequest(changeRequest)
await syncSubscription({ uuid: recurlySubscriptionId }, user._id)
}
/**
services/web/test/unit/src/Subscription/SubscriptionHandlerTests.js
+50 -83
View File
@@ -4,7 +4,6 @@ const chai = require('chai')
const { expect } = chai
const {
PaymentProviderSubscription,
PaymentProviderSubscriptionChangeRequest,
} = require('../../../../app/src/Features/Subscription/PaymentProviderEntities')
const MODULE_PATH =
@@ -258,97 +257,65 @@ describe('SubscriptionHandler', function () {
})
describe('updateSubscription', function () {
describe('with a user with a subscription', function () {
beforeEach(async function () {
this.user.id = this.activeRecurlySubscription.account.account_code
this.User.findById = (userId, projection) => ({
exec: () => {
userId.should.equal(this.user.id)
return Promise.resolve(this.user)
},
})
this.plan_code = 'professional'
this.LimitationsManager.promises.userHasSubscription.resolves({
hasSubscription: true,
subscription: this.subscription,
})
await this.SubscriptionHandler.promises.updateSubscription(
this.user,
this.plan_code
)
})
it('should update the subscription', function () {
expect(
this.RecurlyClient.promises.applySubscriptionChangeRequest
).to.have.been.calledWith(
new PaymentProviderSubscriptionChangeRequest({
subscription: this.activeRecurlyClientSubscription,
timeframe: 'now',
planCode: this.plan_code,
})
)
})
it('should sync the new subscription to the user', function () {
expect(this.SubscriptionUpdater.promises.syncSubscription).to.have.been
.called
this.SubscriptionUpdater.promises.syncSubscription.args[0][0].should.deep.equal(
this.activeRecurlySubscription
)
this.SubscriptionUpdater.promises.syncSubscription.args[0][1].should.deep.equal(
this.user._id
)
beforeEach(function () {
this.user.id = this.activeRecurlySubscription.account.account_code
this.User.findById = (userId, projection) => ({
exec: () => {
userId.should.equal(this.user.id)
return Promise.resolve(this.user)
},
})
})
describe('when plan(s) could not be located in settings', function () {
beforeEach(async function () {
this.user.id = this.activeRecurlySubscription.account.account_code
this.User.findById = (userId, projection) => ({
exec: () => {
userId.should.equal(this.user.id)
return Promise.resolve(this.user)
},
})
this.LimitationsManager.promises.userHasSubscription.resolves({
hasSubscription: true,
subscription: this.subscription,
})
})
it('should be rejected and should not update the subscription', function () {
expect(
this.SubscriptionHandler.promises.updateSubscription(
this.user,
'unknown-plan'
)
).to.be.rejected
this.RecurlyClient.promises.applySubscriptionChangeRequest.called.should.equal(
false
)
it('should not fire updatePaidSubscription hook if user has no subscription', async function () {
this.LimitationsManager.promises.userHasSubscription.resolves({
hasSubscription: false,
subscription: null,
})
await this.SubscriptionHandler.promises.updateSubscription(
this.user,
this.plan_code
)
expect(this.Modules.promises.hooks.fire).to.not.have.been.calledWith(
'updatePaidSubscription',
sinon.match.any,
sinon.match.any,
sinon.match.any
)
})
describe('with a user without a subscription', function () {
beforeEach(async function () {
this.LimitationsManager.promises.userHasSubscription.resolves(false)
await this.SubscriptionHandler.promises.updateSubscription(
this.user,
this.plan_code
)
it('should not fire updatePaidSubscription hook if user has custom subscription', async function () {
this.LimitationsManager.promises.userHasSubscription.resolves({
hasSubscription: true,
subscription: { customAccount: true },
})
await this.SubscriptionHandler.promises.updateSubscription(
this.user,
this.plan_code
)
expect(this.Modules.promises.hooks.fire).to.not.have.been.calledWith(
'updatePaidSubscription',
sinon.match.any,
sinon.match.any,
sinon.match.any
)
})
it('should redirect to the subscription dashboard', function () {
this.RecurlyClient.promises.applySubscriptionChangeRequest.called.should.equal(
false
)
this.SubscriptionUpdater.promises.syncSubscription.called.should.equal(
false
)
it('should fire updatePaidSubscription to update a valid subscription', async function () {
this.LimitationsManager.promises.userHasSubscription.resolves({
hasSubscription: true,
subscription: this.subscription,
})
await this.SubscriptionHandler.promises.updateSubscription(
this.user,
this.plan_code
)
expect(this.Modules.promises.hooks.fire).to.have.been.calledWith(
'updatePaidSubscription',
this.subscription,
this.plan_code,
this.user._id
)
})
})