Skip to content

fix: deleting an account with gifted subscription #2790

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sshanzel merged 3 commits into from
May 4, 2025
Merged

fix: deleting an account with gifted subscription #2790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bd100bb
fix: deleting an account with gifted subscription
sshanzel May 2, 2025
8f755f0
refactor: error logging
sshanzel May 2, 2025
e038f91
test: gifted user cancellation
sshanzel May 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions __tests__/users.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4059,6 +4059,27 @@ describe('mutation deleteUser', () => {
expect(userOne).toEqual(null);
});

it('should not call cancel subscription for gifted subscription', async () => {
loggedUser = '1';

await con.getRepository(User).update(
{ id: '1' },
{
subscriptionFlags: updateSubscriptionFlags({
subscriptionId: '123',
provider: SubscriptionProvider.Paddle,
giftExpirationDate: new Date(Date.now() + 86400000), // 1 day from now
}),
},
);

await client.mutate(MUTATION);

expect(cancelSubscription).not.toHaveBeenCalled();
const userOne = await con.getRepository(User).findOneBy({ id: '1' });
expect(userOne).toEqual(null);
});

describe('when user has a storekit subscription', () => {
beforeEach(async () => {
await saveFixtures(con, User, [
Expand Down
11 changes: 8 additions & 3 deletions src/common/user.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,18 @@ export const deleteUser = async (
}

if (subscriptionFlags?.provider === SubscriptionProvider.Paddle) {
await cancelSubscription({
subscriptionId: subscriptionFlags.subscriptionId,
});
const isGifted = !!subscriptionFlags.giftExpirationDate;
// gifted subscription is a one-time payment hence not considered subscription in Paddle's terms
if (!isGifted) {
await cancelSubscription({
subscriptionId: subscriptionFlags.subscriptionId,
});
}
logger.info(
{
provider: SubscriptionProvider.Paddle,
userId,
isGifted,
subscriptionId: subscriptionFlags.subscriptionId,
},
'Subscription cancelled user deletion',
Expand Down
Loading