A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.
feat(billing): dispute buy block, receipt email rule, new waiver
Hampusbb569d92d805
diff --git a/fluxer_api/src/api/store_billing/StoreBillingController.ts b/fluxer_api/src/api/store_billing/StoreBillingController.tsindex 92563c780..e792caa2b 100644--- a/fluxer_api/src/api/store_billing/StoreBillingController.ts+++ b/fluxer_api/src/api/store_billing/StoreBillingController.ts@@ -7,9 +7,10 @@ import {DefaultUserOnly, LoginRequired} from '@app/api/middleware/AuthMiddlewareimport {HostedOnlyRoute} from '@app/api/middleware/BillingRouteAvailability';import {RateLimitMiddleware} from '@app/api/middleware/RateLimitMiddleware';import {OpenAPI} from '@app/api/middleware/ResponseTypeMiddleware';-import {getGooglePlayPushVerifier} from '@app/api/middleware/ServiceSingletons';+import {getGooglePlayPushVerifier, getPaymentDisputeRepository} from '@app/api/middleware/ServiceSingletons';import {SudoModeMiddleware} from '@app/api/middleware/SudoModeMiddleware';import type {User} from '@app/api/models/User';+import {hasOpenPaymentDispute} from '@app/api/payment_disputes/PaymentDisputeReviews';import {RateLimitConfigs} from '@app/api/RateLimitConfig';import {AppStoreJwsVerificationError, verifyNotification} from '@app/api/store_billing/app_store/AppStoreJwsVerifier';import {parseGooglePlayPushEnvelope} from '@app/api/store_billing/google_play/GooglePlayPushVerifier';@@ -23,6 +24,7 @@ import {mapStorePurchaseToResponse} from '@app/api/store_billing/StoreBillingMapimport type {StoreEntitlementService} from '@app/api/store_billing/StoreEntitlementService';import {isStripeSubscriptionActive} from '@app/api/store_billing/StoreEntitlementWriter';import type {HonoApp} from '@app/api/types/HonoEnv';+import {PAYMENT_DISPUTE_REASON_CAPABILITY, type TierContext, tierContextFrom} from '@app/api/user/AccountTier';import {Validator} from '@app/api/Validator';import {PremiumFlags, UserPremiumTypes} from '@fluxer/constants/src/UserConstants';import {StoreBillingUnavailableError} from '@fluxer/errors/src/domains/payment/StoreBillingUnavailableError';@@ -43,6 +45,7 @@ const AppStoreNotificationBody = z.object({signedPayload: z.string().min(1)});async function buildStoreBillingContext(user: User,storeEntitlementService: StoreEntitlementService,+ tierContext: TierContext,): Promise<StoreBillingContextResponse> {const appStoreEnabled = isAppStoreConfigured();const googlePlayEnabled = isGooglePlayConfigured();@@ -56,6 +59,10 @@ async function buildStoreBillingContext(purchaseBlockedReason = 'lifetime';} else if ((user.premiumFlags & PremiumFlags.PURCHASE_DISABLED) !== 0) {purchaseBlockedReason = 'purchase_disabled';+ } else if (await hasOpenPaymentDispute(getPaymentDisputeRepository(), user.id)) {+ purchaseBlockedReason = tierContext.capabilities.has(PAYMENT_DISPUTE_REASON_CAPABILITY)+ ? 'payment_dispute_open'+ : 'purchase_disabled';} else if (storeEntitlement) {purchaseBlockedReason = 'existing_subscription';blockingProvider = storeEntitlement.provider;@@ -106,7 +113,9 @@ export function StoreBillingController(app: HonoApp) {tags: 'Premium',}),async (ctx) => {- return ctx.json(await buildStoreBillingContext(ctx.get('user'), ctx.get('storeEntitlementService')));+ return ctx.json(+ await buildStoreBillingContext(ctx.get('user'), ctx.get('storeEntitlementService'), tierContextFrom(ctx)),+ );},);app.post(diff --git a/fluxer_api/src/api/store_billing/StoreEntitlementServiceFactory.ts b/fluxer_api/src/api/store_billing/StoreEntitlementServiceFactory.tsindex e26464819..6920a191f 100644--- a/fluxer_api/src/api/store_billing/StoreEntitlementServiceFactory.ts+++ b/fluxer_api/src/api/store_billing/StoreEntitlementServiceFactory.ts@@ -7,6 +7,7 @@ import type {UserCacheService} from '@app/api/infrastructure/UserCacheService';import {getAppStoreServerApiClient,getGooglePlayDeveloperApiClient,+ getPaymentDisputeRepository,getStoreBillingRepository,} from '@app/api/middleware/ServiceSingletons';import {StoreEntitlementService} from '@app/api/store_billing/StoreEntitlementService';@@ -38,5 +39,6 @@ export function createStoreEntitlementService(params: StoreEntitlementServiceFacparams.gatewayService,params.premiumStateReconciliationQueueService,),+ paymentDisputeRepository: getPaymentDisputeRepository(),});}diff --git a/fluxer_api/src/api/store_billing/tests/StoreBillingAppStore.test.ts b/fluxer_api/src/api/store_billing/tests/StoreBillingAppStore.test.tsindex 58affd2b6..065e5c979 100644--- a/fluxer_api/src/api/store_billing/tests/StoreBillingAppStore.test.ts+++ b/fluxer_api/src/api/store_billing/tests/StoreBillingAppStore.test.ts@@ -7,7 +7,11 @@ import {Config} from '@app/api/Config';import {upsertOne} from '@app/api/database/CassandraQueryExecution';import {Db} from '@app/api/database/CassandraTypes';import {getKVClient} from '@app/api/middleware/ServiceRegistry';-import {getStoreBillingRepository, getUserRepository} from '@app/api/middleware/ServiceSingletons';+import {+ getPaymentDisputeRepository,+ getStoreBillingRepository,+ getUserRepository,+} from '@app/api/middleware/ServiceSingletons';import {addGiftCodeDuration} from '@app/api/models/GiftCode';import type {User} from '@app/api/models/User';import {setInjectedAppleRootCertificates} from '@app/api/store_billing/app_store/AppleRootCertificates';@@ -19,6 +23,7 @@ import {findUser,getStoreContext,installStoreBillingWorker,+ seedOpenPaymentDisputeReview,setTestPremium,uninstallStoreBillingWorker,} from '@app/api/store_billing/tests/StoreBillingTestUtils';@@ -253,6 +258,27 @@ describe('App Store purchases', () => {};}+ it('applies a claim made while a payment dispute is open and flags the review once', async () => {+ const account = await createTestAccount(harness);+ const userId = createUserID(BigInt(account.userId));+ await seedOpenPaymentDisputeReview(userId, 'dp_store_claim_open');+ await seedOpenPaymentDisputeReview(userId, 'dp_store_claim_closed');+ const closed = await getPaymentDisputeRepository().findReview('dp_store_claim_closed');+ await getPaymentDisputeRepository().updateReview(closed!, {closed_at: Db.set(new Date()), outcome: Db.set('won')});+ const token = await accountToken(account);+ const originalTransactionId = seedSubscription({expiresDate: Date.now() + ms('30 days'), appAccountToken: token});+ const jws = await signStoredTransaction('production', originalTransactionId);+ const first = await claim(account, jws);+ expect(first.purchase.entitled).toBe(true);+ const flagged = await getPaymentDisputeRepository().findReview('dp_store_claim_open');+ expect(flagged?.dispute_purchase_at).toBeInstanceOf(Date);+ expect((await getPaymentDisputeRepository().findReview('dp_store_claim_closed'))?.dispute_purchase_at).toBeNull();+ await claim(account, jws);+ expect((await getPaymentDisputeRepository().findReview('dp_store_claim_open'))?.dispute_purchase_at).toEqual(+ flagged?.dispute_purchase_at,+ );+ });+it('grants premium for a claim that includes the account token and answers repeats the same way', async () => {const account = await createTestAccount(harness);const token = await accountToken(account);diff --git a/fluxer_api/src/api/store_billing/tests/StoreBillingTestUtils.ts b/fluxer_api/src/api/store_billing/tests/StoreBillingTestUtils.tsindex 1301d5eae..ac45fd98a 100644--- a/fluxer_api/src/api/store_billing/tests/StoreBillingTestUtils.ts+++ b/fluxer_api/src/api/store_billing/tests/StoreBillingTestUtils.ts@@ -1,6 +1,7 @@// SPDX-License-Identifier: AGPL-3.0-or-laterimport {createUserID, type UserID} from '@app/api/BrandedTypes';+import type {PaymentDisputeReviewRow} from '@app/api/database/types/PaymentDisputeTypes';import type {StorePurchaseRow} from '@app/api/database/types/StoreBillingTypes';import {getGatewayService,@@ -9,6 +10,7 @@ import {setInjectedWorkerService,} from '@app/api/middleware/ServiceRegistry';import {+ getPaymentDisputeRepository,getPremiumStateReconciliationQueueService,getStoreBillingRepository,getUserCacheService,@@ -117,6 +119,56 @@ export async function seedStorePurchase(return row;}+export async function seedOpenPaymentDisputeReview(+ purchaserId: UserID,+ disputeId: string,+): Promise<PaymentDisputeReviewRow> {+ const now = new Date();+ const review: PaymentDisputeReviewRow = {+ dispute_id: disputeId,+ product: 'plutonium',+ order_id: `cs_${disputeId}`,+ invoice_number: null,+ purchaser_id: purchaserId,+ is_gift: false,+ reason: 'general',+ payment_intent_id: `pi_${disputeId}`,+ charge_id: `ch_${disputeId}`,+ amount_minor: 499,+ currency: 'USD',+ evidence_submitted: false,+ evidence_due_by: new Date(now.getTime() + ms('10 days')),+ disputed_at: now,+ closed_at: null,+ outcome: null,+ purchased_at: new Date(now.getTime() - ms('30 days')),+ perks_started_at: new Date(now.getTime() - ms('30 days')),+ withdrawal_ends_at: new Date(now.getTime() - ms('16 days')),+ withdrawn_at: null,+ refunded_at: null,+ perks_removed_at: null,+ status: 'open',+ created_at: now,+ decided_at: null,+ decided_by: null,+ decision_note: null,+ warning_deadline: null,+ warned_at: null,+ warning_email_sent_at: null,+ warning_dm_sent_at: null,+ enforcement_decision_id: null,+ reversed_at: null,+ reversed_by: null,+ reversal_note: null,+ dispute_purchase_at: null,+ version: 1,+ };+ if (!(await getPaymentDisputeRepository().createReview(review))) {+ throw new Error(`Payment dispute review ${disputeId} already exists`);+ }+ return review;+}+export async function findUser(userId: string): Promise<User> {const user = await getUserRepository().findUnique(createUserID(BigInt(userId)));if (!user) {diff --git a/fluxer_api/src/api/stripe/services/StripeCheckoutService.ts b/fluxer_api/src/api/stripe/services/StripeCheckoutService.tsindex 09b62d7d2..07f7de91e 100644--- a/fluxer_api/src/api/stripe/services/StripeCheckoutService.ts+++ b/fluxer_api/src/api/stripe/services/StripeCheckoutService.ts@@ -5,7 +5,9 @@ import {Config} from '@app/api/Config';import {getContentMessage} from '@app/api/content_i18n/ContentI18n';import type {UserRow} from '@app/api/database/types/UserTypes';import {Logger} from '@app/api/Logger';+import {getPaymentDisputeRepository} from '@app/api/middleware/ServiceSingletons';import type {User} from '@app/api/models/User';+import {assertNoOpenPaymentDispute} from '@app/api/payment_disputes/PaymentDisputeReviews';import type {StoreEntitlementService} from '@app/api/store_billing/StoreEntitlementService';import {getBillingBranding} from '@app/api/stripe/BillingBranding';import {getEffectiveBillingConfig, isCurrentCatalogPriceId} from '@app/api/stripe/BillingConfigCache';@@ -23,9 +25,11 @@ import {getSubscriptionStartDate,} from '@app/api/stripe/StripeSubscriptionPeriod';import {extractId} from '@app/api/stripe/StripeUtils';+import {resolvePurchaseEligibility} from '@app/api/user/AccountTier';import {shiftGiftExtensionPastPremiumUntil} from '@app/api/user/GiftExtensionShift';import type {UserRepository} from '@app/api/user/repositories/UserRepository';import {type Currency, isLocalizedCurrency, shouldDisableAdaptivePricing} from '@app/api/utils/CurrencyUtils';+import {type PurchaseBlockedReason, PurchaseBlockedReasons} from '@fluxer/constants/src/AccountTierConstants';import {isEuEeaCountryCode} from '@fluxer/constants/src/EuropeanEconomicArea';import {PremiumFlags, UserPremiumTypes} from '@fluxer/constants/src/UserConstants';import {PurchaseEmailVerificationRequiredError} from '@fluxer/errors/src/domains/auth/EmailVerificationRequiredError';@@ -35,14 +39,16 @@ import {StripeInvalidProductConfigurationError} from '@fluxer/errors/src/domainsimport {StripeInvalidProductError} from '@fluxer/errors/src/domains/payment/StripeInvalidProductError';import {StripeNoPurchaseHistoryError} from '@fluxer/errors/src/domains/payment/StripeNoPurchaseHistoryError';import {StripePaymentNotAvailableError} from '@fluxer/errors/src/domains/payment/StripePaymentNotAvailableError';+import {PurchaseReceiptEmailRequiredError} from '@fluxer/errors/src/domains/user/PurchaseReceiptEmailRequiredError';import {UnclaimedAccountCannotMakePurchasesError} from '@fluxer/errors/src/domains/user/UnclaimedAccountCannotMakePurchasesError';import {UnknownUserError} from '@fluxer/errors/src/domains/user/UnknownUserError';+import type {FluxerError} from '@fluxer/errors/src/FluxerError';import type {CheckoutPaymentMethod} from '@fluxer/schema/src/domains/premium/GiftCodeSchemas';import type {PriceIdsResponse} from '@fluxer/schema/src/domains/premium/PremiumSchemas';import type {ICacheService} from '@pkgs/cache/src/ICacheService';import type Stripe from 'stripe';-export const EU_WITHDRAWAL_WAIVER_TEXT_VERSION = '2026-04-23';+export const EU_WITHDRAWAL_WAIVER_TEXT_VERSION = '2026-10-12';type CheckoutSessionCreateParams = Stripe.Checkout.SessionCreateParams;type CheckoutSessionMode = CheckoutSessionCreateParams['mode'];@@ -98,6 +104,25 @@ interface EuWithdrawalWaiverContext {required: boolean;}+const PURCHASE_BLOCKED_ERRORS: Record<PurchaseBlockedReason, () => FluxerError> = {+ [PurchaseBlockedReasons.UNCLAIMED]: () => new UnclaimedAccountCannotMakePurchasesError(),+ [PurchaseBlockedReasons.EMAIL_UNVERIFIED]: () => new PurchaseEmailVerificationRequiredError(),+ [PurchaseBlockedReasons.NO_RECEIPT_EMAIL]: () => new PurchaseReceiptEmailRequiredError(),+};++export function assertUserCanPurchase(+ user: User,+ {needsReceiptEmail = true}: {needsReceiptEmail?: boolean} = {},+): void {+ const eligibility = resolvePurchaseEligibility(user);+ if (!eligibility.allowed && (needsReceiptEmail || eligibility.blocked !== PurchaseBlockedReasons.NO_RECEIPT_EMAIL)) {+ throw PURCHASE_BLOCKED_ERRORS[eligibility.blocked]();+ }+ if (user.premiumFlags & PremiumFlags.PURCHASE_DISABLED) {+ throw new PremiumPurchaseBlockedError('purchase_disabled');+ }+}+export class StripeCheckoutService {constructor(private stripe: Stripe | null,@@ -287,7 +312,8 @@ export class StripeCheckoutService {if (user.premiumType === UserPremiumTypes.LIFETIME && isRecurringSubscription) {throw new PremiumPurchaseBlockedError('lifetime');}- this.validateUserCanPurchase(user);+ assertUserCanPurchase(user);+ await assertNoOpenPaymentDispute(getPaymentDisputeRepository(), user.id);if (isRecurringSubscription) {const storeEntitlement = await this.storeEntitlementService?.getActiveStoreEntitlement(user.id);if (storeEntitlement) {@@ -610,18 +636,6 @@ export class StripeCheckoutService {};}- validateUserCanPurchase(user: User): void {- if (user.isUnclaimedAccount()) {- throw new UnclaimedAccountCannotMakePurchasesError();- }- if (!user.emailVerified) {- throw new PurchaseEmailVerificationRequiredError();- }- if (user.premiumFlags & PremiumFlags.PURCHASE_DISABLED) {- throw new PremiumPurchaseBlockedError('purchase_disabled');- }- }-private async getStripePriceSummary(priceId: string | null): Promise<StripePriceSummary | null> {return getCachedStripePriceSummary({stripe: this.stripe, cacheService: this.cacheService, priceId});}