pepepper/fluxer
1
0 Fork 0
mirror of https://github.com/fluxerapp/fluxer synced 2026-10-18 21:45:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix(api): keep Stripe expand paths within the four-level limit (#1707)

Browse Source
This commit is contained in:
Hampus authored and GitHub committed 2026-08-18 01:06:10 +02:00
1 parent cc105883a5
commit 1922d56188
2 files changed
+9 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

fluxer_api/src/api/stripe/services/StripeCheckoutWebhookHandler.ts
+8 -4
View File
@@ -21,7 +21,6 @@ import {mapUserToPrivateResponse} from '../../user/UserMappers';
import type {ProductInfo, ProductRegistry} from '../ProductRegistry'; import type {ProductInfo, ProductRegistry} from '../ProductRegistry';
import { import {
getFirstInvoicePaymentIntentId, getFirstInvoicePaymentIntentId,
getFirstInvoicePaymentIntentLatestChargeId,
getPrimarySubscriptionItem, getPrimarySubscriptionItem,
getSubscriptionItemPeriodEnd, getSubscriptionItemPeriodEnd,
getSubscriptionPremiumPeriodEnd, getSubscriptionPremiumPeriodEnd,
@@ -600,11 +599,16 @@ export class StripeCheckoutWebhookHandler {
if (!this.stripe) return null; if (!this.stripe) return null;
try { try {
const subscription = await this.stripe.subscriptions.retrieve(subscriptionId, { const subscription = await this.stripe.subscriptions.retrieve(subscriptionId, {
expand: ['latest_invoice.payments.data.payment.payment_intent.latest_charge'], expand: ['latest_invoice.payments.data.payment'],
}); });
const latestInvoice = const latestInvoice =
typeof subscription.latest_invoice === 'string' ? null : (subscription.latest_invoice ?? null); typeof subscription.latest_invoice === 'string' ? null : (subscription.latest_invoice ?? null);
return getFirstInvoicePaymentIntentLatestChargeId(latestInvoice); const paymentIntentId = getFirstInvoicePaymentIntentId(latestInvoice);
if (!paymentIntentId) {
return null;
}
const paymentIntent = await this.stripe.paymentIntents.retrieve(paymentIntentId);
return extractId(paymentIntent.latest_charge);
} catch (err) { } catch (err) {
Logger.warn({err, subscriptionId}, 'Failed to resolve latest charge for duplicate-subscription refund'); Logger.warn({err, subscriptionId}, 'Failed to resolve latest charge for duplicate-subscription refund');
return null; return null;
@@ -739,7 +743,7 @@ export class StripeCheckoutWebhookHandler {
}; };
try { try {
const subscription = (await this.stripe.subscriptions.retrieve(subscriptionId, { const subscription = (await this.stripe.subscriptions.retrieve(subscriptionId, {
expand: ['default_payment_method', 'latest_invoice.payments.data.payment.payment_intent'], expand: ['default_payment_method', 'latest_invoice.payments.data.payment'],
})) as StripeSubscriptionWithFallbackPaymentState; })) as StripeSubscriptionWithFallbackPaymentState;
const latestInvoice = const latestInvoice =
typeof subscription.latest_invoice === 'string' ? null : (subscription.latest_invoice ?? null); typeof subscription.latest_invoice === 'string' ? null : (subscription.latest_invoice ?? null);
fluxer_api/src/api/stripe/services/StripeRefundService.ts
+1 -1
View File
@@ -113,7 +113,7 @@ export class StripeRefundService {
const list = await this.stripe.invoices.list({ const list = await this.stripe.invoices.list({
customer: user.stripeCustomerId, customer: user.stripeCustomerId,
limit: 5, limit: 5,
expand: ['data.payments.data.payment.payment_intent'], expand: ['data.payments.data.payment'],
}); });
for (const invoice of list.data) { for (const invoice of list.data) {
if (!invoice.id || invoice.status !== 'paid' || invoice.amount_paid <= 0) { if (!invoice.id || invoice.status !== 'paid' || invoice.amount_paid <= 0) {