@unchainedshop/plugins 3.0.0-alpha7 → 3.0.0-rc10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/delivery/pick-mup.js +1 -2
- package/lib/delivery/pick-mup.js.map +1 -1
- package/lib/delivery/post.js +2 -1
- package/lib/delivery/post.js.map +1 -1
- package/lib/delivery/send-message.js +2 -1
- package/lib/delivery/send-message.js.map +1 -1
- package/lib/delivery/stores.js +2 -1
- package/lib/delivery/stores.js.map +1 -1
- package/lib/enrollments/licensed.d.ts.map +1 -1
- package/lib/enrollments/licensed.js +1 -1
- package/lib/enrollments/licensed.js.map +1 -1
- package/lib/events/aws-eventbridge.d.ts +2 -0
- package/lib/events/aws-eventbridge.d.ts.map +1 -0
- package/lib/events/aws-eventbridge.js +36 -0
- package/lib/events/aws-eventbridge.js.map +1 -0
- package/lib/events/node-event-emitter.js +2 -3
- package/lib/events/node-event-emitter.js.map +1 -1
- package/lib/events/redis.js +4 -2
- package/lib/events/redis.js.map +1 -1
- package/lib/files/gridfs/gridfs-adapter.d.ts +7 -1
- package/lib/files/gridfs/gridfs-adapter.d.ts.map +1 -1
- package/lib/files/gridfs/gridfs-adapter.js +16 -8
- package/lib/files/gridfs/gridfs-adapter.js.map +1 -1
- package/lib/files/gridfs/gridfs-webhook.d.ts +1 -1
- package/lib/files/gridfs/gridfs-webhook.d.ts.map +1 -1
- package/lib/files/gridfs/gridfs-webhook.js +27 -8
- package/lib/files/gridfs/gridfs-webhook.js.map +1 -1
- package/lib/files/gridfs/index.d.ts +1 -0
- package/lib/files/gridfs/index.d.ts.map +1 -1
- package/lib/files/gridfs/sign.d.ts +1 -1
- package/lib/files/gridfs/sign.d.ts.map +1 -1
- package/lib/files/gridfs/sign.js +8 -7
- package/lib/files/gridfs/sign.js.map +1 -1
- package/lib/files/minio/minio-adapter.d.ts.map +1 -1
- package/lib/files/minio/minio-adapter.js +19 -32
- package/lib/files/minio/minio-adapter.js.map +1 -1
- package/lib/files/minio/minio-webhook.d.ts.map +1 -1
- package/lib/files/minio/minio-webhook.js +4 -3
- package/lib/files/minio/minio-webhook.js.map +1 -1
- package/lib/filters/local-search.d.ts +1 -1
- package/lib/filters/local-search.d.ts.map +1 -1
- package/lib/filters/local-search.js +1 -1
- package/lib/filters/local-search.js.map +1 -1
- package/lib/filters/strict-equal.js +1 -1
- package/lib/filters/strict-equal.js.map +1 -1
- package/lib/payment/apple-iap/adapter.d.ts.map +1 -1
- package/lib/payment/apple-iap/adapter.js +16 -21
- package/lib/payment/apple-iap/adapter.js.map +1 -1
- package/lib/payment/apple-iap/db/AppleTransactionsCollection.d.ts +1 -1
- package/lib/payment/apple-iap/db/AppleTransactionsCollection.d.ts.map +1 -1
- package/lib/payment/apple-iap/module/configureAppleTransactionsModule.d.ts +1 -1
- package/lib/payment/apple-iap/module/configureAppleTransactionsModule.d.ts.map +1 -1
- package/lib/payment/braintree.js +10 -8
- package/lib/payment/braintree.js.map +1 -1
- package/lib/payment/cryptopay/db/CryptopayTransactions.d.ts +1 -1
- package/lib/payment/cryptopay/db/CryptopayTransactions.d.ts.map +1 -1
- package/lib/payment/cryptopay/middleware.d.ts.map +1 -1
- package/lib/payment/cryptopay/middleware.js +4 -4
- package/lib/payment/cryptopay/middleware.js.map +1 -1
- package/lib/payment/cryptopay/plugin.d.ts +1 -1
- package/lib/payment/cryptopay/plugin.d.ts.map +1 -1
- package/lib/payment/cryptopay/plugin.js +8 -9
- package/lib/payment/cryptopay/plugin.js.map +1 -1
- package/lib/payment/datatrans-v2/api/authorize.d.ts +1 -1
- package/lib/payment/datatrans-v2/api/authorize.d.ts.map +1 -1
- package/lib/payment/datatrans-v2/api/authorizeAuthenticated.d.ts +1 -1
- package/lib/payment/datatrans-v2/api/authorizeAuthenticated.d.ts.map +1 -1
- package/lib/payment/datatrans-v2/api/cancel.d.ts +1 -1
- package/lib/payment/datatrans-v2/api/cancel.d.ts.map +1 -1
- package/lib/payment/datatrans-v2/api/init.d.ts +1 -1
- package/lib/payment/datatrans-v2/api/init.d.ts.map +1 -1
- package/lib/payment/datatrans-v2/api/makeFetcher.d.ts.map +1 -1
- package/lib/payment/datatrans-v2/api/makeFetcher.js +5 -10
- package/lib/payment/datatrans-v2/api/makeFetcher.js.map +1 -1
- package/lib/payment/datatrans-v2/api/secureFields.d.ts +1 -1
- package/lib/payment/datatrans-v2/api/secureFields.d.ts.map +1 -1
- package/lib/payment/datatrans-v2/api/settle.d.ts +1 -1
- package/lib/payment/datatrans-v2/api/settle.d.ts.map +1 -1
- package/lib/payment/datatrans-v2/api/status.d.ts +1 -1
- package/lib/payment/datatrans-v2/api/status.d.ts.map +1 -1
- package/lib/payment/datatrans-v2/api/types.d.ts +260 -0
- package/lib/payment/datatrans-v2/api/types.d.ts.map +1 -0
- package/lib/payment/datatrans-v2/api/types.js +2 -0
- package/lib/payment/datatrans-v2/api/types.js.map +1 -0
- package/lib/payment/datatrans-v2/api/validate.d.ts +1 -1
- package/lib/payment/datatrans-v2/api/validate.d.ts.map +1 -1
- package/lib/payment/datatrans-v2/generateSignature.d.ts +1 -1
- package/lib/payment/datatrans-v2/generateSignature.d.ts.map +1 -1
- package/lib/payment/datatrans-v2/generateSignature.js +7 -4
- package/lib/payment/datatrans-v2/generateSignature.js.map +1 -1
- package/lib/payment/datatrans-v2/index.d.ts.map +1 -1
- package/lib/payment/datatrans-v2/index.js +31 -29
- package/lib/payment/datatrans-v2/index.js.map +1 -1
- package/lib/payment/datatrans-v2/middleware.d.ts.map +1 -1
- package/lib/payment/datatrans-v2/middleware.js +7 -5
- package/lib/payment/datatrans-v2/middleware.js.map +1 -1
- package/lib/payment/datatrans-v2/parseRegistrationData.d.ts +4 -4
- package/lib/payment/datatrans-v2/parseRegistrationData.d.ts.map +1 -1
- package/lib/payment/datatrans-v2/parseRegistrationData.js +5 -3
- package/lib/payment/datatrans-v2/parseRegistrationData.js.map +1 -1
- package/lib/payment/datatrans-v2/roundedAmountFromOrder.d.ts +1 -2
- package/lib/payment/datatrans-v2/roundedAmountFromOrder.d.ts.map +1 -1
- package/lib/payment/datatrans-v2/roundedAmountFromOrder.js +6 -2
- package/lib/payment/datatrans-v2/roundedAmountFromOrder.js.map +1 -1
- package/lib/payment/datatrans-v2/splitProperties.d.ts +0 -1
- package/lib/payment/datatrans-v2/splitProperties.d.ts.map +1 -1
- package/lib/payment/datatrans-v2/splitProperties.js +0 -3
- package/lib/payment/datatrans-v2/splitProperties.js.map +1 -1
- package/lib/payment/invoice-prepaid.js +4 -3
- package/lib/payment/invoice-prepaid.js.map +1 -1
- package/lib/payment/invoice.js +4 -3
- package/lib/payment/invoice.js.map +1 -1
- package/lib/payment/paypal-checkout.js +10 -6
- package/lib/payment/paypal-checkout.js.map +1 -1
- package/lib/payment/payrexx/api/makeFetcher.d.ts.map +1 -1
- package/lib/payment/payrexx/api/makeFetcher.js +9 -15
- package/lib/payment/payrexx/api/makeFetcher.js.map +1 -1
- package/lib/payment/payrexx/index.d.ts.map +1 -1
- package/lib/payment/payrexx/index.js +20 -14
- package/lib/payment/payrexx/index.js.map +1 -1
- package/lib/payment/payrexx/middleware.d.ts.map +1 -1
- package/lib/payment/payrexx/middleware.js +12 -9
- package/lib/payment/payrexx/middleware.js.map +1 -1
- package/lib/payment/postfinance-checkout/index.d.ts.map +1 -1
- package/lib/payment/postfinance-checkout/index.js +18 -13
- package/lib/payment/postfinance-checkout/index.js.map +1 -1
- package/lib/payment/postfinance-checkout/middleware.d.ts.map +1 -1
- package/lib/payment/postfinance-checkout/middleware.js +4 -3
- package/lib/payment/postfinance-checkout/middleware.js.map +1 -1
- package/lib/payment/postfinance-checkout/utils.d.ts +2 -2
- package/lib/payment/postfinance-checkout/utils.d.ts.map +1 -1
- package/lib/payment/postfinance-checkout/utils.js +6 -2
- package/lib/payment/postfinance-checkout/utils.js.map +1 -1
- package/lib/payment/saferpay/adapter.d.ts +1 -1
- package/lib/payment/saferpay/adapter.d.ts.map +1 -1
- package/lib/payment/saferpay/adapter.js +17 -11
- package/lib/payment/saferpay/adapter.js.map +1 -1
- package/lib/payment/saferpay/api/api/SaferpayConnection.d.ts.map +1 -1
- package/lib/payment/saferpay/api/api/SaferpayConnection.js +0 -1
- package/lib/payment/saferpay/api/api/SaferpayConnection.js.map +1 -1
- package/lib/payment/saferpay/api/models/TransactionCapture.d.ts +1 -1
- package/lib/payment/saferpay/api/models/TransactionCapture.d.ts.map +1 -1
- package/lib/payment/saferpay/db/SaferpayTransactionsCollection.d.ts +1 -1
- package/lib/payment/saferpay/db/SaferpayTransactionsCollection.d.ts.map +1 -1
- package/lib/payment/saferpay/middleware.d.ts.map +1 -1
- package/lib/payment/saferpay/middleware.js +4 -4
- package/lib/payment/saferpay/middleware.js.map +1 -1
- package/lib/payment/stripe/index.d.ts.map +1 -1
- package/lib/payment/stripe/index.js +17 -11
- package/lib/payment/stripe/index.js.map +1 -1
- package/lib/payment/stripe/middleware.d.ts.map +1 -1
- package/lib/payment/stripe/middleware.js +10 -10
- package/lib/payment/stripe/middleware.js.map +1 -1
- package/lib/payment/stripe/stripe.d.ts +3 -4
- package/lib/payment/stripe/stripe.d.ts.map +1 -1
- package/lib/payment/stripe/stripe.js +3 -1
- package/lib/payment/stripe/stripe.js.map +1 -1
- package/lib/pricing/delivery-swiss-tax.d.ts +1 -1
- package/lib/pricing/delivery-swiss-tax.d.ts.map +1 -1
- package/lib/pricing/delivery-swiss-tax.js +1 -2
- package/lib/pricing/delivery-swiss-tax.js.map +1 -1
- package/lib/pricing/discount-100-off.d.ts +1 -2
- package/lib/pricing/discount-100-off.d.ts.map +1 -1
- package/lib/pricing/discount-100-off.js +1 -1
- package/lib/pricing/discount-100-off.js.map +1 -1
- package/lib/pricing/discount-half-price-manual.d.ts +1 -2
- package/lib/pricing/discount-half-price-manual.d.ts.map +1 -1
- package/lib/pricing/discount-half-price-manual.js +1 -1
- package/lib/pricing/discount-half-price-manual.js.map +1 -1
- package/lib/pricing/discount-half-price.d.ts +1 -2
- package/lib/pricing/discount-half-price.d.ts.map +1 -1
- package/lib/pricing/discount-half-price.js +1 -1
- package/lib/pricing/discount-half-price.js.map +1 -1
- package/lib/pricing/free-delivery.d.ts +1 -1
- package/lib/pricing/free-delivery.d.ts.map +1 -1
- package/lib/pricing/free-delivery.js +1 -1
- package/lib/pricing/free-delivery.js.map +1 -1
- package/lib/pricing/free-payment.d.ts +1 -1
- package/lib/pricing/free-payment.d.ts.map +1 -1
- package/lib/pricing/free-payment.js +1 -1
- package/lib/pricing/free-payment.js.map +1 -1
- package/lib/pricing/order-delivery.d.ts +1 -1
- package/lib/pricing/order-delivery.d.ts.map +1 -1
- package/lib/pricing/order-delivery.js +6 -3
- package/lib/pricing/order-delivery.js.map +1 -1
- package/lib/pricing/order-discount.d.ts +1 -2
- package/lib/pricing/order-discount.d.ts.map +1 -1
- package/lib/pricing/order-discount.js +15 -8
- package/lib/pricing/order-discount.js.map +1 -1
- package/lib/pricing/order-items-discount.js +7 -4
- package/lib/pricing/order-items-discount.js.map +1 -1
- package/lib/pricing/order-items.js +7 -3
- package/lib/pricing/order-items.js.map +1 -1
- package/lib/pricing/order-payment.js +6 -3
- package/lib/pricing/order-payment.js.map +1 -1
- package/lib/pricing/order-round.d.ts +1 -1
- package/lib/pricing/order-round.d.ts.map +1 -1
- package/lib/pricing/order-round.js +1 -2
- package/lib/pricing/order-round.js.map +1 -1
- package/lib/pricing/product-catalog-price.d.ts +2 -2
- package/lib/pricing/product-catalog-price.d.ts.map +1 -1
- package/lib/pricing/product-catalog-price.js +7 -6
- package/lib/pricing/product-catalog-price.js.map +1 -1
- package/lib/pricing/product-discount.js +1 -2
- package/lib/pricing/product-discount.js.map +1 -1
- package/lib/pricing/product-price-rateconversion.d.ts +1 -1
- package/lib/pricing/product-price-rateconversion.d.ts.map +1 -1
- package/lib/pricing/product-price-rateconversion.js +1 -1
- package/lib/pricing/product-price-rateconversion.js.map +1 -1
- package/lib/pricing/product-round.d.ts +1 -1
- package/lib/pricing/product-round.d.ts.map +1 -1
- package/lib/pricing/product-round.js +1 -1
- package/lib/pricing/product-round.js.map +1 -1
- package/lib/pricing/product-swiss-tax.d.ts +4 -3
- package/lib/pricing/product-swiss-tax.d.ts.map +1 -1
- package/lib/pricing/product-swiss-tax.js +1 -2
- package/lib/pricing/product-swiss-tax.js.map +1 -1
- package/lib/quotations/manual.js +1 -1
- package/lib/quotations/manual.js.map +1 -1
- package/lib/warehousing/eth-minter.js +7 -4
- package/lib/warehousing/eth-minter.js.map +1 -1
- package/lib/warehousing/store.js +2 -1
- package/lib/warehousing/store.js.map +1 -1
- package/lib/worker/BaseWorker.d.ts +30 -0
- package/lib/worker/BaseWorker.d.ts.map +1 -0
- package/lib/worker/BaseWorker.js +81 -0
- package/lib/worker/BaseWorker.js.map +1 -0
- package/lib/worker/EventListenerWorker.d.ts +6 -0
- package/lib/worker/EventListenerWorker.d.ts.map +1 -0
- package/lib/worker/EventListenerWorker.js +46 -0
- package/lib/worker/EventListenerWorker.js.map +1 -0
- package/lib/worker/FailedRescheduler.d.ts +15 -0
- package/lib/worker/FailedRescheduler.d.ts.map +1 -0
- package/lib/worker/FailedRescheduler.js +45 -0
- package/lib/worker/FailedRescheduler.js.map +1 -0
- package/lib/worker/IntervalWorker.d.ts +10 -0
- package/lib/worker/IntervalWorker.d.ts.map +1 -0
- package/lib/worker/IntervalWorker.js +37 -0
- package/lib/worker/IntervalWorker.js.map +1 -0
- package/lib/worker/bulk-import.d.ts +1 -1
- package/lib/worker/bulk-import.d.ts.map +1 -1
- package/lib/worker/bulk-import.js +7 -8
- package/lib/worker/bulk-import.js.map +1 -1
- package/lib/worker/email.d.ts.map +1 -1
- package/lib/worker/email.js +18 -19
- package/lib/worker/email.js.map +1 -1
- package/lib/worker/enrollment-order-generator.d.ts.map +1 -1
- package/lib/worker/enrollment-order-generator.js +17 -15
- package/lib/worker/enrollment-order-generator.js.map +1 -1
- package/lib/worker/error-notifications.d.ts +1 -1
- package/lib/worker/error-notifications.d.ts.map +1 -1
- package/lib/worker/error-notifications.js +1 -1
- package/lib/worker/error-notifications.js.map +1 -1
- package/lib/worker/export-token.d.ts +1 -2
- package/lib/worker/export-token.d.ts.map +1 -1
- package/lib/worker/export-token.js +2 -1
- package/lib/worker/export-token.js.map +1 -1
- package/lib/worker/external.d.ts +1 -1
- package/lib/worker/external.d.ts.map +1 -1
- package/lib/worker/external.js +1 -1
- package/lib/worker/external.js.map +1 -1
- package/lib/worker/heartbeat.js +1 -1
- package/lib/worker/heartbeat.js.map +1 -1
- package/lib/worker/http-request.d.ts +1 -1
- package/lib/worker/http-request.d.ts.map +1 -1
- package/lib/worker/http-request.js +1 -5
- package/lib/worker/http-request.js.map +1 -1
- package/lib/worker/message.d.ts +2 -2
- package/lib/worker/message.d.ts.map +1 -1
- package/lib/worker/message.js +1 -5
- package/lib/worker/message.js.map +1 -1
- package/lib/worker/push-notification.js +1 -4
- package/lib/worker/push-notification.js.map +1 -1
- package/lib/worker/sms.js +1 -4
- package/lib/worker/sms.js.map +1 -1
- package/lib/worker/update-coinbase-rates.js +1 -1
- package/lib/worker/update-coinbase-rates.js.map +1 -1
- package/lib/worker/update-ecb-rates.js +1 -1
- package/lib/worker/update-ecb-rates.js.map +1 -1
- package/lib/worker/update-token-ownership.d.ts +1 -1
- package/lib/worker/update-token-ownership.d.ts.map +1 -1
- package/lib/worker/update-token-ownership.js +1 -1
- package/lib/worker/update-token-ownership.js.map +1 -1
- package/lib/worker/zombie-killer.d.ts +8 -2
- package/lib/worker/zombie-killer.d.ts.map +1 -1
- package/lib/worker/zombie-killer.js +12 -9
- package/lib/worker/zombie-killer.js.map +1 -1
- package/package.json +123 -85
- package/src/delivery/pick-mup.ts +2 -3
- package/src/delivery/post.ts +2 -2
- package/src/delivery/send-message.ts +2 -2
- package/src/delivery/stores.ts +2 -2
- package/src/enrollments/licensed.ts +1 -2
- package/src/events/aws-eventbridge.ts +43 -0
- package/src/events/node-event-emitter.ts +2 -3
- package/src/events/redis.ts +4 -2
- package/src/files/gridfs/gridfs-adapter.ts +29 -12
- package/src/files/gridfs/gridfs-webhook.ts +31 -11
- package/src/files/gridfs/index.ts +2 -0
- package/src/files/gridfs/sign.ts +20 -8
- package/src/files/minio/minio-adapter.ts +21 -37
- package/src/files/minio/minio-webhook.ts +5 -3
- package/src/filters/local-search.ts +1 -2
- package/src/filters/strict-equal.ts +1 -2
- package/src/payment/apple-iap/adapter.ts +23 -41
- package/src/payment/apple-iap/db/AppleTransactionsCollection.ts +1 -1
- package/src/payment/apple-iap/module/configureAppleTransactionsModule.ts +1 -1
- package/src/payment/braintree.ts +16 -9
- package/src/payment/cryptopay/db/CryptopayTransactions.ts +1 -1
- package/src/payment/cryptopay/middleware.ts +11 -8
- package/src/payment/cryptopay/plugin.ts +14 -11
- package/src/payment/datatrans-v2/api/authorize.ts +1 -1
- package/src/payment/datatrans-v2/api/authorizeAuthenticated.ts +1 -1
- package/src/payment/datatrans-v2/api/cancel.ts +1 -1
- package/src/payment/datatrans-v2/api/init.ts +1 -1
- package/src/payment/datatrans-v2/api/makeFetcher.ts +8 -12
- package/src/payment/datatrans-v2/api/secureFields.ts +1 -1
- package/src/payment/datatrans-v2/api/settle.ts +1 -1
- package/src/payment/datatrans-v2/api/status.ts +1 -1
- package/src/payment/datatrans-v2/api/validate.ts +1 -1
- package/src/payment/datatrans-v2/generateSignature.test.ts +15 -0
- package/src/payment/datatrans-v2/generateSignature.ts +18 -6
- package/src/payment/datatrans-v2/index.ts +41 -36
- package/src/payment/datatrans-v2/middleware.ts +8 -12
- package/src/payment/datatrans-v2/parseRegistrationData.ts +7 -5
- package/src/payment/datatrans-v2/roundedAmountFromOrder.ts +6 -6
- package/src/payment/datatrans-v2/splitProperties.ts +0 -5
- package/src/payment/invoice-prepaid.ts +4 -4
- package/src/payment/invoice.ts +4 -4
- package/src/payment/paypal-checkout.ts +16 -7
- package/src/payment/payrexx/api/makeFetcher.ts +12 -16
- package/src/payment/payrexx/index.ts +26 -15
- package/src/payment/payrexx/middleware.ts +14 -19
- package/src/payment/postfinance-checkout/index.ts +26 -17
- package/src/payment/postfinance-checkout/middleware.ts +6 -9
- package/src/payment/postfinance-checkout/utils.ts +6 -3
- package/src/payment/saferpay/adapter.ts +23 -13
- package/src/payment/saferpay/api/api/SaferpayConnection.ts +0 -1
- package/src/payment/saferpay/api/models/TransactionCapture.ts +1 -1
- package/src/payment/saferpay/db/SaferpayTransactionsCollection.ts +1 -1
- package/src/payment/saferpay/middleware.ts +6 -10
- package/src/payment/stripe/index.ts +23 -12
- package/src/payment/stripe/middleware.ts +15 -23
- package/src/payment/stripe/stripe.ts +6 -5
- package/src/pricing/delivery-swiss-tax.ts +6 -2
- package/src/pricing/discount-100-off.ts +2 -2
- package/src/pricing/discount-half-price-manual.ts +6 -3
- package/src/pricing/discount-half-price.ts +6 -3
- package/src/pricing/free-delivery.ts +1 -1
- package/src/pricing/free-payment.ts +1 -1
- package/src/pricing/order-delivery.ts +11 -8
- package/src/pricing/order-discount.ts +26 -11
- package/src/pricing/order-items-discount.ts +12 -5
- package/src/pricing/order-items.ts +12 -8
- package/src/pricing/order-payment.ts +11 -8
- package/src/pricing/order-round.ts +6 -2
- package/src/pricing/product-catalog-price.ts +12 -7
- package/src/pricing/product-discount.ts +5 -4
- package/src/pricing/product-price-rateconversion.ts +5 -2
- package/src/pricing/product-round.ts +5 -2
- package/src/pricing/product-swiss-tax.ts +5 -3
- package/src/quotations/manual.ts +1 -2
- package/src/warehousing/eth-minter.ts +11 -10
- package/src/warehousing/store.ts +2 -6
- package/src/worker/BaseWorker.ts +119 -0
- package/src/worker/EventListenerWorker.ts +61 -0
- package/src/worker/FailedRescheduler.ts +80 -0
- package/src/worker/IntervalWorker.ts +54 -0
- package/src/worker/bulk-import.ts +12 -13
- package/src/worker/email.ts +20 -22
- package/src/worker/enrollment-order-generator.ts +25 -34
- package/src/worker/error-notifications.ts +2 -2
- package/src/worker/export-token.ts +2 -8
- package/src/worker/external.ts +1 -2
- package/src/worker/heartbeat.ts +1 -2
- package/src/worker/http-request.ts +1 -8
- package/src/worker/message.ts +2 -6
- package/src/worker/push-notification.ts +1 -6
- package/src/worker/sms.ts +1 -7
- package/src/worker/update-coinbase-rates.ts +1 -3
- package/src/worker/update-ecb-rates.ts +1 -3
- package/src/worker/update-token-ownership.ts +1 -2
- package/src/worker/zombie-killer.ts +23 -23
- package/tests/mock/datatrans/v1/secure-fields.json +4 -0
- package/tests/mock/datatrans/v1/transactions/authorize.json +48 -0
- package/tests/mock/datatrans/v1/transactions/card_check_authorized.json +47 -0
- package/tests/mock/datatrans/v1/transactions/payment_alias_authorized/settle.json +1 -0
- package/tests/mock/datatrans/v1/transactions/payment_alias_authorized.json +48 -0
- package/tests/mock/datatrans/v1/transactions/payment_authorized/cancel.json +1 -0
- package/tests/mock/datatrans/v1/transactions/payment_authorized/settle.json +1 -0
- package/tests/mock/datatrans/v1/transactions/payment_authorized.json +48 -0
- package/tests/mock/datatrans/v1/transactions/payment_authorized_low_amount/cancel.json +1 -0
- package/tests/mock/datatrans/v1/transactions/payment_authorized_low_amount.json +48 -0
- package/tests/mock/datatrans/v1/transactions/validate.json +1 -0
- package/tests/mock/datatrans/v1/transactions.json +4 -0
- package/tests/mock/payrexx/Gateway/1000001.json +106 -0
- package/tests/mock/payrexx/Gateway.json +24 -0
- package/tests/mock/payrexx/transaction_example1.json +65 -0
- package/tests/mock/payrexx/transaction_example2.json +65 -0
- package/tests/mock/payrexx/transaction_example3.json +94 -0
- package/tsconfig.json +4 -5
- /package/src/payment/datatrans-v2/api/{types.d.ts → types.ts} +0 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/payment/payrexx/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/payment/payrexx/index.ts"],"names":[],"mappings":"AAWA,cAAc,iBAAiB,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { PaymentAdapter, PaymentDirector, PaymentError } from '@unchainedshop/core-payment';
|
|
2
1
|
import { createLogger } from '@unchainedshop/logger';
|
|
3
2
|
import { mapOrderDataToGatewayObject, mapUserToGatewayObject } from './payrexx.js';
|
|
4
3
|
import createPayrexxAPI, { GatewayObjectStatus } from './api/index.js';
|
|
4
|
+
import { OrderPricingSheet, PaymentAdapter, PaymentDirector, PaymentError, } from '@unchainedshop/core';
|
|
5
5
|
export * from './middleware.js';
|
|
6
6
|
const logger = createLogger('unchained:core-payment:payrexx');
|
|
7
7
|
const Payrexx = {
|
|
@@ -12,14 +12,14 @@ const Payrexx = {
|
|
|
12
12
|
typeSupported(type) {
|
|
13
13
|
return type === 'GENERIC';
|
|
14
14
|
},
|
|
15
|
-
actions: (
|
|
16
|
-
const { modules } =
|
|
15
|
+
actions: (config, context) => {
|
|
16
|
+
const { modules } = context;
|
|
17
17
|
const getInstance = () => {
|
|
18
|
-
return
|
|
18
|
+
return config.find((c) => c.key === 'instance')?.value;
|
|
19
19
|
};
|
|
20
20
|
const api = createPayrexxAPI(getInstance(), process.env.PAYREXX_SECRET);
|
|
21
21
|
const adapterActions = {
|
|
22
|
-
...PaymentAdapter.actions(
|
|
22
|
+
...PaymentAdapter.actions(config, context),
|
|
23
23
|
configurationError() {
|
|
24
24
|
if (!process.env.PAYREXX_SECRET) {
|
|
25
25
|
return PaymentError.INCOMPLETE_CONFIGURATION;
|
|
@@ -38,10 +38,13 @@ const Payrexx = {
|
|
|
38
38
|
return false;
|
|
39
39
|
},
|
|
40
40
|
sign: async (transactionContext = {}) => {
|
|
41
|
-
const { orderPayment, userId, order } =
|
|
41
|
+
const { orderPayment, userId, order } = context;
|
|
42
42
|
if (orderPayment) {
|
|
43
43
|
// Order Checkout signing (One-time payment)
|
|
44
|
-
const pricing =
|
|
44
|
+
const pricing = OrderPricingSheet({
|
|
45
|
+
calculation: order.calculation,
|
|
46
|
+
currency: order.currency,
|
|
47
|
+
});
|
|
45
48
|
const gatewayObject = mapOrderDataToGatewayObject({ order, orderPayment, pricing }, transactionContext);
|
|
46
49
|
const gateway = await api.createGateway(gatewayObject);
|
|
47
50
|
return JSON.stringify(gateway);
|
|
@@ -73,12 +76,12 @@ const Payrexx = {
|
|
|
73
76
|
// transactionId,
|
|
74
77
|
// })) as StatusResponseSuccess;
|
|
75
78
|
// if (result.transactionId) {
|
|
76
|
-
// return parseRegistrationData(result);
|
|
79
|
+
// return await parseRegistrationData(result);
|
|
77
80
|
// }
|
|
78
81
|
return null;
|
|
79
82
|
},
|
|
80
83
|
async confirm() {
|
|
81
|
-
const { orderPayment } =
|
|
84
|
+
const { orderPayment } = context;
|
|
82
85
|
const { transactionId } = orderPayment;
|
|
83
86
|
if (!transactionId) {
|
|
84
87
|
return false;
|
|
@@ -100,7 +103,7 @@ const Payrexx = {
|
|
|
100
103
|
return false; // some other status with refund or anything, can't confirm!
|
|
101
104
|
},
|
|
102
105
|
async cancel() {
|
|
103
|
-
const { orderPayment } =
|
|
106
|
+
const { orderPayment } = context;
|
|
104
107
|
const { transactionId } = orderPayment;
|
|
105
108
|
if (!transactionId) {
|
|
106
109
|
return false;
|
|
@@ -123,7 +126,7 @@ const Payrexx = {
|
|
|
123
126
|
if (!gatewayId && !paymentCredentials) {
|
|
124
127
|
throw new Error('You have to provide gatewayId or paymentCredentials');
|
|
125
128
|
}
|
|
126
|
-
const { order } =
|
|
129
|
+
const { order } = context;
|
|
127
130
|
const orderPayment = await modules.orders.payments.findOrderPayment({
|
|
128
131
|
orderPaymentId: order.paymentId,
|
|
129
132
|
});
|
|
@@ -131,7 +134,10 @@ const Payrexx = {
|
|
|
131
134
|
if (!gatewayObject) {
|
|
132
135
|
throw new Error('Could not load gateway from the Payrexx API');
|
|
133
136
|
}
|
|
134
|
-
const pricing =
|
|
137
|
+
const pricing = OrderPricingSheet({
|
|
138
|
+
calculation: order.calculation,
|
|
139
|
+
currency: order.currency,
|
|
140
|
+
});
|
|
135
141
|
const { currency, amount } = pricing.total({ useNetPrice: false });
|
|
136
142
|
if (
|
|
137
143
|
// gatewayObject.status === 'authorized' || // authorized is only used for tokenization!
|
|
@@ -146,7 +152,7 @@ const Payrexx = {
|
|
|
146
152
|
throw new Error('The order payment is different from the initiating intent');
|
|
147
153
|
}
|
|
148
154
|
// confirm will do the transition, to do a checkout those stati above are fine
|
|
149
|
-
logger.
|
|
155
|
+
logger.info(`Mark as charged, status is ${gatewayObject.status}`, {
|
|
150
156
|
orderPaymentId: gatewayObject.referenceId,
|
|
151
157
|
});
|
|
152
158
|
return {
|
|
@@ -163,7 +169,7 @@ const Payrexx = {
|
|
|
163
169
|
throw e;
|
|
164
170
|
}
|
|
165
171
|
}
|
|
166
|
-
logger.
|
|
172
|
+
logger.info('Charge not possible', {
|
|
167
173
|
orderPaymentId: gatewayObject.referenceId,
|
|
168
174
|
status: gatewayObject.status,
|
|
169
175
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/payment/payrexx/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/payment/payrexx/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../../src/payment/payrexx/middleware.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,cAAc,
|
|
1
|
+
{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../../src/payment/payrexx/middleware.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,cAAc,gDA+F1B,CAAC"}
|
|
@@ -2,10 +2,10 @@ import { createLogger } from '@unchainedshop/logger';
|
|
|
2
2
|
const logger = createLogger('unchained:core-payment:payrexx:webhook');
|
|
3
3
|
export const payrexxHandler = async (request, response) => {
|
|
4
4
|
const resolvedContext = request.unchainedContext;
|
|
5
|
-
const { modules } = resolvedContext;
|
|
5
|
+
const { modules, services } = resolvedContext;
|
|
6
6
|
const { transaction } = request.body;
|
|
7
7
|
if (!transaction) {
|
|
8
|
-
logger.
|
|
8
|
+
logger.info(`unhandled event type`, {
|
|
9
9
|
type: Object.keys(request.body).join(','),
|
|
10
10
|
});
|
|
11
11
|
response.writeHead(200);
|
|
@@ -18,7 +18,7 @@ export const payrexxHandler = async (request, response) => {
|
|
|
18
18
|
if (transaction.referenceId === '__IGNORE_WEBHOOK__' || transaction.status === 'waiting') {
|
|
19
19
|
// Ignore confirmed transactions, because those hooks are generated through calling the confirm()
|
|
20
20
|
// method in the payment adapter and could lead to double bookings.
|
|
21
|
-
logger.
|
|
21
|
+
logger.info(`unhandled transaction state: ${transaction.status}`);
|
|
22
22
|
response.writeHead(200);
|
|
23
23
|
response.end(JSON.stringify({
|
|
24
24
|
ignored: true,
|
|
@@ -26,7 +26,7 @@ export const payrexxHandler = async (request, response) => {
|
|
|
26
26
|
}));
|
|
27
27
|
return;
|
|
28
28
|
}
|
|
29
|
-
logger.
|
|
29
|
+
logger.info(`Processing event`, {
|
|
30
30
|
transactionId: transaction.id,
|
|
31
31
|
});
|
|
32
32
|
try {
|
|
@@ -34,8 +34,11 @@ export const payrexxHandler = async (request, response) => {
|
|
|
34
34
|
// Pre-Authorization Flow, referenceId is a userId
|
|
35
35
|
const { referenceId: paymentProviderId, invoice } = transaction;
|
|
36
36
|
const userId = '';
|
|
37
|
-
logger.
|
|
38
|
-
await
|
|
37
|
+
logger.info(`register credentials for: ${userId}`);
|
|
38
|
+
await services.orders.registerPaymentCredentials(paymentProviderId, {
|
|
39
|
+
userId,
|
|
40
|
+
transactionContext: { gatewayId: invoice.paymentRequestId },
|
|
41
|
+
});
|
|
39
42
|
logger.info(`registration successful`, {
|
|
40
43
|
paymentProviderId,
|
|
41
44
|
userId,
|
|
@@ -49,7 +52,7 @@ export const payrexxHandler = async (request, response) => {
|
|
|
49
52
|
}
|
|
50
53
|
else {
|
|
51
54
|
const { referenceId: orderPaymentId, invoice } = transaction;
|
|
52
|
-
logger.
|
|
55
|
+
logger.info(`checkout with orderPaymentId: ${orderPaymentId}`);
|
|
53
56
|
await modules.orders.payments.logEvent(orderPaymentId, {
|
|
54
57
|
transactionId: transaction.id,
|
|
55
58
|
});
|
|
@@ -59,11 +62,11 @@ export const payrexxHandler = async (request, response) => {
|
|
|
59
62
|
if (!orderPayment) {
|
|
60
63
|
throw new Error(`order payment not found with orderPaymentId: ${orderPaymentId}`);
|
|
61
64
|
}
|
|
62
|
-
const order = await
|
|
65
|
+
const order = await services.orders.checkoutOrder(orderPayment.orderId, {
|
|
63
66
|
paymentContext: {
|
|
64
67
|
gatewayId: invoice.paymentRequestId,
|
|
65
68
|
},
|
|
66
|
-
}
|
|
69
|
+
});
|
|
67
70
|
logger.info(`checkout successful`, {
|
|
68
71
|
orderPaymentId,
|
|
69
72
|
orderId: order._id,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../../src/payment/payrexx/middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,MAAM,MAAM,GAAG,YAAY,CAAC,wCAAwC,CAAC,CAAC;AAEtE,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE;IACxD,MAAM,eAAe,GAAG,OAAO,CAAC,gBAA2B,CAAC;IAC5D,MAAM,EAAE,OAAO,EAAE,GAAG,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../../src/payment/payrexx/middleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/payment/postfinance-checkout/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/payment/postfinance-checkout/index.ts"],"names":[],"mappings":"AA0BA,cAAc,iBAAiB,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { PaymentAdapter, PaymentDirector, PaymentError } from '@unchainedshop/core-payment';
|
|
2
1
|
import { createLogger } from '@unchainedshop/logger';
|
|
2
|
+
import { OrderPricingSheet, PaymentAdapter, PaymentDirector, PaymentError, } from '@unchainedshop/core';
|
|
3
3
|
import * as pf from 'postfinancecheckout';
|
|
4
4
|
import { confirmDeferredTransaction, createTransaction, getIframeJavascriptUrl, getLightboxJavascriptUrl, getPaymentPageUrl, getToken, getTransaction, refundTransaction, voidTransaction, } from './api.js';
|
|
5
5
|
import { orderIsPaid } from './utils.js';
|
|
@@ -21,12 +21,11 @@ const PostfinanceCheckout = {
|
|
|
21
21
|
typeSupported(type) {
|
|
22
22
|
return type === 'GENERIC';
|
|
23
23
|
},
|
|
24
|
-
actions: (
|
|
25
|
-
const { modules } = params.context;
|
|
24
|
+
actions: (config, context) => {
|
|
26
25
|
const adapter = {
|
|
27
|
-
...PaymentAdapter.actions(
|
|
26
|
+
...PaymentAdapter.actions(config, context),
|
|
28
27
|
getCompletionMode() {
|
|
29
|
-
return (
|
|
28
|
+
return (config.find((item) => item.key === 'completionMode')?.value ||
|
|
30
29
|
CompletionModes.Deferred);
|
|
31
30
|
},
|
|
32
31
|
// eslint-disable-next-line
|
|
@@ -57,13 +56,16 @@ const PostfinanceCheckout = {
|
|
|
57
56
|
return tokenData.state === PostFinanceCheckout.model.CreationEntityState.ACTIVE;
|
|
58
57
|
},
|
|
59
58
|
sign: async (transactionContext = {}) => {
|
|
60
|
-
const { orderPayment, order } =
|
|
59
|
+
const { orderPayment, order } = context;
|
|
61
60
|
const { integrationMode = IntegrationModes.PaymentPage } = transactionContext;
|
|
62
61
|
const completionMode = adapter.getCompletionMode();
|
|
63
|
-
const pricing =
|
|
62
|
+
const pricing = OrderPricingSheet({
|
|
63
|
+
calculation: order.calculation,
|
|
64
|
+
currency: order.currency,
|
|
65
|
+
});
|
|
64
66
|
const totalAmount = pricing?.total({ useNetPrice: false }).amount;
|
|
65
67
|
const transaction = new PostFinanceCheckout.model.TransactionCreate();
|
|
66
|
-
const userId = order?.userId ||
|
|
68
|
+
const userId = order?.userId || context?.userId;
|
|
67
69
|
transaction.currency = order.currency;
|
|
68
70
|
transaction.metaData = {
|
|
69
71
|
orderPaymentId: orderPayment._id,
|
|
@@ -122,7 +124,7 @@ const PostfinanceCheckout = {
|
|
|
122
124
|
message: 'Payment declined',
|
|
123
125
|
});
|
|
124
126
|
}
|
|
125
|
-
const isPaid = await orderIsPaid(
|
|
127
|
+
const isPaid = await orderIsPaid(context.order, transaction);
|
|
126
128
|
if (!isPaid) {
|
|
127
129
|
logger.error(`Transaction #${transactionId}: Invalid state / Amount incorrect`);
|
|
128
130
|
throw newError({
|
|
@@ -130,7 +132,7 @@ const PostfinanceCheckout = {
|
|
|
130
132
|
message: 'Invalid state / Amount incorrect',
|
|
131
133
|
});
|
|
132
134
|
}
|
|
133
|
-
if (transaction.metaData.orderPaymentId !==
|
|
135
|
+
if (transaction.metaData.orderPaymentId !== context.orderPayment._id) {
|
|
134
136
|
logger.error(`Transaction #${transactionId}: Invalid state / Amount incorrect`);
|
|
135
137
|
throw newError({
|
|
136
138
|
code: `TRANSACTION_ALREADY_USED`,
|
|
@@ -148,21 +150,24 @@ const PostfinanceCheckout = {
|
|
|
148
150
|
};
|
|
149
151
|
},
|
|
150
152
|
cancel: async () => {
|
|
151
|
-
const { orderPayment, order } =
|
|
153
|
+
const { orderPayment, order } = context;
|
|
152
154
|
const { transactionId } = orderPayment;
|
|
153
155
|
if (!transactionId) {
|
|
154
156
|
return false;
|
|
155
157
|
}
|
|
156
158
|
const transaction = await getTransaction(transactionId);
|
|
157
159
|
const refund = transaction.state === PostFinanceCheckout.model.TransactionState.FULFILL;
|
|
158
|
-
const pricing =
|
|
160
|
+
const pricing = OrderPricingSheet({
|
|
161
|
+
calculation: order.calculation,
|
|
162
|
+
currency: order.currency,
|
|
163
|
+
});
|
|
159
164
|
const totalAmount = pricing?.total({ useNetPrice: false }).amount;
|
|
160
165
|
// For immediate settlements, try refunding. For deferred settlements, void the transaction.
|
|
161
166
|
return ((refund && refundTransaction(transactionId, order._id, totalAmount / 100)) ||
|
|
162
167
|
voidTransaction(transactionId));
|
|
163
168
|
},
|
|
164
169
|
confirm: async () => {
|
|
165
|
-
const { orderPayment } =
|
|
170
|
+
const { orderPayment } = context;
|
|
166
171
|
const { transactionId } = orderPayment;
|
|
167
172
|
if (!transactionId) {
|
|
168
173
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/payment/postfinance-checkout/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/payment/postfinance-checkout/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../../src/payment/postfinance-checkout/middleware.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,0BAA0B,
|
|
1
|
+
{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../../src/payment/postfinance-checkout/middleware.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,0BAA0B,uCAsCtC,CAAC"}
|
|
@@ -3,22 +3,23 @@ import { getTransaction, getTransactionCompletion } from './api.js';
|
|
|
3
3
|
const logger = createLogger('unchained:core-payment:postfinance-checkout');
|
|
4
4
|
export const postfinanceCheckoutHandler = async (req, res) => {
|
|
5
5
|
const context = req.unchainedContext;
|
|
6
|
+
const { services, modules } = context;
|
|
6
7
|
const data = req.body;
|
|
7
8
|
if (data.listenerEntityTechnicalName === 'TransactionCompletion') {
|
|
8
9
|
try {
|
|
9
10
|
const transactionCompletion = await getTransactionCompletion(data.entityId);
|
|
10
11
|
const transaction = await getTransaction(transactionCompletion.linkedTransaction);
|
|
11
12
|
const { orderPaymentId } = transaction.metaData;
|
|
12
|
-
const orderPayment = await
|
|
13
|
+
const orderPayment = await modules.orders.payments.findOrderPayment({
|
|
13
14
|
orderPaymentId,
|
|
14
15
|
});
|
|
15
16
|
if (!orderPayment)
|
|
16
17
|
throw new Error('Order Payment not found');
|
|
17
|
-
const order = await
|
|
18
|
+
const order = await services.orders.checkoutOrder(orderPayment.orderId, {
|
|
18
19
|
paymentContext: {
|
|
19
20
|
transactionId: transactionCompletion.linkedTransaction,
|
|
20
21
|
},
|
|
21
|
-
}
|
|
22
|
+
});
|
|
22
23
|
logger.info(`PostFinance Checkout Webhook: Transaction ${transactionCompletion.linkedTransaction} marked order payment ID ${transaction.metaData.orderPaymentId} as paid`);
|
|
23
24
|
res.writeHead(200);
|
|
24
25
|
res.end(`Order marked as paid: ${order.orderNumber}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../../src/payment/postfinance-checkout/middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAAE,cAAc,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAC;AAEpE,MAAM,MAAM,GAAG,YAAY,CAAC,6CAA6C,CAAC,CAAC;AAE3E,MAAM,CAAC,MAAM,0BAA0B,GAAG,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;IAC3D,MAAM,OAAO,GAAG,GAAG,CAAC,gBAA2B,CAAC;IAChD,MAAM,IAAI,GAAG,GAAG,CAAC,IAAmB,CAAC;IACrC,IAAI,IAAI,CAAC,2BAA2B,KAAK,uBAAuB,EAAE,CAAC;QACjE,IAAI,CAAC;YACH,MAAM,qBAAqB,GAAG,MAAM,wBAAwB,CAAC,IAAI,CAAC,QAA6B,CAAC,CAAC;YACjG,MAAM,WAAW,GAAG,MAAM,cAAc,CACtC,qBAAqB,CAAC,iBAAsC,CAC7D,CAAC;YACF,MAAM,EAAE,cAAc,EAAE,GAAG,WAAW,CAAC,QAAsC,CAAC;YAC9E,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../../src/payment/postfinance-checkout/middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAAE,cAAc,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAC;AAEpE,MAAM,MAAM,GAAG,YAAY,CAAC,6CAA6C,CAAC,CAAC;AAE3E,MAAM,CAAC,MAAM,0BAA0B,GAAG,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;IAC3D,MAAM,OAAO,GAAG,GAAG,CAAC,gBAA2B,CAAC;IAChD,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IACtC,MAAM,IAAI,GAAG,GAAG,CAAC,IAAmB,CAAC;IACrC,IAAI,IAAI,CAAC,2BAA2B,KAAK,uBAAuB,EAAE,CAAC;QACjE,IAAI,CAAC;YACH,MAAM,qBAAqB,GAAG,MAAM,wBAAwB,CAAC,IAAI,CAAC,QAA6B,CAAC,CAAC;YACjG,MAAM,WAAW,GAAG,MAAM,cAAc,CACtC,qBAAqB,CAAC,iBAAsC,CAC7D,CAAC;YACF,MAAM,EAAE,cAAc,EAAE,GAAG,WAAW,CAAC,QAAsC,CAAC;YAC9E,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC;gBAClE,cAAc;aACf,CAAC,CAAC;YACH,IAAI,CAAC,YAAY;gBAAE,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;YAE9D,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,aAAa,CAAC,YAAY,CAAC,OAAO,EAAE;gBACtE,cAAc,EAAE;oBACd,aAAa,EAAE,qBAAqB,CAAC,iBAAiB;iBACvD;aACF,CAAC,CAAC;YACH,MAAM,CAAC,IAAI,CACT,6CAA6C,qBAAqB,CAAC,iBAAiB,4BAA4B,WAAW,CAAC,QAAQ,CAAC,cAAc,UAAU,CAC9J,CAAC;YACF,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;YACnB,GAAG,CAAC,GAAG,CAAC,yBAAyB,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC;QACxD,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,CAAC,KAAK,CAAC,2EAA2E,EAAE,CAAC,CAAC,CAAC;YAC7F,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;YACnB,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QAC9E,CAAC;IACH,CAAC;SAAM,CAAC;QACN,MAAM,CAAC,KAAK,CACV,8EAA8E,IAAI,CAAC,2BAA2B,EAAE,CACjH,CAAC;QACF,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QACnB,GAAG,CAAC,GAAG,EAAE,CAAC;IACZ,CAAC;AACH,CAAC,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { Order
|
|
1
|
+
import { Order } from '@unchainedshop/core-orders';
|
|
2
2
|
import * as pf from 'postfinancecheckout';
|
|
3
3
|
export declare const transactionIsPaid: (transaction: pf.PostFinanceCheckout.model.Transaction, expectedCurrency: string, expectedAmount: number) => Promise<boolean>;
|
|
4
|
-
export declare const orderIsPaid: (order: Order, transaction: pf.PostFinanceCheckout.model.Transaction
|
|
4
|
+
export declare const orderIsPaid: (order: Order, transaction: pf.PostFinanceCheckout.model.Transaction) => Promise<boolean>;
|
|
5
5
|
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/payment/postfinance-checkout/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/payment/postfinance-checkout/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAC;AACnD,OAAO,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAI1C,eAAO,MAAM,iBAAiB,gBACf,EAAE,CAAC,mBAAmB,CAAC,KAAK,CAAC,WAAW,oBACnC,MAAM,kBACR,MAAM,KACrB,OAAO,CAAC,OAAO,CAgBjB,CAAC;AAEF,eAAO,MAAM,WAAW,UACf,KAAK,eACC,EAAE,CAAC,mBAAmB,CAAC,KAAK,CAAC,WAAW,KACpD,OAAO,CAAC,OAAO,CAOjB,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { OrderPricingSheet } from '@unchainedshop/core';
|
|
1
2
|
import * as pf from 'postfinancecheckout';
|
|
2
3
|
const { PostFinanceCheckout } = pf;
|
|
3
4
|
export const transactionIsPaid = async (transaction, expectedCurrency, expectedAmount) => {
|
|
@@ -13,8 +14,11 @@ export const transactionIsPaid = async (transaction, expectedCurrency, expectedA
|
|
|
13
14
|
}
|
|
14
15
|
return false;
|
|
15
16
|
};
|
|
16
|
-
export const orderIsPaid = async (order, transaction
|
|
17
|
-
const pricing =
|
|
17
|
+
export const orderIsPaid = async (order, transaction) => {
|
|
18
|
+
const pricing = OrderPricingSheet({
|
|
19
|
+
calculation: order.calculation,
|
|
20
|
+
currency: order.currency,
|
|
21
|
+
});
|
|
18
22
|
const totalAmount = pricing.total({ useNetPrice: false }).amount / 100;
|
|
19
23
|
return transactionIsPaid(transaction, order.currency, totalAmount);
|
|
20
24
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/payment/postfinance-checkout/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/payment/postfinance-checkout/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAE1C,MAAM,EAAE,mBAAmB,EAAE,GAAG,EAAE,CAAC;AAEnC,MAAM,CAAC,MAAM,iBAAiB,GAAG,KAAK,EACpC,WAAqD,EACrD,gBAAwB,EACxB,cAAsB,EACJ,EAAE;IACpB,IAAI,WAAW,CAAC,KAAK,KAAK,mBAAmB,CAAC,KAAK,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC;QAC7E,OAAO,CACL,WAAW,CAAC,eAAe,KAAK,SAAS;YACzC,WAAW,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;YACpE,WAAW,CAAC,QAAQ,KAAK,gBAAgB,CAC1C,CAAC;IACJ,CAAC;IACD,IAAI,WAAW,CAAC,KAAK,KAAK,mBAAmB,CAAC,KAAK,CAAC,gBAAgB,CAAC,UAAU,EAAE,CAAC;QAChF,OAAO,CACL,WAAW,CAAC,mBAAmB,KAAK,SAAS;YAC7C,WAAW,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;YACxE,WAAW,CAAC,QAAQ,KAAK,gBAAgB,CAC1C,CAAC;IACJ,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAG,KAAK,EAC9B,KAAY,EACZ,WAAqD,EACnC,EAAE;IACpB,MAAM,OAAO,GAAG,iBAAiB,CAAC;QAChC,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,QAAQ,EAAE,KAAK,CAAC,QAAQ;KACzB,CAAC,CAAC;IACH,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC,MAAM,GAAG,GAAG,CAAC;IACvE,OAAO,iBAAiB,CAAC,WAAW,EAAE,KAAK,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;AACrE,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../../src/payment/saferpay/adapter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../../src/payment/saferpay/adapter.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,eAAe,EAIhB,MAAM,qBAAqB,CAAC;AAE7B,cAAc,iBAAiB,CAAC;AAyBhC,eAAO,MAAM,gBAAgB,EAAE,eAiO9B,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { PaymentAdapter, PaymentDirector, PaymentError } from '@unchainedshop/core-payment';
|
|
2
1
|
import { mongodb } from '@unchainedshop/mongodb';
|
|
3
2
|
import { SaferpayClient } from './api/index.js';
|
|
4
3
|
import { buildSignature } from './buildSignature.js';
|
|
4
|
+
import { OrderPricingSheet, PaymentAdapter, PaymentDirector, PaymentError, } from '@unchainedshop/core';
|
|
5
5
|
export * from './middleware.js';
|
|
6
6
|
const { SAFERPAY_BASE_URL = 'https://test.saferpay.com/api', SAFERPAY_CUSTOMER_ID, SAFERPAY_WEBHOOK_PATH = '/payment/saferpay/webhook', SAFERPAY_RETURN_PATH = '/saferpay/return', ROOT_URL = 'http://localhost:4010', EMAIL_WEBSITE_URL, SAFERPAY_USER, SAFERPAY_PW, } = process.env;
|
|
7
7
|
const newSaferpayError = ({ code, message }) => {
|
|
@@ -22,8 +22,8 @@ export const WordlineSaferpay = {
|
|
|
22
22
|
typeSupported(type) {
|
|
23
23
|
return type === 'GENERIC';
|
|
24
24
|
},
|
|
25
|
-
actions: (
|
|
26
|
-
const { modules } =
|
|
25
|
+
actions: (config, context) => {
|
|
26
|
+
const { modules } = context;
|
|
27
27
|
const createSaferPayClient = () => {
|
|
28
28
|
if (!SAFERPAY_CUSTOMER_ID || !SAFERPAY_USER || !SAFERPAY_PW)
|
|
29
29
|
throw new Error('Credentials not Set');
|
|
@@ -31,9 +31,9 @@ export const WordlineSaferpay = {
|
|
|
31
31
|
return saferpayClient;
|
|
32
32
|
};
|
|
33
33
|
const adapter = {
|
|
34
|
-
...PaymentAdapter.actions(
|
|
34
|
+
...PaymentAdapter.actions(config, context),
|
|
35
35
|
getTerminalId() {
|
|
36
|
-
return
|
|
36
|
+
return config.find((item) => item.key === 'terminalId')?.value;
|
|
37
37
|
},
|
|
38
38
|
// eslint-disable-next-line
|
|
39
39
|
configurationError() {
|
|
@@ -56,11 +56,14 @@ export const WordlineSaferpay = {
|
|
|
56
56
|
return false;
|
|
57
57
|
},
|
|
58
58
|
sign: async (transactionContext = {}) => {
|
|
59
|
-
const { orderPayment, order } =
|
|
59
|
+
const { orderPayment, order } = context;
|
|
60
60
|
if (!orderPayment || !order) {
|
|
61
61
|
throw new Error('orderPayment or order not found');
|
|
62
62
|
}
|
|
63
|
-
const pricing =
|
|
63
|
+
const pricing = OrderPricingSheet({
|
|
64
|
+
calculation: order.calculation,
|
|
65
|
+
currency: order.currency,
|
|
66
|
+
});
|
|
64
67
|
const totalAmount = pricing?.total({ useNetPrice: false }).amount;
|
|
65
68
|
const saferpayTransactionId = await modules.saferpayTransactions.createTransaction(orderPayment._id);
|
|
66
69
|
const signature = await buildSignature(saferpayTransactionId.toString('hex'), orderPayment._id);
|
|
@@ -96,11 +99,14 @@ export const WordlineSaferpay = {
|
|
|
96
99
|
});
|
|
97
100
|
},
|
|
98
101
|
charge: async ({ transactionId }) => {
|
|
99
|
-
const { orderPayment, order } =
|
|
102
|
+
const { orderPayment, order } = context;
|
|
100
103
|
if (!orderPayment || !order) {
|
|
101
104
|
throw new Error('orderPayment or order not found');
|
|
102
105
|
}
|
|
103
|
-
const pricing =
|
|
106
|
+
const pricing = OrderPricingSheet({
|
|
107
|
+
calculation: order.calculation,
|
|
108
|
+
currency: order.currency,
|
|
109
|
+
});
|
|
104
110
|
const totalAmount = pricing.total({ useNetPrice: false }).amount;
|
|
105
111
|
const saferpayTransaction = await modules.saferpayTransactions.findTransactionById(mongodb.ObjectId.createFromHexString(transactionId));
|
|
106
112
|
const api = createSaferPayClient();
|
|
@@ -126,7 +132,7 @@ export const WordlineSaferpay = {
|
|
|
126
132
|
});
|
|
127
133
|
},
|
|
128
134
|
async confirm() {
|
|
129
|
-
const { orderPayment } =
|
|
135
|
+
const { orderPayment } = context;
|
|
130
136
|
if (!orderPayment) {
|
|
131
137
|
throw new Error('orderPayment not found');
|
|
132
138
|
}
|
|
@@ -150,7 +156,7 @@ export const WordlineSaferpay = {
|
|
|
150
156
|
return transactionCaptureRes.Status === 'CAPTURED';
|
|
151
157
|
},
|
|
152
158
|
cancel: async () => {
|
|
153
|
-
const { orderPayment } =
|
|
159
|
+
const { orderPayment } = context;
|
|
154
160
|
if (!orderPayment) {
|
|
155
161
|
throw new Error('orderPayment not found');
|
|
156
162
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../../src/payment/saferpay/adapter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../../src/payment/saferpay/adapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SaferpayConnection.d.ts","sourceRoot":"","sources":["../../../../../src/payment/saferpay/api/api/SaferpayConnection.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"SaferpayConnection.d.ts","sourceRoot":"","sources":["../../../../../src/payment/saferpay/api/api/SaferpayConnection.ts"],"names":[],"mappings":"AAAA,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,OAAO,CAAS;IAExB,OAAO,CAAC,IAAI,CAAS;IAErB,OAAO,CAAC,QAAQ,CAAS;gBAEN,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAMlE,OAAO,CAAC,QAAQ;IAIhB,OAAO,CAAC,UAAU;IAUL,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;CAQ3D"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SaferpayConnection.js","sourceRoot":"","sources":["../../../../../src/payment/saferpay/api/api/SaferpayConnection.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"SaferpayConnection.js","sourceRoot":"","sources":["../../../../../src/payment/saferpay/api/api/SaferpayConnection.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,kBAAkB;IACrB,OAAO,CAAS;IAEhB,IAAI,CAAS;IAEb,QAAQ,CAAS;IAEzB,YAAmB,OAAe,EAAE,IAAY,EAAE,QAAgB;QAChE,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAEO,QAAQ,CAAC,GAAW;QAC1B,OAAO,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC;IAC5B,CAAC;IAEO,UAAU;QAChB,OAAO;YACL,cAAc,EAAE,iCAAiC;YACjD,MAAM,EAAE,kBAAkB;YAC1B,aAAa,EAAE,SAAS,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,QAAQ,EAAE,EAAE,QAAQ,CAAC,CAAC,QAAQ,CACrF,QAAQ,CACT,EAAE;SACJ,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,GAAW,EAAE,IAAY;QACzC,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YAC1C,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;YAC1B,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE;SAC3B,CAAC,CAAC;QACH,OAAO,GAAG,CAAC,IAAI,EAAE,CAAC;IACpB,CAAC;CACF"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Response } from './Response.js';
|
|
2
2
|
import { Request } from './Request.js';
|
|
3
|
-
import
|
|
3
|
+
import { TransactionAmount } from './Transaction.js';
|
|
4
4
|
export interface TransactionCaptureInput extends Request {
|
|
5
5
|
TransactionReference: {
|
|
6
6
|
TransactionId: string;
|