Merge branch 'main' into miho-webhooks-runtime-validations

template/app/src/payment/stripe/webhook.ts

@@ -13,6 +13,7 @@ import { z } from 'zod';
 import {
   InvoicePaidData,
   parseWebhookPayload,
+  PaymentIntentSucceededData,
   SessionCompletedData,
   SubscriptionDeletedData,
   SubscriptionUpdatedData,
@@ -43,6 +44,9 @@ export const stripeWebhook: PaymentsWebhook = async (request, response, context)
       case 'invoice.paid':
         await handleInvoicePaid(payload.data, prismaUserDelegate);
         break;
+      case 'payment_intent.succeeded':
+        await handlePaymentIntentSucceeded(payload.data, prismaUserDelegate);
+        break;
       case 'customer.subscription.updated':
         await handleCustomerSubscriptionUpdated(payload.data, prismaUserDelegate);
         break;
@@ -108,23 +112,22 @@ export async function handleCheckoutSessionCompleted(
   }
   const { subscriptionPlan } = getPlanEffectPaymentDetails({ planId, planEffect: plan.effect });
 
-  return updateUserStripePaymentDetails(
-    { userStripeId, subscriptionPlan },
-    prismaUserDelegate
-  );
+  return updateUserStripePaymentDetails({ userStripeId, subscriptionPlan }, prismaUserDelegate);
 }
 
+// This is called when a subscription is purchased or renewed and payment succeeds.
+// Invoices are not created for one-time payments, so we handle them in the payment_intent.succeeded webhook.
 export async function handleInvoicePaid(invoice: InvoicePaidData, prismaUserDelegate: PrismaClient['user']) {
   const userStripeId = validateUserStripeIdOrThrow(invoice.customer);
   const datePaid = new Date(invoice.period_start * 1000);
   return updateUserStripePaymentDetails({ userStripeId, datePaid }, prismaUserDelegate);
 }
 
 export async function handlePaymentIntentSucceeded(
-  paymentIntent: Stripe.PaymentIntent,
+  paymentIntent: PaymentIntentSucceededData,
   prismaUserDelegate: PrismaClient['user']
 ) {
-  // We handle invoices in the invoice.paid webhook. Invoices exist for subscription payments, 
+  // We handle invoices in the invoice.paid webhook. Invoices exist for subscription payments,
   // but not for one-time payment/credits products which use the Stripe `payment` mode on checkout sessions.
   if (paymentIntent.invoice) {
     return;
@@ -246,3 +249,23 @@ function getPlanIdByPriceId(priceId: string): PaymentPlanId {
   }
   return planId;
 }
+
+function getPlanEffectPaymentDetails({
+  planId,
+  planEffect,
+}: {
+  planId: PaymentPlanId;
+  planEffect: PaymentPlanEffect;
+}): {
+  subscriptionPlan: PaymentPlanId | undefined;
+  numOfCreditsPurchased: number | undefined;
+} {
+  switch (planEffect.kind) {
+    case 'subscription':
+      return { subscriptionPlan: planId, numOfCreditsPurchased: undefined };
+    case 'credits':
+      return { subscriptionPlan: undefined, numOfCreditsPurchased: planEffect.amount };
+    default:
+      assertUnreachable(planEffect);
+  }
+}

template/app/src/payment/stripe/webhookPayload.ts

@@ -20,6 +20,14 @@ export async function parseWebhookPayload(rawStripeEvent: Stripe.Event) {
         throw new Error('Error parsing Stripe event object');
       });
       return { eventName: event.type, data: invoice };
+    case 'payment_intent.succeeded':
+      const paymentIntent = await paymentIntentSucceededDataSchema
+        .parseAsync(event.data.object)
+        .catch((e) => {
+          console.error(e);
+          throw new Error('Error parsing Stripe event object');
+        });
+      return { eventName: event.type, data: paymentIntent };
     case 'customer.subscription.updated':
       const updatedSubscription = await subscriptionUpdatedDataSchema
         .parseAsync(event.data.object)
@@ -61,6 +69,16 @@ const invoicePaidDataSchema = z.object({
   period_start: z.number(),
 });
 
+// This is a subtype of Stripe.PaymentIntent from "stripe"
+const paymentIntentSucceededDataSchema = z.object({
+  invoice: z.unknown().optional(),
+  created: z.number(),
+  metadata: z.object({
+    priceId: z.string(),
+  }),
+  customer: z.string(),
+});
+
 // This is a subtype of Stripe.Subscription from "stripe"
 const subscriptionUpdatedDataSchema = z.object({
   customer: z.string(),
@@ -86,6 +104,8 @@ export type SessionCompletedData = z.infer<typeof sessionCompletedDataSchema>;
 
 export type InvoicePaidData = z.infer<typeof invoicePaidDataSchema>;
 
+export type PaymentIntentSucceededData = z.infer<typeof paymentIntentSucceededDataSchema>;
+
 export type SubscriptionUpdatedData = z.infer<typeof subscriptionUpdatedDataSchema>;
 
 export type SubscriptionDeletedData = z.infer<typeof subscriptionDeletedDataSchema>;