sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-17 09:22:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'apple_sub_fix' of https://github.com/HabitRPG/habitica into apple_sub_fix

Browse source 
# Conflicts:
#	test/api/unit/libs/payments/apple.test.js
#	website/server/libs/payments/subscriptions.js
This commit is contained in:
Phillip Thelen 2023-02-06 11:19:00 +01:00
commit 87aebcc19e
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
website/server/libs/payments/subscriptions.js
View file

@ -116,6 +116,22 @@ async function prepareSubscriptionValues (data) {
let recipientIsSubscribed = recipient.isSubscribed();
let isNewSubscription = !recipientIsSubscribed
if (data.user && !data.gift && !data.groupId) {
const unlockedUser = await User.findOneAndUpdate(
{
_id: data.user._id,
$or: [
{ _subSignature: 'NOT_RUNNING' },
{ _subSignature: { $exists: false } },
],
},
{ $set: { _subSignature: 'SUB_IN_PROGRESS' } },
);
if (!unlockedUser) {
throw new NotFound('User not found or subscription already processing.');
}
}
// If we are buying a group subscription
if (data.groupId) {
const groupFields = basicGroupFields.concat(' purchased');