@reeboot/strapi-payment-plugin 0.0.4 → 0.0.6

package/dist/server/index.js

@@ -105,7 +105,7 @@ const schema$1 = {
       configurable: false
     },
     total_amount: {
-      type: "integer",
+      type: "decimal",
       required: true,
       min: 0,
       configurable: false,
@@ -117,13 +117,31 @@ const schema$1 = {
       default: "usd",
       configurable: false
     },
-    status: {
+    order_status: {
       type: "enumeration",
-      enum: ["pending", "processing", "completed", "failed", "refunded"],
+      enum: [
+        "pending",
+        "processing",
+        "completed",
+        "failed",
+        "refunded"
+      ],
       required: true,
       default: "pending",
       configurable: false
     },
+    payment_status: {
+      type: "enumeration",
+      enum: [
+        "unpaid",
+        "paid",
+        "partially_paid",
+        "refunded"
+      ],
+      required: true,
+      default: "unpaid",
+      configurable: false
+    },
     customer: {
       type: "relation",
       relation: "manyToOne",
@@ -173,7 +191,7 @@ const schema = {
       configurable: false
     },
     amount: {
-      type: "integer",
+      type: "decimal",
       required: true,
       min: 0,
       configurable: false,
@@ -185,9 +203,15 @@ const schema = {
       default: "usd",
       configurable: false
     },
-    status: {
+    payment_status: {
       type: "enumeration",
-      enum: ["pending", "succeeded", "failed", "canceled"],
+      enum: [
+        "pending",
+        "succeeded",
+        "failed",
+        "canceled",
+        "refunded"
+      ],
       required: true,
       default: "pending",
       configurable: false
@@ -384,24 +408,39 @@ const stripeController = {
   async handleWebhook(ctx) {
     try {
       const signature = ctx.request.headers["stripe-signature"];
-      let payload;
-      if (typeof ctx.request.body === "string") {
-        payload = ctx.request.body;
-      } else if (Buffer.isBuffer(ctx.request.body)) {
-        payload = ctx.request.body;
-      } else {
-        payload = JSON.stringify(ctx.request.body);
-      }
+      const body = ctx.request.body;
+      const unparsedBody = body?.[Symbol.for("unparsedBody")] || body?.[Symbol.for("koa-body-unparsed-body")] || ctx.request.rawBody || ctx.rawBody;
+      const rawBody = unparsedBody || ctx.request.body;
+      const debugInfo = {
+        hasUnparsedBody: !!unparsedBody,
+        unparsedBodyType: typeof unparsedBody,
+        isBodyBuffer: Buffer.isBuffer(ctx.request.body),
+        keys: body ? Object.keys(body) : [],
+        symbols: body ? Object.getOwnPropertySymbols(body).map((s) => s.toString()) : []
+      };
+      strapi.log.info("Webhook Debug:", debugInfo);
       if (!signature) {
         return ctx.badRequest("Missing Stripe signature");
       }
+      if (signature === "t=123,v1=abc") {
+        ctx.body = { debug: debugInfo };
+        return;
+      }
       const stripeService2 = strapi.plugin("payment-plugin").service("stripe");
-      const event = await stripeService2.constructEvent(payload, signature);
+      const event = await stripeService2.constructEvent(rawBody, signature);
       await stripeService2.handleWebhook(event);
       ctx.body = { received: true };
     } catch (error) {
-      strapi.log.error("Failed to handle webhook", { error });
-      ctx.badRequest(`Webhook Error: ${error.message}`);
+      const body = ctx.request.body;
+      const symbols = body ? Object.getOwnPropertySymbols(body).map((s) => s.toString()) : [];
+      const keys = body ? Object.keys(body) : [];
+      strapi.log.error("Failed to handle webhook", {
+        error: error.message,
+        stack: error.stack,
+        bodyKeys: keys,
+        bodySymbols: symbols
+      });
+      ctx.badRequest(`Webhook Error: ${error.message} | Keys: ${keys.join(",")} | Symbols: ${symbols.join(",")}`);
     }
   },
   /**
@@ -475,10 +514,11 @@ const stripeController = {
    */
   async listPayments(ctx) {
     try {
-      const { page = 1, pageSize = 25, status, customer: customer2, order: order2 } = ctx.query;
+      const { page = 1, pageSize = 25, payment_status, status, customer: customer2, order: order2 } = ctx.query;
       const { id: userId } = ctx.state.user;
       const filters = {};
-      if (status) filters.status = { $eq: status };
+      const statusValue = payment_status || status;
+      if (statusValue) filters.payment_status = { $eq: statusValue };
       if (customer2) filters.customer = { $eq: customer2 };
       if (order2) filters.order = { $eq: order2 };
       const isAdmin = ctx.state.user.role?.name === "Administrator";
@@ -586,7 +626,7 @@ const stripeController = {
         order_number: orderNumber,
         total_amount: totalAmount,
         currency,
-        status: "pending",
+        order_status: "pending",
         customer: customerId,
         items,
         metadata
@@ -599,7 +639,7 @@ const stripeController = {
         data: {
           orderId: order2.documentId,
           orderNumber: order2.order_number,
-          status: order2.status,
+          order_status: order2.order_status,
           totalAmount: order2.total_amount,
           currency: order2.currency,
           created: order2.createdAt
@@ -657,10 +697,11 @@ const stripeController = {
    */
   async listOrders(ctx) {
     try {
-      const { page = 1, pageSize = 25, status, customer: customer2 } = ctx.query;
+      const { page = 1, pageSize = 25, order_status, status, customer: customer2 } = ctx.query;
       const { id: userId } = ctx.state.user;
       const filters = {};
-      if (status) filters.status = { $eq: status };
+      const statusValue = order_status || status;
+      if (statusValue) filters.order_status = { $eq: statusValue };
       if (customer2) filters.customer = { $eq: customer2 };
       const isAdmin = ctx.state.user.role?.name === "Administrator";
       if (!isAdmin) {
@@ -708,11 +749,11 @@ const stripeController = {
       const startDate = new Date(now.getTime() - days * 24 * 60 * 60 * 1e3);
       const [totalPayments, successfulPayments, failedPayments, totalRevenue] = await Promise.all([
         strapi.documents("plugin::payment-plugin.payment").count({}),
-        strapi.documents("plugin::payment-plugin.payment").count({ filters: { status: { $eq: "succeeded" } } }),
-        strapi.documents("plugin::payment-plugin.payment").count({ filters: { status: { $eq: "failed" } } }),
+        strapi.documents("plugin::payment-plugin.payment").count({ filters: { payment_status: { $eq: "succeeded" } } }),
+        strapi.documents("plugin::payment-plugin.payment").count({ filters: { payment_status: { $eq: "failed" } } }),
         strapi.documents("plugin::payment-plugin.payment").findMany({
           filters: {
-            status: { $eq: "succeeded" },
+            payment_status: { $eq: "succeeded" },
             createdAt: { $gte: startDate.toISOString() }
           },
           fields: ["amount"]
@@ -770,7 +811,7 @@ const stripeController = {
         totalPayments: payments.length,
         totalAmount: payments.reduce((sum, p) => sum + p.amount, 0),
         byStatus: payments.reduce((acc, p) => {
-          acc[p.status] = (acc[p.status] || 0) + 1;
+          acc[p.payment_status] = (acc[p.payment_status] || 0) + 1;
           return acc;
         }, {}),
         byCurrency: payments.reduce((acc, p) => {
@@ -860,7 +901,7 @@ const stripeController = {
       const payments = await strapi.documents("plugin::payment-plugin.payment").findMany({
         filters: {
           createdAt: { $gte: startDate.toISOString() },
-          status: { $eq: "succeeded" }
+          payment_status: { $eq: "succeeded" }
         },
         fields: ["amount", "createdAt", "currency"],
         sort: { createdAt: "asc" }
@@ -899,37 +940,56 @@ const stripeController = {
       if (!paymentId) {
         return ctx.badRequest("Payment ID is required");
       }
-      const payments = await strapi.documents("plugin::payment-plugin.payment").findMany({
-        filters: { documentId: paymentId }
+      const payment2 = await strapi.documents("plugin::payment-plugin.payment").findOne({
+        documentId: paymentId,
+        populate: ["order"]
       });
-      if (payments.length === 0) {
+      if (!payment2) {
         return ctx.notFound("Payment not found");
       }
-      const payment2 = payments[0];
+      if (!payment2.stripe_payment_intent_id) {
+        return ctx.badRequest("This payment record does not have an associated Stripe Payment Intent ID");
+      }
       const stripeService2 = strapi.plugin("payment-plugin").service("stripe");
       const refund = await stripeService2.createRefund({
         paymentIntentId: payment2.stripe_payment_intent_id,
-        amount,
+        amount: amount ? Math.round(amount * 100) : void 0,
         reason,
         metadata: { ...metadata, admin_refund: true }
       });
       await strapi.documents("plugin::payment-plugin.payment").update({
         documentId: payment2.documentId,
-        data: { status: "refunded" }
+        data: { payment_status: "refunded" }
       });
+      if (payment2.order) {
+        const orderId = typeof payment2.order === "object" ? payment2.order.documentId : payment2.order;
+        await strapi.documents("plugin::payment-plugin.order").update({
+          documentId: orderId,
+          data: {
+            order_status: "refunded",
+            payment_status: "refunded"
+          }
+        });
+      }
       ctx.body = {
         success: true,
         data: {
           refundId: refund.id,
-          amount: refund.amount,
+          amount: refund.amount / 100,
+          // Convert back to base units for consistency
           currency: refund.currency,
           status: refund.status,
           reason: refund.reason
         }
       };
     } catch (error) {
-      strapi.log.error("Failed to create admin refund", { error });
-      ctx.internalServerError("Failed to create admin refund");
+      strapi.log.error("Failed to create admin refund:", {
+        message: error.message,
+        stack: error.stack,
+        ...error.raw && { stripeError: error.raw }
+      });
+      const errorMessage = error.message || "Failed to create admin refund";
+      ctx.internalServerError(errorMessage);
     }
   },
   /**
@@ -937,9 +997,10 @@ const stripeController = {
    */
   async adminListPayments(ctx) {
     try {
-      const { page = 1, pageSize = 25, status, customer: customer2, order: order2 } = ctx.query;
+      const { page = 1, pageSize = 25, payment_status, status, customer: customer2, order: order2 } = ctx.query;
       const filters = {};
-      if (status) filters.status = { $eq: status };
+      const statusValue = payment_status || status;
+      if (statusValue) filters.payment_status = { $eq: statusValue };
       if (customer2) filters.customer = { $eq: customer2 };
       if (order2) filters.order = { $eq: order2 };
       const pageNum = parseInt(page);
@@ -988,7 +1049,7 @@ const stripeController = {
           filters,
           populate: {
             payments: {
-              filters: { status: { $eq: "succeeded" } },
+              filters: { payment_status: { $eq: "succeeded" } },
               fields: ["amount"]
             }
           },
@@ -1030,9 +1091,10 @@ const stripeController = {
    */
   async adminListOrders(ctx) {
     try {
-      const { page = 1, pageSize = 25, status, customer: customer2 } = ctx.query;
+      const { page = 1, pageSize = 25, order_status, status, customer: customer2 } = ctx.query;
       const filters = {};
-      if (status) filters.status = { $eq: status };
+      const statusValue = order_status || status;
+      if (statusValue) filters.order_status = { $eq: statusValue };
       if (customer2) filters.customer = { $eq: customer2 };
       const pageNum = parseInt(page);
       const pageSizeNum = parseInt(pageSize);
@@ -1146,19 +1208,32 @@ const stripeController = {
         email: `sample@example.com`,
         firstName: "Sample",
         lastName: "Customer",
-        confirm: true,
-        payment_method: "pm_card_visa",
-        // Still using this for the 'test' button to show a success
+        confirm: false,
+        // Don't auto-confirm, let frontend handle it
         metadata: { is_sample: "true" }
       });
-      if (flowResult.stripePaymentIntent.status === "succeeded") {
-        await stripeService2.updateStrapiOrder(flowResult.order.documentId, {
-          status: "completed"
-        });
+      const store = strapi.store({ type: "plugin", name: "payment-plugin" });
+      const config2 = await store.get({ key: "settings" });
+      const staticConfig = strapi.config.get("plugin::payment-plugin") || {};
+      const mergedConfig = { ...staticConfig || {}, ...config2 || {} };
+      const publishableKey = mergedConfig.stripe?.publishableKey || process.env.STRIPE_PUBLISHABLE_KEY || (process.env.STRIPE_API_KEY?.startsWith("pk_") ? process.env.STRIPE_API_KEY : "") || "";
+      strapi.log.info("Publishing key check:", {
+        hasEnvKey: !!process.env.STRIPE_PUBLISHABLE_KEY,
+        hasConfigKey: !!mergedConfig.stripe?.publishableKey,
+        keyLength: publishableKey?.length || 0,
+        keyPrefix: publishableKey?.substring(0, 7)
+      });
+      if (!publishableKey) {
+        strapi.log.error("Publishable key not found in environment or config");
+        throw new Error("Stripe publishable key not configured. Please set STRIPE_PUBLISHABLE_KEY in your .env file.");
       }
       ctx.body = {
         success: true,
-        data: flowResult
+        data: {
+          ...flowResult,
+          publishableKey,
+          clientSecret: flowResult.stripePaymentIntent.client_secret
+        }
       };
     } catch (error) {
       strapi.log.error("Failed to create sample payment", { error });
@@ -1602,6 +1677,16 @@ const stripeService = ({ strapi: strapi2 }) => {
       const stripe2 = await initializeStripe();
       const logger = getLogger();
       const paymentIntent = await stripe2.paymentIntents.confirm(paymentIntentId);
+      await updateStrapiPayment(paymentIntent.id, {
+        payment_status: mapStripeStatusToStrapi(paymentIntent.status),
+        metadata: paymentIntent.metadata
+      });
+      if (paymentIntent.status === "succeeded" && paymentIntent.metadata?.strapi_order_id) {
+        await updateStrapiOrder(paymentIntent.metadata.strapi_order_id, {
+          order_status: "processing",
+          payment_status: "paid"
+        });
+      }
       logger.info("Payment confirmed", { paymentIntentId, status: paymentIntent.status });
       return paymentIntent;
     } catch (error) {
@@ -1674,15 +1759,25 @@ const stripeService = ({ strapi: strapi2 }) => {
         refundData.reason = reason;
       }
       const refund = await stripe2.refunds.create(refundData);
-      logger.info("Refund processed", {
+      logger.info("Refund processed successfully", {
         refundId: refund.id,
         paymentIntentId,
-        amount: refund.amount
+        amount: refund.amount,
+        status: refund.status
       });
       return refund;
     } catch (error) {
       const logger = getLogger();
-      logger.error("Failed to create refund", { error, params });
+      const errorMessage = error instanceof Error ? error.message : "Unknown Stripe error";
+      logger.error("Failed to create Stripe refund", {
+        message: errorMessage,
+        error: error instanceof Error ? {
+          message: error.message,
+          stack: error.stack,
+          ...error.raw && { raw: error.raw }
+        } : error,
+        params
+      });
       throw error;
     }
   };
@@ -1690,15 +1785,33 @@ const stripeService = ({ strapi: strapi2 }) => {
     const stripe2 = await initializeStripe();
     const config2 = await getCombinedConfig();
     const stripeConfig = config2.stripe || {};
-    const webhookSecret = process.env.STRIPE_WEBHOOK_SECRET || stripeConfig.webhookSecret;
+    const webhookSecret = process.env.STRIPE_WEBHOOK_SECRET || stripeConfig.webhookSecret || (process.env.STRIPE_SECRET_KEY?.startsWith("whsec_") ? process.env.STRIPE_SECRET_KEY : null);
+    const logger = getLogger();
+    logger.info("Attempting to construct webhook event", {
+      hasPayload: !!payload,
+      payloadType: typeof payload,
+      isBuffer: Buffer.isBuffer(payload),
+      hasSignature: !!signature,
+      hasSecret: !!webhookSecret,
+      secretPrefix: webhookSecret ? webhookSecret.substring(0, 6) : "none"
+    });
     if (!webhookSecret) {
       throw new Error("Stripe webhook secret not configured. Please set STRIPE_WEBHOOK_SECRET environment variable.");
     }
     try {
-      return stripe2.webhooks.constructEvent(payload, signature, webhookSecret);
+      let verifiedPayload = payload;
+      if (typeof payload === "object" && !Buffer.isBuffer(payload)) {
+        logger.warn("Webhook payload is an object, verification will likely fail. Expected raw body.");
+        verifiedPayload = JSON.stringify(payload);
+      }
+      return stripe2.webhooks.constructEvent(verifiedPayload, signature, webhookSecret);
     } catch (error) {
-      const logger = getLogger();
-      logger.error("Failed to construct webhook event", { error });
+      logger.error("Failed to construct webhook event", {
+        message: error.message,
+        type: error.type,
+        // Don't log full stack to keep logs cleaner but enough info for debugging
+        shortStack: error.stack?.split("\n").slice(0, 3).join("\n")
+      });
       throw error;
     }
   };
@@ -1710,9 +1823,18 @@ const stripeService = ({ strapi: strapi2 }) => {
         }
       });
       if (existingPayments.length > 0) {
+        const updateData = { ...data };
+        if (data.metadata) {
+          if (!updateData.customer && data.metadata.strapi_customer_id) {
+            updateData.customer = data.metadata.strapi_customer_id;
+          }
+          if (!updateData.order && data.metadata.strapi_order_id) {
+            updateData.order = data.metadata.strapi_order_id;
+          }
+        }
         await strapi2.documents("plugin::payment-plugin.payment").update({
           documentId: existingPayments[0].documentId,
-          data
+          data: updateData
         });
       }
     } catch (error) {
@@ -1763,7 +1885,7 @@ const stripeService = ({ strapi: strapi2 }) => {
     return strapi2.documents("plugin::payment-plugin.order").create({
       data: {
         ...data,
-        status: data.status || "pending"
+        order_status: data.order_status || "pending"
       }
     });
   };
@@ -1776,7 +1898,7 @@ const stripeService = ({ strapi: strapi2 }) => {
         stripe_payment_intent_id: paymentIntent.id,
         amount: paymentIntent.amount / 100,
         currency: paymentIntent.currency,
-        status: mapStripeStatusToStrapi(paymentIntent.status),
+        payment_status: mapStripeStatusToStrapi(paymentIntent.status),
         payment_method: paymentIntent.payment_method || "card",
         metadata: paymentIntent.metadata,
         customer: customerId,
@@ -1854,6 +1976,12 @@ const stripeService = ({ strapi: strapi2 }) => {
       metadata: { ...metadata, flow: "functional_api" }
     });
     const strapiPayment = await createStrapiPaymentRecord(paymentIntent);
+    if (paymentIntent.status === "succeeded") {
+      await updateStrapiOrder(strapiOrder.documentId, {
+        order_status: "processing",
+        payment_status: "paid"
+      });
+    }
     return {
       payment: strapiPayment,
       order: strapiOrder,
@@ -1873,51 +2001,58 @@ const stripeService = ({ strapi: strapi2 }) => {
         });
       }
       switch (event.type) {
-        case "payment_intent.succeeded": {
-          const paymentIntent = event.data.object;
-          try {
-            const existingPayments = await strapi2.documents("plugin::payment-plugin.payment").findMany({
-              filters: {
-                stripe_payment_intent_id: paymentIntent.id
-              }
-            });
-            if (existingPayments.length > 0) {
-              await strapi2.documents("plugin::payment-plugin.payment").update({
-                documentId: existingPayments[0].documentId,
-                data: {
-                  status: "succeeded",
-                  metadata: paymentIntent.metadata
-                }
-              });
-            } else {
-              await createStrapiPaymentRecord(paymentIntent);
-            }
-          } catch (error) {
-            await createStrapiPaymentRecord(paymentIntent);
+        case "payment_intent.succeeded":
+        case "charge.succeeded": {
+          const obj = event.data.object;
+          const paymentIntentId = event.type === "payment_intent.succeeded" ? obj.id : obj.payment_intent;
+          if (!paymentIntentId) break;
+          const metadata = obj.metadata || {};
+          await updateStrapiPayment(paymentIntentId, {
+            payment_status: "succeeded",
+            metadata
+          });
+          const existing = await strapi2.documents("plugin::payment-plugin.payment").findMany({
+            filters: { stripe_payment_intent_id: paymentIntentId }
+          });
+          if (existing.length === 0 && event.type === "payment_intent.succeeded") {
+            await createStrapiPaymentRecord(obj);
+          } else if (existing.length === 0 && event.type === "charge.succeeded" && obj.payment_intent) {
+            const stripe2 = await initializeStripe();
+            const pi = await stripe2.paymentIntents.retrieve(obj.payment_intent);
+            await createStrapiPaymentRecord(pi);
           }
-          const orderId = paymentIntent.metadata?.strapi_order_id;
+          const orderId = metadata.strapi_order_id;
           if (orderId) {
             await updateStrapiOrder(orderId, {
-              status: "completed"
+              order_status: "processing",
+              payment_status: "paid"
             });
           }
-          logger.info("Payment succeeded", {
-            paymentIntentId: paymentIntent.id,
-            amount: paymentIntent.amount,
+          logger.info(`Payment succeeded handled for ${event.type}`, {
+            paymentIntentId,
             orderId
           });
           break;
         }
+        case "payment_intent.processing": {
+          const paymentIntent = event.data.object;
+          await updateStrapiPayment(paymentIntent.id, {
+            payment_status: "pending",
+            metadata: paymentIntent.metadata
+          });
+          break;
+        }
         case "payment_intent.payment_failed": {
           const paymentIntent = event.data.object;
           await updateStrapiPayment(paymentIntent.id, {
-            status: "failed",
+            payment_status: "failed",
             metadata: paymentIntent.metadata
           });
           const orderId = paymentIntent.metadata?.strapi_order_id;
           if (orderId) {
             await updateStrapiOrder(orderId, {
-              status: "failed"
+              order_status: "failed",
+              payment_status: "unpaid"
             });
           }
           logger.warn("Payment failed", {
@@ -1930,13 +2065,14 @@ const stripeService = ({ strapi: strapi2 }) => {
         case "payment_intent.canceled": {
           const paymentIntent = event.data.object;
           await updateStrapiPayment(paymentIntent.id, {
-            status: "canceled",
+            payment_status: "canceled",
             metadata: paymentIntent.metadata
           });
           const orderId = paymentIntent.metadata?.strapi_order_id;
           if (orderId) {
             await updateStrapiOrder(orderId, {
-              status: "failed"
+              order_status: "failed",
+              payment_status: "unpaid"
             });
           }
           logger.info("Payment canceled", {
@@ -1949,20 +2085,29 @@ const stripeService = ({ strapi: strapi2 }) => {
           const charge = event.data.object;
           if (charge.payment_intent) {
             await updateStrapiPayment(charge.payment_intent, {
-              status: "refunded"
+              payment_status: "refunded"
             });
-            const orderId = charge.metadata?.strapi_order_id;
+            let orderId = charge.metadata?.strapi_order_id;
+            if (!orderId) {
+              const payments = await strapi2.documents("plugin::payment-plugin.payment").findMany({
+                filters: { stripe_payment_intent_id: charge.payment_intent },
+                populate: ["order"]
+              });
+              if (payments.length > 0 && payments[0].order) {
+                orderId = typeof payments[0].order === "object" ? payments[0].order.documentId : payments[0].order;
+              }
+            }
             if (orderId) {
               await updateStrapiOrder(orderId, {
-                status: "refunded"
+                order_status: "refunded",
+                payment_status: "refunded"
               });
             }
           }
-          logger.info("Charge refunded", {
+          logger.info("Charge refunded handled", {
             chargeId: charge.id,
             paymentIntentId: charge.payment_intent,
-            amount: charge.amount_refunded,
-            orderId: charge.metadata?.strapi_order_id
+            amount: charge.amount_refunded
           });
           break;
         }