Skip to content

Don't enable payment verification mode if they already have a sub (Fixes #642) #644

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
MelissaAutumn merged 1 commit into from
Mar 17, 2026
Merged

Don't enable payment verification mode if they already have a sub (Fixes #642) #644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion src/thunderbird_accounts/mail/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ def decode_app_password(secret):


def create_stalwart_account(user, app_password: Optional[str] = None) -> bool:
# Run this immediately for now, in the future we'll ship these to celery
if user.account_set.count() > 0 and user.account_set.first().stalwart_id:
return False

Expand Down
7 changes: 5 additions & 2 deletions src/thunderbird_accounts/subscription/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,11 @@ def paddle_transaction_complete(request: HttpRequest, paddle: Client):
status = transaction.status.value

if transaction and status in [Transaction.StatusValues.COMPLETED.value, Transaction.StatusValues.PAID.value]:
user.is_awaiting_payment_verification = True
user.save()
# Only set enable payment verification mode if they don't have an active subscription
# As the webhook could technically come in before or during this successUrl redirect...
if not user.has_active_subscription:
user.is_awaiting_payment_verification = True
user.save()

if settings.IS_DEV:
tasks.dev_only_paddle_fake_webhook.delay(transaction_id=transaction_id, user_uuid=user.uuid.hex)
Expand Down
Loading