@live-change/stripe-service 0.8.110 → 0.8.111

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/stripe-service",
-  "version": "0.8.110",
+  "version": "0.8.111",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -21,14 +21,14 @@
     "url": "https://www.viamage.com/"
   },
   "dependencies": {
-    "@live-change/framework": "^0.8.110",
-    "@live-change/relations-plugin": "^0.8.110",
+    "@live-change/framework": "^0.8.111",
+    "@live-change/relations-plugin": "^0.8.111",
     "lru-cache": "^7.12.0",
     "pluralize": "^8.0.0",
     "progress-stream": "^2.0.0",
     "prosemirror-model": "^1.18.1",
     "stripe": "^17.2.1"
   },
-  "gitHead": "8af31d640f43b00b2874f2c70fa4d4486541adfe",
+  "gitHead": "9b96afb2fc61ab3d2a5d143924e2c56d411280b4",
   "type": "module"
 }

package/payment.js

@@ -7,35 +7,35 @@ import config from './config.js'
 import stripe from "./stripeClient.js"
 
 const itemsArray = {
-    type: Array,
-    of: {
-      type: Object,
-      properties: {
-        name: {
-          type: String,
-          validation: ['nonEmpty']
-        },
-        price: {
-          type: Number,
-          validation: ['nonEmpty', 'number']
-        },
-        currency: {
-          type: String,
-          validation: ['nonEmpty']
-        },
-        quantity: {
-          type: Number,
-          validation: ['nonEmpty', 'number']
-        },
-        description: {
-          type: String
-        },
-        taxCode: {
-          type: String
-        }
+  type: Array,
+  of: {
+    type: Object,
+    properties: {
+      name: {
+        type: String,
+        validation: ['nonEmpty']
+      },
+      price: {
+        type: Number,
+        validation: ['nonEmpty', 'number']
+      },
+      currency: {
+        type: String,
+        validation: ['nonEmpty']
+      },
+      quantity: {
+        type: Number,
+        validation: ['nonEmpty', 'number']
+      },
+      description: {
+        type: String
+      },
+      taxCode: {
+        type: String
       }
     }
   }
+}
 
 const paymentParameters = {
   items: itemsArray,
@@ -90,12 +90,14 @@ definition.trigger({
   properties: {
     ...paymentParameters
   },
-  waitForEvents:true,
+  waitForEvents: true,
   async execute({ items, causeType, cause, successUrl, cancelUrl, payerType, payer }, { service }, emit) {
     const payment = app.generateUid()
+    if(!successUrl) successUrl = config.checkoutSuccessUrl + '/' + payment.replace(/\[/g, '(').replace(/]/g, ')')
+    if(!cancelUrl) cancelUrl = config.checkoutCancelUrl + '/' + payment.replace(/\[/g, '(').replace(/]/g, ')')
     console.log("URLS", {
-      success_url: successUrl ?? (config.checkoutSuccessUrl + '/' + payment),
-      cancel_url: cancelUrl ?? (config.checkoutCancelUrl + '/' + payment)
+      success_url: successUrl,
+      cancel_url: cancelUrl,
     })
     const metadata = {
       type: 'payment',
@@ -128,14 +130,15 @@ definition.trigger({
         metadata
       },
       mode: 'payment',
-      success_url: successUrl ?? (config.checkoutSuccessUrl + '/' + payment),
-      cancel_url: cancelUrl ?? (config.checkoutCancelUrl + '/' + payment)
+      success_url: successUrl,
+      cancel_url: cancelUrl,
     })
     emit({
       type: 'PaymentCreated',
       payment,
       data: {
         items, causeType, cause, payerType, payer,
+        successUrl, cancelUrl,
         stripeSession: session.id,
         state: 'created'
       }
@@ -147,3 +150,4 @@ definition.trigger({
     }
   }
 })
+

package/stripeEvents.js

@@ -8,13 +8,6 @@ import stripe from "./stripeClient.js"
 
 import { Payment } from './payment.js'
 
-
-/// TODO: obsługa zdarzeń:
-/// dla stanu płatności:
-/// charge.succeeded
-/// charge.refunded
-
-
 definition.trigger({
   name: 'stripeEvent.checkout.session.completed',
   properties: {
@@ -42,6 +35,7 @@ definition.trigger({
       const payment = await Payment.get(referenceId)
       if(!payment) throw new Error('Payment '+referenceId+' not found')
       if(object.payment_status === 'paid') {
+        console.log("PAYMENT TO UPDATE", payment)
         await triggerService({
           service: definition.name,
           type: 'stripe_updatePayment'
@@ -50,6 +44,7 @@ definition.trigger({
           state: 'succeeded'
         })
         const triggerData = {
+          paymentType: 'stripe_Payment',
           payment: referenceId,
           causeType: payment.causeType,
           cause: payment.cause,
@@ -113,6 +108,7 @@ definition.trigger({
         state: 'failed'
       })
       const triggerData = {
+        paymentType: 'stripe_Payment',
         payment: referenceId,
         causeType: payment.causeType,
         cause: payment.cause,
@@ -168,6 +164,7 @@ definition.trigger({
           state: 'succeeded'
         })
         const triggerData = {
+          paymentType: 'stripe_Payment',
           payment: referenceId,
           causeType: payment.causeType,
           cause: payment.cause,
@@ -230,6 +227,7 @@ definition.trigger({
         state: 'failed'
       })
       const triggerData = {
+        paymentType: 'stripe_Payment',
         payment: referenceId,
         causeType: payment.causeType,
         cause: payment.cause,
@@ -267,6 +265,7 @@ definition.trigger({
     if(object.metadata?.type === 'payment') {
       const payment = await Payment.get(object.metadata.payment)
       const triggerData = {
+        paymentType: 'stripe_Payment',
         payment: payment.id,
         causeType: payment.causeType,
         cause: payment.cause,
@@ -303,6 +302,7 @@ definition.trigger({
     if(object.metadata?.type === 'payment') {
       const payment = await Payment.get(object.metadata.payment)
       const triggerData = {
+        paymentType: 'stripe_Payment',
         payment: payment.id,
         causeType: payment.causeType,
         cause: payment.cause,

package/webhook.js

@@ -3,13 +3,12 @@ const app = App.app()
 import definition from './definition.js'
 import config from './config.js'
 
+import { encodeDate } from "@live-change/uid"
+
 import crypto from "crypto"
 import express from "express"
 import stripe from "stripe"
 
-
-
-
 definition.endpoint({
   name: 'webhook',
   create() {
@@ -24,10 +23,13 @@ definition.endpoint({
       try {
         const signature = request.headers['stripe-signature']
         const event = stripe.webhooks.constructEvent(request.body, signature, config.webhookSecret)
-        console.log("STRIPE WEBHOOK", event.type )//,JSON.stringify(event))
+        console.log("STRIPE WEBHOOK", event.type)//, JSON.stringify(event))
+        const { id, created } = event
+        const eventIdEncoded = `[${encodeDate(new Date(created*1000))}.${id}@stripe]`
         await app.trigger({
           // service: 'stripe',
-          type: `stripeEvent.${event.type}`
+          type: `stripeEvent.${event.type}`,
+          id: eventIdEncoded // needed for deduplication
         }, {
           ...event
         })