Fixes

pages/api/btcpay/webhook.ts

@@ -176,8 +176,11 @@ async function handleDonationOrMembership(body: WebhookBody) {
     try {
       await givePointsToUser({ pointsToGive, donation })
     } catch (error) {
-      log('error', `[Stripe webhook] Failed to give points. Rolling back.`)
-      prisma.donation.delete({ where: { id: donation.id } })
+      log(
+        'error',
+        `[Stripe webhook] Failed to give points for invoice ${body.invoiceId}. Rolling back.`
+      )
+      await prisma.donation.delete({ where: { id: donation.id } })
       throw error
     }
   }
@@ -193,8 +196,9 @@ async function handleDonationOrMembership(body: WebhookBody) {
     } catch (error) {
       log(
         'warn',
-        `[BTCPay webhook] Could not add user ${body.metadata.userId} to PG forum members group. Invoice: ${body.invoiceId}. NOT rolling back. Continuing... Cause: ${error}`
+        `[BTCPay webhook] Could not add user ${body.metadata.userId} to PG forum members group. Invoice: ${body.invoiceId}. NOT rolling back. Continuing... Cause:`
       )
+      console.error(error)
     }
   }
 
@@ -226,7 +230,7 @@ async function handleDonationOrMembership(body: WebhookBody) {
     }
 
     try {
-      sendDonationConfirmationEmail({
+      await sendDonationConfirmationEmail({
         to: body.metadata.donorEmail,
         donorName: body.metadata.donorName,
         donation,
@@ -236,8 +240,9 @@ async function handleDonationOrMembership(body: WebhookBody) {
     } catch (error) {
       log(
         'warn',
-        `[BTCPay webhook] Failed to send donation confirmation email for invoice ${body.invoiceId}. NOT rolling back. Cause: ${error}`
+        `[BTCPay webhook] Failed to send donation confirmation email for invoice ${body.invoiceId}. NOT rolling back. Cause:`
       )
+      console.error(error)
     }
   }
 

prisma/migrations/20250402210015_donation_crypto_payments_array/migration.sql

@@ -2,6 +2,7 @@
   Warnings:
 
   - A unique constraint covering the columns `[btcPayInvoiceId]` on the table `Donation` will be added. If there are existing duplicate values, this will fail.
+  - A unique constraint covering the columns `[stripePaymentIntentId]` on the table `Donation` will be added. If there are existing duplicate values, this will fail.
 
 */
 -- AlterTable
@@ -11,3 +12,6 @@ ALTER COLUMN "netCryptoAmount" SET DATA TYPE TEXT;
 
 -- CreateIndex
 CREATE UNIQUE INDEX "Donation_btcPayInvoiceId_key" ON "Donation"("btcPayInvoiceId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Donation_stripePaymentIntentId_key" ON "Donation"("stripePaymentIntentId");

prisma/schema.prisma

@@ -38,7 +38,7 @@ model Donation {
   userId                     String?
   donorName                  String?
   btcPayInvoiceId            String?         @unique
-  stripePaymentIntentId      String? // For donations and non-recurring memberships
+  stripePaymentIntentId      String?         @unique // For donations and non-recurring memberships
   stripeInvoiceId            String?         @unique // For recurring memberships
   stripeSubscriptionId       String? // For recurring memberships
   projectSlug                String

server/utils/mailing.ts

@@ -32,9 +32,9 @@ export async function sendDonationConfirmationEmail({
   const fundName = funds[donation.fundSlug].title
   const isMembership = !donation.membershipExpiresAt
   const isSubscription = donation.stripeSubscriptionId
-  const isPaidWithCrypto = (donation.cryptoPayments as DonationCryptoPayments).length
-  const cryptoDonationDescription = (donation.cryptoPayments as DonationCryptoPayments)
-    .map((payment) => `${payment.grossAmount} ${payment.cryptoCode}`)
+  const isPaidWithCrypto = (donation.cryptoPayments as DonationCryptoPayments | null)?.length
+  const cryptoDonationDescription = (donation.cryptoPayments as DonationCryptoPayments | null)
+    ?.map((payment) => `${payment.grossAmount} ${payment.cryptoCode}`)
     .join(', ')
 
   const markdown = `# Donation receipt

server/utils/perks.ts

@@ -76,11 +76,12 @@ export async function deductPointsFromUser({
   orderId,
 }: DeductPointsFromUserParams) {
   const pointsBalance = await getPointsBalance(userId)
+  const newPointsBalance = pointsBalance - deductionAmount
 
   await strapiApi.post<any, any, StrapiCreatePointBody>('/points', {
     data: {
       balanceChange: (-deductionAmount).toString(),
-      balance: pointsBalance.toString(),
+      balance: newPointsBalance.toString(),
       userId: userId,
       perk: perkId,
       order: orderId,

server/utils/webhooks.ts

@@ -73,8 +73,11 @@ async function handleDonationOrNonRecurringMembership(paymentIntent: Stripe.Paym
     try {
       await givePointsToUser({ pointsToGive, donation })
     } catch (error) {
-      log('error', `[Stripe webhook] Failed to give points. Rolling back.`)
-      prisma.donation.delete({ where: { id: donation.id } })
+      log(
+        'error',
+        `[Stripe webhook] Failed to give points for payment intent ${paymentIntent.id}. Rolling back.`
+      )
+      await prisma.donation.delete({ where: { id: donation.id } })
       throw error
     }
   }
@@ -108,7 +111,7 @@ async function handleDonationOrNonRecurringMembership(paymentIntent: Stripe.Paym
     }
 
     try {
-      sendDonationConfirmationEmail({
+      await sendDonationConfirmationEmail({
         to: metadata.donorEmail,
         donorName: metadata.donorName,
         donation,
@@ -118,8 +121,9 @@ async function handleDonationOrNonRecurringMembership(paymentIntent: Stripe.Paym
     } catch (error) {
       log(
         'warn',
-        `[Stripe webhook] Failed to send donation confirmation email for payment intent ${paymentIntent.id}. NOT rolling back. Cause ${error}`
+        `[Stripe webhook] Failed to send donation confirmation email for payment intent ${paymentIntent.id}. NOT rolling back. Cause:`
       )
+      console.error(error)
     }
   }
 
@@ -179,8 +183,11 @@ async function handleRecurringMembership(invoice: Stripe.Invoice) {
     try {
       await givePointsToUser({ donation, pointsToGive })
     } catch (error) {
-      log('error', `[BTCPay webhook] Failed to give points. Rolling back.`)
-      prisma.donation.delete({ where: { id: donation.id } })
+      log(
+        'error',
+        `[BTCPay webhook] Failed to give points for invoice ${invoice.id}. Rolling back.`
+      )
+      await prisma.donation.delete({ where: { id: donation.id } })
       throw error
     }
   }
@@ -210,7 +217,7 @@ async function handleRecurringMembership(invoice: Stripe.Invoice) {
     })
 
     try {
-      sendDonationConfirmationEmail({
+      await sendDonationConfirmationEmail({
         to: metadata.donorEmail,
         donorName: metadata.donorName,
         donation,
@@ -220,8 +227,9 @@ async function handleRecurringMembership(invoice: Stripe.Invoice) {
     } catch (error) {
       log(
         'warn',
-        `[Stripe webhook] Failed to send donation confirmation email for invoice ${invoice.id}. NOT rolling back. Cause ${error}`
+        `[Stripe webhook] Failed to send donation confirmation email for invoice ${invoice.id}. NOT rolling back. Cause:`
       )
+      console.error(error)
     }
   }
 

server/workers/perk.ts

@@ -110,7 +110,7 @@ if (!globalForWorker.hasInitializedWorkers)
         })
       } catch (error) {
         log('error', `[Perk purchase worker] Failed to create Strapi order. Rolling back.`)
-        cancelPrintfulOrder(printfulOrder?.externalId!)
+        await cancelPrintfulOrder(printfulOrder?.externalId!)
         throw error
       }
 
@@ -124,8 +124,8 @@ if (!globalForWorker.hasInitializedWorkers)
         })
       } catch (error) {
         log('error', `[Perk purchase worker] Failed to deduct points. Rolling back.`)
-        if (printfulOrder) cancelPrintfulOrder(printfulOrder.externalId)
-        deleteStrapiOrder(strapiOrder.documentId)
+        if (printfulOrder) await cancelPrintfulOrder(printfulOrder.externalId)
+        await deleteStrapiOrder(strapiOrder.documentId)
         throw error
       }