krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-14 21:27:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Prevent server from cancelling still active subs (#11795)

Browse Source 
* Prevent server from cancelling still active subs

* Allow subs to be cancelled before end date

* fix test

* fix test
This commit is contained in:
Phillip Thelen
2020-02-11 19:58:11 +01:00
committed by GitHub
parent 732426c176
commit 0648f5d412
2 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
test/api/unit/libs/payments/google.test.js
View File

@@ -278,19 +278,6 @@ describe('Google Payments', () => {
}); });
}); });
it('should throw an error if subscription is still valid', async () => {
iap.getPurchaseData.restore();
iapGetPurchaseDataStub = sinon.stub(iap, 'getPurchaseData')
.returns([{ expirationDate: expirationDate.add({ day: 1 }).toDate() }]);
await expect(googlePayments.cancelSubscribe(user, headers))
.to.eventually.be.rejected.and.to.eql({
httpCode: 401,
name: 'NotAuthorized',
message: googlePayments.constants.RESPONSE_STILL_VALID,
});
});
it('should throw an error if receipt is invalid', async () => { it('should throw an error if receipt is invalid', async () => {
iap.isValidated.restore(); iap.isValidated.restore();
iapIsValidatedStub = sinon.stub(iap, 'isValidated') iapIsValidatedStub = sinon.stub(iap, 'isValidated')

5
website/server/libs/payments/google.js
View File

@@ -234,6 +234,9 @@ api.cancelSubscribe = async function cancelSubscribe (user, headers) {
const purchases = iap.getPurchaseData(googleRes); const purchases = iap.getPurchaseData(googleRes);
if (purchases.length === 0) throw new NotAuthorized(this.constants.RESPONSE_INVALID_RECEIPT); if (purchases.length === 0) throw new NotAuthorized(this.constants.RESPONSE_INVALID_RECEIPT);
const subscriptionData = purchases[0]; const subscriptionData = purchases[0];
// Check to make sure the sub isn't active anymore.
if (subscriptionData.autoRenews) return;
dateTerminated = new Date(Number(subscriptionData.expirationDate)); dateTerminated = new Date(Number(subscriptionData.expirationDate));
} catch (err) { } catch (err) {
// Status:410 means that the subsctiption isn't active anymore and we can safely delete it // Status:410 means that the subsctiption isn't active anymore and we can safely delete it
@@ -244,8 +247,6 @@ api.cancelSubscribe = async function cancelSubscribe (user, headers) {
} }
} }
if (dateTerminated > new Date()) throw new NotAuthorized(this.constants.RESPONSE_STILL_VALID);
await payments.cancelSubscription({ await payments.cancelSubscription({
user, user,
nextBill: dateTerminated, nextBill: dateTerminated,