@storecraft/payments-stripe 1.0.16 → 1.2.5

package/README.md

@@ -71,13 +71,10 @@ const app = new App(config)
 .withPlatform(new NodePlatform())
 .withDatabase(new MongoDB())
 .withStorage(new GoogleStorage())
-.withPaymentGateways(
-  {
-    'stripe': new Stripe() // config can be inferred from env variables
-  }
-);
-
-await app.init();
+.withPaymentGateways({
+  stripe: new Stripe() // config can be inferred from env variables
+})
+.init();
 
 ```
 

package/adapter.js

@@ -33,7 +33,7 @@ export const metadata_storecraft_order_id = 'storecraft_order_id'
 export class Stripe {
   
   /** @satisfies {ENV<Config>} */
-  static EnvConfig = /** @type{const} */ ({
+  static EnvConfig = /** @type {const} */ ({
     publishable_key: 'STRIPE_PUBLISHABLE_KEY',
     secret_key: 'STRIPE_SECRET_KEY',
     webhook_endpoint_secret: 'STRIPE_WEBHOOK_SECRET',
@@ -43,7 +43,6 @@ export class Stripe {
   /** @type {StripeCls} */ #stripe;
 
   /**
-   * 
    * @param {Config} config 
    */
   constructor(config={}) {
@@ -69,15 +68,18 @@ export class Stripe {
   /** @type {Impl["onInit"]} */
   onInit = (app) => {
     this.config.publishable_key ??=
-        app.platform.env[Stripe.EnvConfig.publishable_key];
+      app.env[Stripe.EnvConfig.publishable_key];
+
     this.config.secret_key ??= 
-        app.platform.env[Stripe.EnvConfig.secret_key];
+      app.env[Stripe.EnvConfig.secret_key];
+      
     this.config.webhook_endpoint_secret ??= 
-        app.platform.env[Stripe.EnvConfig.webhook_endpoint_secret];
+      app.env[Stripe.EnvConfig.webhook_endpoint_secret];
   }
 
   get stripe() {
-    const is_valid = this.config.publishable_key && this.config.secret_key;
+    const is_valid = this.config.publishable_key && 
+      this.config.secret_key;
 
     if(!is_valid) {
       throw new StorecraftError(
@@ -242,7 +244,7 @@ export class Stripe {
     }
 
     if(o) { // just an intent
-      const date = new Date(o.created).toUTCString();
+      const date = new Date(o.created*1000).toUTCString();
       stat.messages = [
         `A payment intent of **${fmt(o.amount)}** was initiated at ${date}`,
         `The status is \`${o.status}\` and the ID is \`${o.id}\``
@@ -276,7 +278,6 @@ export class Stripe {
 
   /**
    * @description [https://docs.stripe.com/webhooks](https://docs.stripe.com/webhooks)
-   * 
    * @type {Impl["webhook"]}
    */
   async webhook(request, response) {
@@ -284,22 +285,13 @@ export class Stripe {
 
     let event;
   
-    try {
-      event = await this.stripe.webhooks.constructEventAsync(
-        request.rawBody, sig, this.config.webhook_endpoint_secret, undefined,
-        StripeCls.createSubtleCryptoProvider()
-      );
-    }
-    catch (err) {
-      response.status = 400;
-      response.end();
-      console.log(err.message);
-      return;
-    }
-  
-    let order_id;
-    /** @type {StripeCls.PaymentIntent} */
-    let payment_intent;
+    event = await this.stripe.webhooks.constructEventAsync(
+      request.rawBody, sig, this.config.webhook_endpoint_secret, undefined,
+      StripeCls.createSubtleCryptoProvider()
+    );
+
+    /** @type {string} */
+    let order_id = undefined;
 
     /** @type {PaymentOptionsEnum[keyof PaymentOptionsEnum]} */
     let payment_status = PaymentOptionsEnum.unpaid;
@@ -310,8 +302,8 @@ export class Stripe {
       case 'payment_intent.payment_failed':
       case 'payment_intent.requires_action':
       case 'payment_intent.amount_capturable_updated':
-      case 'payment_intent.canceled':
-        payment_intent = event.data.object;
+      case 'payment_intent.canceled': {
+        const payment_intent = event.data.object;
         order_id = payment_intent.metadata[metadata_storecraft_order_id];
 
         if(payment_intent.status==='requires_capture')
@@ -324,17 +316,26 @@ export class Stripe {
           payment_status = PaymentOptionsEnum.unpaid;
         else if(payment_intent.status==='succeeded')
           payment_status = PaymentOptionsEnum.captured;
-        
         break;
+      }
       case 'charge.refunded':
       case 'charge.refund.updated':
+        const payment_intent = event.data.object;
+        order_id = payment_intent.metadata[metadata_storecraft_order_id];
         payment_status = PaymentOptionsEnum.refunded;
-
+        break;
       default: {
-        console.log(`Unhandled event type ${event.type}`);
+        console.log(`Stripe:: We don't handle event of type ${event.type}`);
+
         return undefined;
       }
     }
+
+    if(!order_id) {
+      throw new Error(
+        `No 'storecraft' 'order_id' found in metadata for event type ${event.type}`
+      )
+    }
   
     // Return a response to acknowledge receipt of the event
     response.sendJson({received: true});    

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storecraft/payments-stripe",
-  "version": "1.0.16",
+  "version": "1.2.5",
   "description": "Official Storecraft <-> Stripe integration",
   "license": "MIT",
   "author": "Tomer Shalev (https://github.com/store-craft)",
@@ -21,8 +21,7 @@
   "types": "types.public.d.ts",
   "scripts": {
     "payments-stripe:test": "uvu -c",
-    "test": "npm run payments-stripe:test",
-    "prepublishOnly": "npm version patch --force"
+    "test": "npm run payments-stripe:test"
   },
   "dependencies": {
     "stripe": "^16.6.0"