api: billing hotfixes (#2347)

Author: gioelecerati

packages/api/src/controllers/user.ts

@@ -1378,6 +1378,7 @@ app.post(
               price: item.id,
             })),
           ],
+          expand: ["latest_invoice.payment_intent", "pending_setup_intent"],
         },
       );
     } else {
@@ -1413,10 +1414,37 @@ app.post(
             })),
             ...payAsYouGoItems,
           ],
+          expand: ["latest_invoice.payment_intent", "pending_setup_intent"],
         },
       );
     }
 
+    // Check if payment failed before updating user's plan
+    const latestInvoice = updatedSubscription.latest_invoice as any;
+    if (latestInvoice?.payment_intent) {
+      const paymentIntent = latestInvoice.payment_intent;
+      if (
+        paymentIntent.status === "requires_payment_method" ||
+        paymentIntent.status === "canceled"
+      ) {
+        return res.status(402).send({
+          error: {
+            message: "Payment failed. Please update your payment method.",
+          },
+        });
+      }
+    }
+
+    // Check subscription status for payment issues
+    if (
+      updatedSubscription.status === "past_due" ||
+      updatedSubscription.status === "unpaid"
+    ) {
+      return res.status(402).send({
+        error: { message: "Subscription payment failed." },
+      });
+    }
+
     if (
       products[payload.stripeProductId].name == "Growth" ||
       products[payload.stripeProductId].name == "Scale"

packages/www/components/PlanForm/index.tsx

@@ -157,14 +157,50 @@ const PlanForm = ({
 
     // If user already submitted payment, don't ask for payment information again
     if (user.stripeCustomerPaymentMethodId) {
-      await updateSubscription({
-        stripeCustomerId: user.stripeCustomerId,
-        stripeCustomerPaymentMethodId: user.stripeCustomerPaymentMethodId,
-        stripeCustomerSubscriptionId: user.stripeCustomerSubscriptionId,
-        stripeProductId,
-      });
-      setStatus("succeeded");
-      setOpen(false);
+      try {
+        const result: any = await updateSubscription({
+          stripeCustomerId: user.stripeCustomerId,
+          stripeCustomerPaymentMethodId: user.stripeCustomerPaymentMethodId,
+          stripeCustomerSubscriptionId: user.stripeCustomerSubscriptionId,
+          stripeProductId,
+        });
+
+        if (result?.error || result?.errors) {
+          console.error(result.error || result.errors);
+          setStatus("error");
+          openSnackbar("Payment failed. Please update your payment method.");
+          return;
+        }
+
+        const pendingSetupIntent = result?.pending_setup_intent;
+        if (pendingSetupIntent?.status === "requires_action") {
+          const confirmResult = await stripe.confirmCardSetup(
+            pendingSetupIntent.client_secret,
+            {
+              payment_method: user.stripeCustomerPaymentMethodId,
+            },
+          );
+          if (confirmResult.error) {
+            console.error(confirmResult.error);
+            setStatus("error");
+            openSnackbar("Payment verification failed.");
+            return;
+          }
+        }
+
+        if (result?.status === "past_due" || result?.status === "unpaid") {
+          setStatus("error");
+          openSnackbar("Payment failed. Please update your payment method.");
+          return;
+        }
+
+        setStatus("succeeded");
+        setOpen(false);
+      } catch (error) {
+        console.error(error);
+        setStatus("error");
+        openSnackbar("An error occurred. Please try again.");
+      }
     } else {
       const cardElement = elements!.getElement(CardElement);
       createPaymentMethod({