Skip to content

A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.

TypeScript fluxerfluxerapp

feat(billing): wire pass and disputes, drop card age webhook

Hampusfb372541dae4
diff --git a/fluxer_api/src/api/stripe/StripeService.ts b/fluxer_api/src/api/stripe/StripeService.ts
index e51158531..2de8e2d66 100644
--- a/fluxer_api/src/api/stripe/StripeService.ts
+++ b/fluxer_api/src/api/stripe/StripeService.ts
@@ -5,6 +5,12 @@ import {Config} from '@app/api/Config';
import type {GuildRepository} from '@app/api/guild/repositories/GuildRepository';
import type {GuildService} from '@app/api/guild/services/GuildService';
import type {IGatewayService} from '@app/api/infrastructure/IGatewayService';
+import type {OperatorPassServices} from '@app/api/middleware/OperatorPassServiceFactory';
+import {getDonationRepository, getEmailService} from '@app/api/middleware/ServiceSingletons';
+import {
+ createOperatorPassFulfilmentService,
+ type OperatorPassFulfilmentService,
+} from '@app/api/operator_pass/OperatorPassFulfilmentService';
import type {StoreBillingRepository} from '@app/api/store_billing/StoreBillingRepository';
import type {StoreEntitlementService} from '@app/api/store_billing/StoreEntitlementService';
import {getProductRegistry, type ProductRegistry} from '@app/api/stripe/ProductRegistry';
@@ -27,6 +33,7 @@ export class StripeService {
readonly checkout: StripeCheckoutService;
readonly subscriptions: StripeSubscriptionService;
readonly gifts: StripeGiftService;
+ readonly operatorPassFulfilment: OperatorPassFulfilmentService | null;
readonly premium: StripePremiumService;
readonly premiumState: PremiumStateService;
readonly refunds: StripeRefundService;
@@ -40,6 +47,7 @@ export class StripeService {
private billingRepository: BillingRepository,
private storeBillingRepository: StoreBillingRepository | null = null,
private storeEntitlementService: StoreEntitlementService | null = null,
+ operatorPassServices: OperatorPassServices,
) {
this.productRegistry = getProductRegistry();
this.stripe = getStripeClient();
@@ -72,17 +80,29 @@ export class StripeService {
this.gatewayService,
this.storeEntitlementService,
);
+ this.operatorPassFulfilment = createOperatorPassFulfilmentService({
+ stripe: this.stripe,
+ userRepository: this.userRepository,
+ emailService: getEmailService(),
+ cacheService: this.cacheService,
+ donationRepository: getDonationRepository(),
+ services: operatorPassServices,
+ });
this.gifts = new StripeGiftService(
this.stripe,
this.userRepository,
this.cacheService,
this.gatewayService,
- this.checkout,
this.premium,
this.subscriptions,
this.storeEntitlementService,
);
- this.refunds = new StripeRefundService(this.stripe, this.userRepository, this.subscriptions);
+ this.refunds = new StripeRefundService(
+ this.stripe,
+ this.userRepository,
+ this.subscriptions,
+ this.storeEntitlementService,
+ );
}
getStripe(): Stripe | null {
diff --git a/fluxer_api/src/api/stripe/services/StripeWebhookService.ts b/fluxer_api/src/api/stripe/services/StripeWebhookService.ts
index 1697b939c..1951bf54c 100644
--- a/fluxer_api/src/api/stripe/services/StripeWebhookService.ts
+++ b/fluxer_api/src/api/stripe/services/StripeWebhookService.ts
@@ -11,11 +11,15 @@ import type {KVAccountDeletionQueueService} from '@app/api/infrastructure/KVAcco
import type {PremiumStateReconciliationQueueService} from '@app/api/infrastructure/PremiumStateReconciliationQueueService';
import type {UserCacheService} from '@app/api/infrastructure/UserCacheService';
import {Logger} from '@app/api/Logger';
+import {OAuth2TokenRepository} from '@app/api/oauth/repositories/OAuth2TokenRepository';
+import type {OperatorPassFulfilmentService} from '@app/api/operator_pass/OperatorPassFulfilmentService';
+import {PaymentDisputeEnforcementService} from '@app/api/payment_disputes/PaymentDisputeEnforcement';
+import {PaymentDisputeRepository} from '@app/api/payment_disputes/PaymentDisputeRepository';
+import {PaymentDisputeReviewService} from '@app/api/payment_disputes/PaymentDisputeReviews';
import type {StoreEntitlementService} from '@app/api/store_billing/StoreEntitlementService';
import {getAcceptedWebhookSecrets} from '@app/api/stripe/BillingConfigCache';
import type {ProductRegistry} from '@app/api/stripe/ProductRegistry';
import {mirrorBestEffort} from '@app/api/stripe/StripeMirror';
-import type {AgeVerificationService} from '@app/api/stripe/services/AgeVerificationService';
import {StripeCheckoutWebhookHandler} from '@app/api/stripe/services/StripeCheckoutWebhookHandler';
import {StripeDisputeWebhookHandler} from '@app/api/stripe/services/StripeDisputeWebhookHandler';
import {StripeGiftReversalHandler} from '@app/api/stripe/services/StripeGiftReversalHandler';
@@ -24,6 +28,7 @@ import {StripePaymentFraudService} from '@app/api/stripe/services/StripePaymentF
import type {StripePremiumService} from '@app/api/stripe/services/StripePremiumService';
import type {StripeRefundService} from '@app/api/stripe/services/StripeRefundService';
import {StripeSubscriptionReconciler} from '@app/api/stripe/services/StripeSubscriptionReconciler';
+import type {StripeSubscriptionService} from '@app/api/stripe/services/StripeSubscriptionService';
import {StripeSubscriptionWebhookHandler} from '@app/api/stripe/services/StripeSubscriptionWebhookHandler';
import type {UserRepository} from '@app/api/user/repositories/UserRepository';
import {StripeError} from '@fluxer/errors/src/domains/payment/StripeError';
@@ -48,6 +53,7 @@ export class StripeWebhookService {
private stripe: Stripe | null,
userRepository: UserRepository,
userCacheService: UserCacheService,
+ subscriptionService: StripeSubscriptionService,
emailService: IEmailService,
gatewayService: IGatewayService,
productRegistry: ProductRegistry,
@@ -57,14 +63,30 @@ export class StripeWebhookService {
private donationRepository: DonationRepository,
kvDeletionQueue: KVAccountDeletionQueueService,
premiumStateReconciliationQueueService: PremiumStateReconciliationQueueService,
- private ageVerificationService: AgeVerificationService | null,
adminRepository: AdminRepository,
snowflakeService: ISnowflakeService,
private billingRepository: BillingRepository,
private refundService: StripeRefundService,
enforcementService: EnforcementDecisionService,
storeEntitlementService: StoreEntitlementService | null = null,
+ operatorPassFulfilment: OperatorPassFulfilmentService | null = null,
) {
+ const auditService = new AdminAuditService(adminRepository, snowflakeService);
+ const oauth2Tokens = new OAuth2TokenRepository();
+ const disputeRepository = new PaymentDisputeRepository();
+ const disputeEnforcement = new PaymentDisputeEnforcementService({
+ repository: disputeRepository,
+ userRepository,
+ userCacheService,
+ emailService,
+ cacheService,
+ gatewayService,
+ auditService,
+ kvDeletionQueue,
+ oauth2Tokens,
+ systemDm: null,
+ enforcement: enforcementService,
+ });
this.checkoutHandler = new StripeCheckoutWebhookHandler(
stripe,
userRepository,
@@ -75,6 +97,7 @@ export class StripeWebhookService {
giftService,
premiumService,
donationRepository,
+ operatorPassFulfilment,
);
const reconciler = new StripeSubscriptionReconciler(stripe, userRepository, productRegistry);
const giftReversalHandler = new StripeGiftReversalHandler(
@@ -83,7 +106,6 @@ export class StripeWebhookService {
premiumStateReconciliationQueueService,
storeEntitlementService,
);
- const auditService = new AdminAuditService(adminRepository, snowflakeService);
this.paymentFraudService = new StripePaymentFraudService({
stripe,
userRepository,
@@ -92,6 +114,7 @@ export class StripeWebhookService {
cacheService,
auditService,
enforcement: enforcementService,
+ operatorPassFulfilment,
});
this.subscriptionHandler = new StripeSubscriptionWebhookHandler(
userRepository,
@@ -107,12 +130,15 @@ export class StripeWebhookService {
userRepository,
userCacheService,
emailService,
- gatewayService,
donationRepository,
kvDeletionQueue,
giftReversalHandler,
this.paymentFraudService,
enforcementService,
+ subscriptionService,
+ new PaymentDisputeReviewService(disputeRepository, auditService, emailService),
+ disputeEnforcement,
+ operatorPassFulfilment,
);
}
@@ -164,10 +190,6 @@ export class StripeWebhookService {
switch (event.type) {
case 'checkout.session.completed': {
const checkoutSession = event.data.object as Stripe.Checkout.Session;
- if (checkoutSession.metadata?.verification_type === 'uk_age_verification' && this.ageVerificationService) {
- await this.ageVerificationService.completeVerification(checkoutSession);
- break;
- }
await this.checkoutHandler.handleCheckoutSessionCompleted(checkoutSession);
break;
}
@@ -176,6 +198,10 @@ export class StripeWebhookService {
await this.checkoutHandler.handleAsyncPaymentSucceeded(cs);
break;
}
+ case 'checkout.session.expired': {
+ await this.checkoutHandler.handleCheckoutSessionExpired(event.data.object as Stripe.Checkout.Session);
+ break;
+ }
case 'checkout.session.async_payment_failed': {
const cs = event.data.object as Stripe.Checkout.Session;
await this.checkoutHandler.handleAsyncPaymentFailed(cs);
@@ -345,6 +371,11 @@ export class StripeWebhookService {
await this.mirrorInvoice(event, inv);
break;
}
+ case 'charge.dispute.updated': {
+ const d = event.data.object as Stripe.Dispute;
+ await this.disputeHandler.handleDisputeUpdated(d);
+ break;
+ }
default: {
Logger.debug({eventType: event.type, eventId: event.id}, 'Stripe webhook event type not handled');
}
diff --git a/fluxer_api/src/api/stripe/tests/StripeWebhookTestUtils.ts b/fluxer_api/src/api/stripe/tests/StripeWebhookTestUtils.ts
index d595bbc82..923fbcea8 100644
--- a/fluxer_api/src/api/stripe/tests/StripeWebhookTestUtils.ts
+++ b/fluxer_api/src/api/stripe/tests/StripeWebhookTestUtils.ts
@@ -4,6 +4,7 @@ import crypto from 'node:crypto';
import {createTestAccount, type TestAccount} from '@app/api/auth/tests/AuthTestUtils';
import type {UserID} from '@app/api/BrandedTypes';
import {Config} from '@app/api/Config';
+import {createOperatorPassServices, type OperatorPassServices} from '@app/api/middleware/OperatorPassServiceFactory';
import {
getBillingRepository,
getGatewayService,
@@ -18,6 +19,7 @@ import {
getEmailService,
getGuildRepository,
getKVAccountDeletionQueue,
+ getOperatorPassRepository,
getPremiumStateReconciliationQueueService,
getUserRepository,
} from '@app/api/middleware/ServiceSingletons';
@@ -27,8 +29,9 @@ import {createMockWebhookPayload, type StripeWebhookEventData} from '@app/api/te
import {SyncTaskWorkerService} from '@app/api/test/SyncTaskWorkerService';
import {createBuilder} from '@app/api/test/TestRequestBuilder';
import {PaymentRepository} from '@app/api/user/repositories/PaymentRepository';
+import closePaymentDisputeAccounts from '@app/api/worker/tasks/ClosePaymentDisputeAccounts';
import processStripeWebhook from '@app/api/worker/tasks/ProcessStripeWebhook';
-import {setWorkerDependenciesForTest} from '@app/api/worker/WorkerContext';
+import {getWorkerDependencies, setWorkerDependenciesForTest} from '@app/api/worker/WorkerContext';
import {APIErrorCodes} from '@fluxer/constants/src/ApiErrorCodes';
import Stripe from 'stripe';
@@ -98,8 +101,14 @@ export function setupSyncStripeWebhookWorker(): void {
apiVersion: STRIPE_API_VERSION,
httpClient: Stripe.createFetchHttpClient(),
});
+ let operatorPassServices: OperatorPassServices | undefined;
setWorkerDependenciesForTest({
stripe,
+ operatorPassRepository: getOperatorPassRepository(),
+ get operatorPassServices() {
+ operatorPassServices ??= createOperatorPassServices(getWorkerDependencies());
+ return operatorPassServices;
+ },
userRepository: getUserRepository(),
userCacheService: createUserCacheService(),
emailService: getEmailService(),
@@ -113,7 +122,7 @@ export function setupSyncStripeWebhookWorker(): void {
snowflakeService: getSnowflakeService(),
billingRepository: getBillingRepository(),
});
- setInjectedWorkerService(new SyncTaskWorkerService({processStripeWebhook}));
+ setInjectedWorkerService(new SyncTaskWorkerService({processStripeWebhook, closePaymentDisputeAccounts}));
}
let originalWebhookSecretDescriptor: PropertyDescriptor | undefined;