@reeboot/strapi-payment-plugin 0.0.5 → 0.0.6

package/dist/server/index.js

@@ -408,18 +408,39 @@ const stripeController = {
   async handleWebhook(ctx) {
     try {
       const signature = ctx.request.headers["stripe-signature"];
-      const unparsedBody = ctx.request.body?.[Symbol.for("unparsedBody")];
+      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(rawBody, signature);
       await stripeService2.handleWebhook(event);
       ctx.body = { received: true };
     } catch (error) {
-      strapi.log.error("Failed to handle webhook", { error: error.message, stack: error.stack });
-      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(",")}`);
     }
   },
   /**
@@ -1764,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;
     }
   };

package/dist/server/index.mjs

@@ -405,18 +405,39 @@ const stripeController = {
   async handleWebhook(ctx) {
     try {
       const signature = ctx.request.headers["stripe-signature"];
-      const unparsedBody = ctx.request.body?.[Symbol.for("unparsedBody")];
+      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(rawBody, signature);
       await stripeService2.handleWebhook(event);
       ctx.body = { received: true };
     } catch (error) {
-      strapi.log.error("Failed to handle webhook", { error: error.message, stack: error.stack });
-      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(",")}`);
     }
   },
   /**
@@ -1761,15 +1782,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;
     }
   };

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.5",
+  "version": "0.0.6",
   "keywords": [],
   "type": "commonjs",
   "exports": {