@unchainedshop/plugins 4.0.0-rc.15 → 4.0.0-rc.17

package/lib/files/minio/minio-adapter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"minio-adapter.js","sourceRoot":"","sources":["../../../src/files/minio/minio-adapter.ts"],"names":[],"mappings":"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"}

package/lib/files/minio/minio-webhook.d.ts

@@ -0,0 +1,2 @@
+export declare const minioHandler: (req: any, res: any) => Promise<void>;
+//# sourceMappingURL=minio-webhook.d.ts.map

package/lib/files/minio/minio-webhook.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"minio-webhook.d.ts","sourceRoot":"","sources":["../../../src/files/minio/minio-webhook.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,YAAY,uCAwBxB,CAAC"}

package/lib/files/minio/minio-webhook.js

@@ -0,0 +1,33 @@
+import { log, LogLevel } from '@unchainedshop/logger';
+const { MINIO_WEBHOOK_AUTH_TOKEN } = process.env;
+const isAuthorized = ({ authorization = '' }) => {
+    const [type, token] = authorization.split(' ');
+    return type === 'Bearer' && token === MINIO_WEBHOOK_AUTH_TOKEN;
+};
+export const minioHandler = async (req, res) => {
+    try {
+        if (req.method === 'POST' && req.body) {
+            const { headers } = req;
+            const { Records = [], EventName } = req.body;
+            if (EventName === 's3:ObjectCreated:Put' && isAuthorized(headers)) {
+                const [{ s3 }] = Records;
+                const { object } = s3;
+                const { size, contentType: type } = object;
+                const [fileId] = object.key.split('.');
+                const { services } = req.unchainedContext;
+                await services.files.linkFile({ fileId, type, size }, req.unchainedContext);
+                res.writeHead(200);
+                res.end();
+                return;
+            }
+        }
+        res.writeHead(404);
+        res.end();
+    }
+    catch (e) {
+        log(e.message, { level: LogLevel.Error });
+        res.writeHead(503);
+        res.end(JSON.stringify({ name: e.name, code: e.code, message: e.message }));
+    }
+};
+//# sourceMappingURL=minio-webhook.js.map

package/lib/files/minio/minio-webhook.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"minio-webhook.js","sourceRoot":"","sources":["../../../src/files/minio/minio-webhook.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEtD,MAAM,EAAE,wBAAwB,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAEjD,MAAM,YAAY,GAAG,CAAC,EAAE,aAAa,GAAG,EAAE,EAAE,EAAE,EAAE;IAC9C,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC/C,OAAO,IAAI,KAAK,QAAQ,IAAI,KAAK,KAAK,wBAAwB,CAAC;AACjE,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;IAC7C,IAAI,CAAC;QACH,IAAI,GAAG,CAAC,MAAM,KAAK,MAAM,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC;YACtC,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC;YACxB,MAAM,EAAE,OAAO,GAAG,EAAE,EAAE,SAAS,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;YAC7C,IAAI,SAAS,KAAK,sBAAsB,IAAI,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC;gBAClE,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,OAAO,CAAC;gBACzB,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;gBACtB,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;gBAC3C,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACvC,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAC,gBAAgB,CAAC;gBAC1C,MAAM,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,GAAG,CAAC,gBAAgB,CAAC,CAAC;gBAC5E,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;gBACnB,GAAG,CAAC,GAAG,EAAE,CAAC;gBACV,OAAO;YACT,CAAC;QACH,CAAC;QACD,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QACnB,GAAG,CAAC,GAAG,EAAE,CAAC;IACZ,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;QAC1C,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QACnB,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;IAC9E,CAAC;AACH,CAAC,CAAC"}

package/lib/filters/local-search.js

@@ -1,7 +1,7 @@
 import { FilterDirector, FilterAdapter } from '@unchainedshop/core';
 import { createLogger } from '@unchainedshop/logger';
 import { isDocumentDBCompatModeEnabled } from '@unchainedshop/mongodb';
-const logger = createLogger('unchained:core-filters:local-search');
+const logger = createLogger('unchained:local-search');
 const LocalSearch = {
     ...FilterAdapter,
     key: 'shop.unchained.filters.local-search',

package/lib/filters/local-search.js.map

@@ -1 +1 @@
-{"version":3,"file":"local-search.js","sourceRoot":"","sources":["../../src/filters/local-search.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"local-search.js","sourceRoot":"","sources":["../../src/filters/local-search.ts"],"names":[],"mappings":"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"}

package/lib/payment/apple-iap/adapter.js

@@ -1,7 +1,7 @@
 import { PaymentAdapter, PaymentDirector, PaymentError } from '@unchainedshop/core';
 import { createLogger } from '@unchainedshop/logger';
 import { verifyReceipt } from './verify-receipt.js';
-const logger = createLogger('unchained:core-payment:apple-iap');
+const logger = createLogger('unchained:apple-iap');
 const { APPLE_IAP_SHARED_SECRET } = process.env;
 const AppleIAP = {
     ...PaymentAdapter,
@@ -31,7 +31,7 @@ const AppleIAP = {
                 return false;
             },
             async sign() {
-                throw new Error('Apple IAP does not support payment signing');
+                throw new Error('Payment signing not supported');
             },
             async validate() {
                 // once registered receipt transactions are valid by default!
@@ -45,14 +45,14 @@ const AppleIAP = {
                 });
                 const { status, latest_receipt_info: latestReceiptInfo } = response;
                 if (status === 0) {
-                    logger.debug('Apple IAP Plugin: Receipt validated and updated for the user');
+                    logger.debug('Receipt validated and updated for the user');
                     const latestTransaction = latestReceiptInfo[latestReceiptInfo.length - 1];
                     return {
                         token: latestTransaction.web_order_line_item_id,
                         latestReceiptInfo,
                     };
                 }
-                logger.warn('Apple IAP Plugin: Receipt invalid', {
+                logger.warn('Receipt invalid', {
                     status: response.status,
                 });
                 return null;
@@ -61,20 +61,22 @@ const AppleIAP = {
                 const { meta, paymentCredentials, receiptData } = transactionContext || {};
                 const { transactionIdentifier } = meta || {};
                 if (!transactionIdentifier) {
-                    throw new Error('Apple IAP Plugin: You have to set the transaction id on the order payment');
+                    throw new Error('You have to set the transaction id on the order payment');
                 }
+                if (!order)
+                    throw new Error('Order not found');
                 const receiptResponse = receiptData &&
                     (await verifyReceipt({
                         receiptData,
                         password: APPLE_IAP_SHARED_SECRET,
                     }));
                 if (receiptResponse && receiptResponse.status !== 0) {
-                    throw new Error('Apple IAP Plugin: Receipt invalid');
+                    throw new Error('Receipt invalid');
                 }
                 const transactions = receiptResponse?.latest_receipt_info || paymentCredentials?.meta?.latestReceiptInfo;
                 const matchedTransaction = transactions?.find((transaction) => transaction?.transaction_id === transactionIdentifier);
                 if (!matchedTransaction) {
-                    throw new Error(`Apple IAP Plugin: Cannot match transaction with identifier ${transactionIdentifier}`);
+                    throw new Error(`Cannot match transaction with identifier ${transactionIdentifier}`);
                 }
                 const orderPositions = await modules.orders.positions.findOrderPositions({
                     orderId: order._id,
@@ -86,16 +88,16 @@ const AppleIAP = {
                     };
                 }, {}));
                 if (items.length !== 1) {
-                    throw new Error('Apple IAP Plugin: You can only checkout 1 unique product at once');
+                    throw new Error('You can only checkout 1 unique product at once');
                 }
                 const [[productId, quantity]] = items;
                 const isMatchesTransaction = parseInt(matchedTransaction.quantity, 10) === quantity &&
                     matchedTransaction.product_id === productId;
                 if (!isMatchesTransaction)
-                    throw new Error('Apple IAP Plugin: Product in order does not match transaction');
+                    throw new Error('Product in order does not match transaction');
                 const alreadyProcessedTransaction = await modules.appleTransactions.findTransactionById(transactionIdentifier);
                 if (alreadyProcessedTransaction)
-                    throw new Error('Apple IAP Plugin: Transaction already processed');
+                    throw new Error('Transaction already processed');
                 // All good
                 await modules.appleTransactions.createTransaction({
                     _id: transactionIdentifier,

package/lib/payment/apple-iap/adapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../../src/payment/apple-iap/adapter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../../src/payment/apple-iap/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,cAAc,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACrG,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,MAAM,MAAM,GAAG,YAAY,CAAC,qBAAqB,CAAC,CAAC;AAEnD,MAAM,EAAE,uBAAuB,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAEhD,MAAM,QAAQ,GAAoB;IAChC,GAAG,cAAc;IAEjB,GAAG,EAAE,0BAA0B;IAC/B,KAAK,EAAE,uBAAuB;IAC9B,OAAO,EAAE,OAAO;IAChB,oBAAoB,EAAE,EAAE;IAExB,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE;QACtB,OAAO,IAAI,KAAK,SAAS,CAAC;IAC5B,CAAC;IAED,OAAO,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE;QAC3B,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,OAAgE,CAAC;QAE5F,MAAM,cAAc,GAAG;YACrB,GAAG,cAAc,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC;YAE1C,kBAAkB;gBAChB,IAAI,CAAC,uBAAuB,EAAE,CAAC;oBAC7B,OAAO,YAAY,CAAC,wBAAwB,CAAC;gBAC/C,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;YAED,QAAQ;gBACN,IAAI,cAAc,CAAC,kBAAkB,EAAE,KAAK,IAAI;oBAAE,OAAO,IAAI,CAAC;gBAC9D,OAAO,KAAK,CAAC;YACf,CAAC;YAED,iBAAiB;gBACf,OAAO,KAAK,CAAC;YACf,CAAC;YAED,KAAK,CAAC,IAAI;gBACR,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;YACnD,CAAC;YAED,KAAK,CAAC,QAAQ;gBACZ,6DAA6D;gBAC7D,OAAO,IAAI,CAAC;YACd,CAAC;YAED,KAAK,CAAC,QAAQ,CAAC,kBAAkB;gBAC/B,MAAM,EAAE,WAAW,EAAE,GAAG,kBAAkB,CAAC;gBAE3C,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC;oBACnC,WAAW;oBACX,QAAQ,EAAE,uBAAuB;iBAClC,CAAC,CAAC;gBACH,MAAM,EAAE,MAAM,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,GAAG,QAAQ,CAAC;gBAEpE,IAAI,MAAM,KAAK,CAAC,EAAE,CAAC;oBACjB,MAAM,CAAC,KAAK,CAAC,4CAA4C,CAAC,CAAC;oBAC3D,MAAM,iBAAiB,GAAG,iBAAiB,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;oBAC1E,OAAO;wBACL,KAAK,EAAE,iBAAiB,CAAC,sBAAsB;wBAC/C,iBAAiB;qBAClB,CAAC;gBACJ,CAAC;gBAED,MAAM,CAAC,IAAI,CAAC,iBAAiB,EAAE;oBAC7B,MAAM,EAAE,QAAQ,CAAC,MAAM;iBACxB,CAAC,CAAC;gBACH,OAAO,IAAI,CAAC;YACd,CAAC;YAED,KAAK,CAAC,MAAM,CAAC,kBAAkB;gBAC7B,MAAM,EAAE,IAAI,EAAE,kBAAkB,EAAE,WAAW,EAAE,GAAG,kBAAkB,IAAI,EAAE,CAAC;gBAC3E,MAAM,EAAE,qBAAqB,EAAE,GAAG,IAAI,IAAI,EAAE,CAAC;gBAE7C,IAAI,CAAC,qBAAqB,EAAE,CAAC;oBAC3B,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC;gBAC7E,CAAC;gBAED,IAAI,CAAC,KAAK;oBAAE,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;gBAE/C,MAAM,eAAe,GACnB,WAAW;oBACX,CAAC,MAAM,aAAa,CAAC;wBACnB,WAAW;wBACX,QAAQ,EAAE,uBAAuB;qBAClC,CAAC,CAAC,CAAC;gBAEN,IAAI,eAAe,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBACpD,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;gBACrC,CAAC;gBAED,MAAM,YAAY,GAChB,eAAe,EAAE,mBAAmB,IAAI,kBAAkB,EAAE,IAAI,EAAE,iBAAiB,CAAC;gBACtF,MAAM,kBAAkB,GAAG,YAAY,EAAE,IAAI,CAC3C,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,EAAE,cAAc,KAAK,qBAAqB,CACvE,CAAC;gBACF,IAAI,CAAC,kBAAkB,EAAE,CAAC;oBACxB,MAAM,IAAI,KAAK,CAAC,4CAA4C,qBAAqB,EAAE,CAAC,CAAC;gBACvF,CAAC;gBAED,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,kBAAkB,CAAC;oBACvE,OAAO,EAAE,KAAK,CAAC,GAAG;iBACnB,CAAC,CAAC;gBACH,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAC1B,cAAc,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;oBAClC,OAAO;wBACL,GAAG,GAAG;wBACN,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ;qBAC7D,CAAC;gBACJ,CAAC,EAAE,EAAE,CAAC,CACP,CAAC;gBAEF,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBACvB,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;gBACpE,CAAC;gBAED,MAAM,CAAC,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,GAAG,KAAK,CAAC;gBAEtC,MAAM,oBAAoB,GACxB,QAAQ,CAAC,kBAAkB,CAAC,QAAQ,EAAE,EAAE,CAAC,KAAK,QAAQ;oBACtD,kBAAkB,CAAC,UAAU,KAAK,SAAS,CAAC;gBAE9C,IAAI,CAAC,oBAAoB;oBAAE,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;gBAE1F,MAAM,2BAA2B,GAC/B,MAAM,OAAO,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,qBAAqB,CAAC,CAAC;gBAE7E,IAAI,2BAA2B;oBAAE,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;gBAElF,WAAW;gBACX,MAAM,OAAO,CAAC,iBAAiB,CAAC,iBAAiB,CAAC;oBAChD,GAAG,EAAE,qBAAqB;oBAC1B,kBAAkB;oBAClB,OAAO,EAAE,KAAK,CAAC,GAAG;iBACnB,CAAC,CAAC;gBAEH,OAAO;oBACL,qBAAqB;iBACtB,CAAC;YACJ,CAAC;SACF,CAAC;QAEF,OAAO,cAAc,CAAC;IACxB,CAAC;CACF,CAAC;AAEF,eAAe,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC"}

package/lib/payment/apple-iap/db/AppleTransactionsCollection.d.ts

@@ -1,7 +1,7 @@
 import { mongodb } from '@unchainedshop/mongodb';
 import { TimestampFields } from '@unchainedshop/mongodb';
 export type AppleTransaction = {
-    _id?: string;
+    _id: string;
     matchedTransaction: any;
     orderId: string;
 } & TimestampFields;

package/lib/payment/apple-iap/db/AppleTransactionsCollection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AppleTransactionsCollection.d.ts","sourceRoot":"","sources":["../../../../src/payment/apple-iap/db/AppleTransactionsCollection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,kBAAkB,EAAE,GAAG,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;CACjB,GAAG,eAAe,CAAC;AAEpB,eAAO,MAAM,2BAA2B,GAAU,IAAI,OAAO,CAAC,EAAE,kDAI/D,CAAC"}
+{"version":3,"file":"AppleTransactionsCollection.d.ts","sourceRoot":"","sources":["../../../../src/payment/apple-iap/db/AppleTransactionsCollection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,kBAAkB,EAAE,GAAG,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;CACjB,GAAG,eAAe,CAAC;AAEpB,eAAO,MAAM,2BAA2B,GAAU,IAAI,OAAO,CAAC,EAAE,kDAI/D,CAAC"}

package/lib/payment/apple-iap/handler-express.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handler-express.d.ts","sourceRoot":"","sources":["../../../src/payment/apple-iap/handler-express.ts"],"names":[],"mappings":"AAiBA,eAAO,MAAM,eAAe,GAAU,QAAG,EAAE,QAAG,kBAkH7C,CAAC;AAEF,eAAe,eAAe,CAAC"}
+{"version":3,"file":"handler-express.d.ts","sourceRoot":"","sources":["../../../src/payment/apple-iap/handler-express.ts"],"names":[],"mappings":"AAiBA,eAAO,MAAM,eAAe,GAAU,QAAG,EAAE,QAAG,kBAwH7C,CAAC;AAEF,eAAe,eAAe,CAAC"}

package/lib/payment/apple-iap/handler-express.js

@@ -1,7 +1,7 @@
 import { EnrollmentStatus } from '@unchainedshop/core-enrollments';
 import { createLogger } from '@unchainedshop/logger';
 import { fixPeriods } from './fix-periods.js';
-const logger = createLogger('unchained:core-payment:apple-iap:handler');
+const logger = createLogger('unchained:apple-iap:handler');
 const { APPLE_IAP_SHARED_SECRET } = process.env;
 const AppleNotificationTypes = {
     INITIAL_BUY: 'INITIAL_BUY',
@@ -35,10 +35,14 @@ export const appleIAPHandler = async (req, res) => {
                         receiptData: responseBody?.unified_receipt?.latest_receipt,
                     },
                 });
+                if (!order)
+                    throw new Error(`Order with id ${orderPayment.orderId} not found`);
                 const orderId = order._id;
                 const enrollment = await modules.enrollments.findEnrollment({
                     orderId,
                 });
+                if (!enrollment)
+                    throw new Error('Could not find any matching enrollment');
                 await fixPeriods({
                     transactionId: latestTransaction.original_transaction_id,
                     transactions,
@@ -62,9 +66,12 @@ export const appleIAPHandler = async (req, res) => {
                 const originalOrder = await modules.orders.findOrder({
                     orderId: originalOrderPayment.orderId,
                 });
-                const enrollment = await modules.enrollments.findEnrollment({
-                    orderId: originalOrder._id,
-                });
+                const enrollment = originalOrder &&
+                    (await modules.enrollments.findEnrollment({
+                        orderId: originalOrder._id,
+                    }));
+                if (!enrollment?.payment)
+                    throw new Error('Could not find a valid enrollment payment method');
                 await services.orders.registerPaymentCredentials(enrollment.payment.paymentProviderId, {
                     transactionContext: {
                         receiptData: responseBody?.unified_receipt?.latest_receipt,
@@ -92,19 +99,16 @@ export const appleIAPHandler = async (req, res) => {
                 }
                 logger.info(`Apple IAP Webhook: Updated enrollment from Apple`);
             }
-            res.writeHead(200);
-            res.end();
+            res.status(200).end();
             return;
         }
         catch (e) {
             logger.warn(`Apple IAP Webhook: ${e.message}`, e);
-            res.writeHead(503);
-            res.end(JSON.stringify({ name: e.name, code: e.code, message: e.message }));
+            res.status(503).send({ name: e.name, code: e.code, message: e.message });
             return;
         }
     }
-    res.writeHead(404);
-    res.end();
+    res.status(404).end();
 };
 export default appleIAPHandler;
 //# sourceMappingURL=handler-express.js.map

package/lib/payment/apple-iap/handler-express.js.map

@@ -1 +1 @@
-{"version":3,"file":"handler-express.js","sourceRoot":"","sources":["../../../src/payment/apple-iap/handler-express.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"handler-express.js","sourceRoot":"","sources":["../../../src/payment/apple-iap/handler-express.ts"],"names":[],"mappings":"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"}

package/lib/payment/apple-iap/handler-fastify.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handler-fastify.d.ts","sourceRoot":"","sources":["../../../src/payment/apple-iap/handler-fastify.ts"],"names":[],"mappings":"AAIA,OAAO,EAAkB,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAe7D,eAAO,MAAM,eAAe,EAAE,kBAmH7B,CAAC;AAEF,eAAe,eAAe,CAAC"}
+{"version":3,"file":"handler-fastify.d.ts","sourceRoot":"","sources":["../../../src/payment/apple-iap/handler-fastify.ts"],"names":[],"mappings":"AAIA,OAAO,EAAkB,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAe7D,eAAO,MAAM,eAAe,EAAE,kBA6H7B,CAAC;AAEF,eAAe,eAAe,CAAC"}

package/lib/payment/apple-iap/handler-fastify.js

@@ -1,7 +1,7 @@
 import { EnrollmentStatus } from '@unchainedshop/core-enrollments';
 import { createLogger } from '@unchainedshop/logger';
 import { fixPeriods } from './fix-periods.js';
-const logger = createLogger('unchained:core-payment:apple-iap:handler');
+const logger = createLogger('unchained:apple-iap:handler');
 const { APPLE_IAP_SHARED_SECRET } = process.env;
 const AppleNotificationTypes = {
     INITIAL_BUY: 'INITIAL_BUY',
@@ -34,17 +34,21 @@ export const appleIAPHandler = async (req, reply) => {
                     receiptData: responseBody?.unified_receipt?.latest_receipt,
                 },
             });
+            if (!order)
+                throw new Error(`Order with id ${orderPayment.orderId} not found`);
             const orderId = order._id;
             const enrollment = await modules.enrollments.findEnrollment({
                 orderId,
             });
+            if (!enrollment)
+                throw new Error('Enrollent not found');
             await fixPeriods({
                 transactionId: latestTransaction.original_transaction_id,
                 transactions,
                 enrollmentId: enrollment._id,
                 orderId,
             }, resolvedContext);
-            logger.info(`Apple IAP Webhook: Confirmed checkout for order ${order.orderNumber}`, {
+            logger.info(`Webhook confirmed checkout for order ${order.orderNumber}`, {
                 orderId: order._id,
             });
         }
@@ -61,9 +65,12 @@ export const appleIAPHandler = async (req, reply) => {
             const originalOrder = await modules.orders.findOrder({
                 orderId: originalOrderPayment.orderId,
             });
-            const enrollment = await modules.enrollments.findEnrollment({
-                orderId: originalOrder._id,
-            });
+            const enrollment = originalOrder &&
+                (await modules.enrollments.findEnrollment({
+                    orderId: originalOrder._id,
+                }));
+            if (!enrollment?.payment)
+                throw new Error('Could not find a valid enrollment payment method');
             await services.orders.registerPaymentCredentials(enrollment.payment.paymentProviderId, {
                 transactionContext: {
                     receiptData: responseBody?.unified_receipt?.latest_receipt,
@@ -76,7 +83,7 @@ export const appleIAPHandler = async (req, reply) => {
                 enrollmentId: enrollment._id,
                 orderId: originalOrder._id,
             }, resolvedContext);
-            logger.info(`Apple IAP Webhook: Processed notification for ${latestTransaction.original_transaction_id} and type ${responseBody.notification_type}`);
+            logger.info(`Webhook rocessed notification for ${latestTransaction.original_transaction_id} and type ${responseBody.notification_type}`);
             if (responseBody.notification_type === AppleNotificationTypes.DID_RECOVER) {
                 if (enrollment.status !== EnrollmentStatus.TERMINATED &&
                     responseBody.auto_renew_status === 'false') {
@@ -95,9 +102,9 @@ export const appleIAPHandler = async (req, reply) => {
         return reply.send();
     }
     catch (e) {
-        logger.warn(`Apple IAP Webhook: ${e.message}`, e);
+        logger.error(e);
         reply.status(503);
-        return reply.send({ name: e.name, code: e.code, message: e.message });
+        return reply.send({ success: false, name: e.name, code: e.code, message: e.message });
     }
 };
 export default appleIAPHandler;

package/lib/payment/apple-iap/handler-fastify.js.map

@@ -1 +1 @@
-{"version":3,"file":"handler-fastify.js","sourceRoot":"","sources":["../../../src/payment/apple-iap/handler-fastify.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"handler-fastify.js","sourceRoot":"","sources":["../../../src/payment/apple-iap/handler-fastify.ts"],"names":[],"mappings":"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"}

package/lib/payment/apple-iap/module/configureAppleTransactionsModule.d.ts

@@ -0,0 +1,9 @@
+import { AppleTransaction } from '../db/AppleTransactionsCollection.js';
+export interface AppleTransactionsModule {
+    findTransactionById: (transactionIdentifier: string) => Promise<AppleTransaction>;
+    createTransaction: (doc: AppleTransaction) => Promise<string | null>;
+}
+export declare const configureAppleTransactionsModule: ({ db }: {
+    db: any;
+}) => Promise<AppleTransactionsModule>;
+//# sourceMappingURL=configureAppleTransactionsModule.d.ts.map

package/lib/payment/apple-iap/module/configureAppleTransactionsModule.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"configureAppleTransactionsModule.d.ts","sourceRoot":"","sources":["../../../../src/payment/apple-iap/module/configureAppleTransactionsModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAA+B,MAAM,sCAAsC,CAAC;AAErG,MAAM,WAAW,uBAAuB;IACtC,mBAAmB,EAAE,CAAC,qBAAqB,EAAE,MAAM,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAElF,iBAAiB,EAAE,CAAC,GAAG,EAAE,gBAAgB,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;CACtE;AAED,eAAO,MAAM,gCAAgC;;MAAmB,OAAO,CAAC,uBAAuB,CAgB9F,CAAC"}

package/lib/payment/apple-iap/module/configureAppleTransactionsModule.js

@@ -0,0 +1,17 @@
+import { AppleTransactionsCollection } from '../db/AppleTransactionsCollection.js';
+export const configureAppleTransactionsModule = async ({ db }) => {
+    const AppleTransactions = await AppleTransactionsCollection(db);
+    return {
+        findTransactionById: async (transactionIdentifier) => {
+            return AppleTransactions.findOne({ _id: transactionIdentifier });
+        },
+        createTransaction: async (doc) => {
+            await AppleTransactions.insertOne({
+                ...doc,
+                created: new Date(),
+            });
+            return doc._id;
+        },
+    };
+};
+//# sourceMappingURL=configureAppleTransactionsModule.js.map

package/lib/payment/apple-iap/module/configureAppleTransactionsModule.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"configureAppleTransactionsModule.js","sourceRoot":"","sources":["../../../../src/payment/apple-iap/module/configureAppleTransactionsModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,2BAA2B,EAAE,MAAM,sCAAsC,CAAC;AAQrG,MAAM,CAAC,MAAM,gCAAgC,GAAG,KAAK,EAAE,EAAE,EAAE,EAAE,EAAoC,EAAE;IACjG,MAAM,iBAAiB,GAAG,MAAM,2BAA2B,CAAC,EAAE,CAAC,CAAC;IAEhE,OAAO;QACL,mBAAmB,EAAE,KAAK,EAAE,qBAAqB,EAAE,EAAE;YACnD,OAAO,iBAAiB,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,qBAAqB,EAAE,CAAC,CAAC;QACnE,CAAC;QAED,iBAAiB,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;YAC/B,MAAM,iBAAiB,CAAC,SAAS,CAAC;gBAChC,GAAG,GAAG;gBACN,OAAO,EAAE,IAAI,IAAI,EAAE;aACpB,CAAC,CAAC;YACH,OAAO,GAAG,CAAC,GAAG,CAAC;QACjB,CAAC;KACF,CAAC;AACJ,CAAC,CAAC"}

package/lib/payment/apple-iap/module.d.ts

@@ -2,16 +2,16 @@ import { AppleTransaction } from './db/AppleTransactionsCollection.js';
 export declare const configureAppleTransactionsModule: ({ db }: {
     db: any;
 }) => Promise<{
-    findTransactionById: (transactionIdentifier: string) => Promise<AppleTransaction>;
-    createTransaction: (doc: AppleTransaction) => Promise<string>;
+    findTransactionById: (transactionIdentifier: string) => Promise<AppleTransaction | null>;
+    createTransaction: (doc: Omit<AppleTransaction, "_id" | "created"> & Pick<Partial<AppleTransaction>, "_id" | "created">) => Promise<string>;
 }>;
 declare const _default: {
     appleTransactions: {
         configure: ({ db }: {
             db: any;
         }) => Promise<{
-            findTransactionById: (transactionIdentifier: string) => Promise<AppleTransaction>;
-            createTransaction: (doc: AppleTransaction) => Promise<string>;
+            findTransactionById: (transactionIdentifier: string) => Promise<AppleTransaction | null>;
+            createTransaction: (doc: Omit<AppleTransaction, "_id" | "created"> & Pick<Partial<AppleTransaction>, "_id" | "created">) => Promise<string>;
         }>;
     };
 };

package/lib/payment/apple-iap/module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../src/payment/apple-iap/module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAA+B,MAAM,qCAAqC,CAAC;AAEpG,eAAO,MAAM,gCAAgC,GAAU;;CAAM;iDAIN,MAAM,KAAG,OAAO,CAAC,gBAAgB,CAAC;6BAItD,gBAAgB;EAQlD,CAAC;;;;;;yDAZqD,MAAM,KAAG,OAAO,CAAC,gBAAgB,CAAC;qCAItD,gBAAgB;;;;AAUnD,wBAIE;AAEF,MAAM,WAAW,uBAAuB;IACtC,iBAAiB,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,gCAAgC,CAAC,CAAC,CAAC;CACjF"}
+{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../src/payment/apple-iap/module.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAA+B,MAAM,qCAAqC,CAAC;AAEpG,eAAO,MAAM,gCAAgC,GAAU;;CAAM;iDAIN,MAAM,KAAG,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;6BAKrF,IAAI,CAAC,gBAAgB,EAAE,KAAK,GAAG,SAAS,CAAC,GAC5C,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,KAAK,GAAG,SAAS,CAAC;EAUzD,CAAC;;;;;;yDAhBqD,MAAM,KAAG,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;qCAKrF,IAAI,CAAC,gBAAgB,EAAE,KAAK,GAAG,SAAS,CAAC,GAC5C,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,KAAK,GAAG,SAAS,CAAC;;;;AAY1D,wBAIE;AAEF,MAAM,WAAW,uBAAuB;IACtC,iBAAiB,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,gCAAgC,CAAC,CAAC,CAAC;CACjF"}

package/lib/payment/apple-iap/module.js

@@ -1,3 +1,4 @@
+import { generateDbObjectId } from '@unchainedshop/mongodb';
 import { AppleTransactionsCollection } from './db/AppleTransactionsCollection.js';
 export const configureAppleTransactionsModule = async ({ db }) => {
     const AppleTransactions = await AppleTransactionsCollection(db);
@@ -6,11 +7,12 @@ export const configureAppleTransactionsModule = async ({ db }) => {
             return AppleTransactions.findOne({ _id: transactionIdentifier });
         },
         createTransaction: async (doc) => {
-            await AppleTransactions.insertOne({
+            const { insertedId } = await AppleTransactions.insertOne({
+                _id: generateDbObjectId(),
                 ...doc,
                 created: new Date(),
             });
-            return doc._id;
+            return insertedId;
         },
     };
 };

package/lib/payment/apple-iap/module.js.map

@@ -1 +1 @@
-{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../src/payment/apple-iap/module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,2BAA2B,EAAE,MAAM,qCAAqC,CAAC;AAEpG,MAAM,CAAC,MAAM,gCAAgC,GAAG,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE;IAC/D,MAAM,iBAAiB,GAAG,MAAM,2BAA2B,CAAC,EAAE,CAAC,CAAC;IAEhE,OAAO;QACL,mBAAmB,EAAE,KAAK,EAAE,qBAA6B,EAA6B,EAAE;YACtF,OAAO,iBAAiB,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,qBAAqB,EAAE,CAAC,CAAC;QACnE,CAAC;QAED,iBAAiB,EAAE,KAAK,EAAE,GAAqB,EAAE,EAAE;YACjD,MAAM,iBAAiB,CAAC,SAAS,CAAC;gBAChC,GAAG,GAAG;gBACN,OAAO,EAAE,IAAI,IAAI,EAAE;aACpB,CAAC,CAAC;YACH,OAAO,GAAG,CAAC,GAAG,CAAC;QACjB,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe;IACb,iBAAiB,EAAE;QACjB,SAAS,EAAE,gCAAgC;KAC5C;CACF,CAAC"}
+{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../src/payment/apple-iap/module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAoB,2BAA2B,EAAE,MAAM,qCAAqC,CAAC;AAEpG,MAAM,CAAC,MAAM,gCAAgC,GAAG,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE;IAC/D,MAAM,iBAAiB,GAAG,MAAM,2BAA2B,CAAC,EAAE,CAAC,CAAC;IAEhE,OAAO;QACL,mBAAmB,EAAE,KAAK,EAAE,qBAA6B,EAAoC,EAAE;YAC7F,OAAO,iBAAiB,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,qBAAqB,EAAE,CAAC,CAAC;QACnE,CAAC;QAED,iBAAiB,EAAE,KAAK,EACtB,GACoD,EACpD,EAAE;YACF,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,iBAAiB,CAAC,SAAS,CAAC;gBACvD,GAAG,EAAE,kBAAkB,EAAE;gBACzB,GAAG,GAAG;gBACN,OAAO,EAAE,IAAI,IAAI,EAAE;aACpB,CAAC,CAAC;YACH,OAAO,UAAU,CAAC;QACpB,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe;IACb,iBAAiB,EAAE;QACjB,SAAS,EAAE,gCAAgC;KAC5C;CACF,CAAC"}

package/lib/payment/braintree.js

@@ -1,6 +1,6 @@
 import { createLogger } from '@unchainedshop/logger';
 import { PaymentAdapter, PaymentDirector, PaymentError, OrderPricingSheet, } from '@unchainedshop/core';
-const logger = createLogger('unchained:core-payment:braintree');
+const logger = createLogger('unchained:braintree');
 const { BRAINTREE_SANDBOX_TOKEN, BRAINTREE_PRIVATE_KEY } = process.env;
 const BraintreeDirect = {
     ...PaymentAdapter,
@@ -86,6 +86,8 @@ const BraintreeDirect = {
             },
             charge: async ({ paypalPaymentMethodNonce }) => {
                 const { order } = context;
+                if (!order)
+                    throw new Error('Order is missing in payment context');
                 if (!paypalPaymentMethodNonce)
                     throw new Error('You have to provide paypalPaymentMethodNonce in paymentContext');
                 // eslint-disable-next-line

package/lib/payment/braintree.js.map

@@ -1 +1 @@
-{"version":3,"file":"braintree.js","sourceRoot":"","sources":["../../src/payment/braintree.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"braintree.js","sourceRoot":"","sources":["../../src/payment/braintree.ts"],"names":[],"mappings":"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"}

package/lib/payment/cryptopay/db/CryptopayTransactions.d.ts

@@ -1,7 +1,7 @@
 import { mongodb } from '@unchainedshop/mongodb';
 import { TimestampFields } from '@unchainedshop/mongodb';
 export type CryptopayTransaction = {
-    _id?: string;
+    _id: string;
     blockHeight: number;
     mostRecentBlockHeight: number;
     amount: mongodb.Decimal128;

package/lib/payment/cryptopay/db/CryptopayTransactions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CryptopayTransactions.d.ts","sourceRoot":"","sources":["../../../../src/payment/cryptopay/db/CryptopayTransactions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,MAAM,MAAM,oBAAoB,GAAG;IACjC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC;IAC3B,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,GAAG,eAAe,CAAC;AAEpB,eAAO,MAAM,+BAA+B,GAAI,IAAI,OAAO,CAAC,EAAE,6CAE7D,CAAC"}
+{"version":3,"file":"CryptopayTransactions.d.ts","sourceRoot":"","sources":["../../../../src/payment/cryptopay/db/CryptopayTransactions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,MAAM,MAAM,oBAAoB,GAAG;IACjC,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,EAAE,MAAM,CAAC;IACpB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC;IAC3B,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,GAAG,eAAe,CAAC;AAEpB,eAAO,MAAM,+BAA+B,GAAI,IAAI,OAAO,CAAC,EAAE,6CAE7D,CAAC"}

package/lib/payment/cryptopay/derive-btc-address.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"derive-btc-address.d.ts","sourceRoot":"","sources":["../../../src/payment/cryptopay/derive-btc-address.ts"],"names":[],"mappings":"yBAkBgB,SAAI,EAAE,UAAK;AAA3B,wBA6BE"}
+{"version":3,"file":"derive-btc-address.d.ts","sourceRoot":"","sources":["../../../src/payment/cryptopay/derive-btc-address.ts"],"names":[],"mappings":"yBAkBgB,SAAI,EAAE,UAAK;AAA3B,wBA2BE"}

package/lib/payment/cryptopay/derive-btc-address.js

@@ -29,9 +29,8 @@ export default (xpub, index) => {
         });
     hardenedMaster.wipePrivateData(); // Neuter
     const child = hardenedMaster.deriveChild(0).deriveChild(index);
-    // We don't need this AFAIK:
-    // const derivationPath = resolvePath(prefix);
-    // const child = hardenedMaster.derive(`${derivationPath}/0/${btcDerivationNumber}`);
+    if (!child.publicKey)
+        throw new Error('Cannot derive public key from extended public key');
     const network = resolveNetwork(prefix);
     const pubKey = p2wpkh(child.publicKey /* hex.decode( as string)*/, network);
     return pubKey.address;

package/lib/payment/cryptopay/derive-btc-address.js.map

@@ -1 +1 @@
-{"version":3,"file":"derive-btc-address.js","sourceRoot":"","sources":["../../../src/payment/cryptopay/derive-btc-address.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAElE,oCAAoC;AACpC,2CAA2C;AAC3C,2CAA2C;AAC3C,2CAA2C;AAC3C,2CAA2C;AAC3C,2CAA2C;AAC3C,2CAA2C;AAC3C,gBAAgB;AAChB,KAAK;AAEL,MAAM,cAAc,GAAG,CAAC,MAAM,EAAE,EAAE;IAChC,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;QAAE,OAAO,OAAO,CAAC;IACrD,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC;AAEF,eAAe,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;IAC7B,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAChC,IAAI,MAAM,KAAK,GAAG,IAAI,MAAM,KAAK,GAAG;QAClC,MAAM,IAAI,KAAK,CAAC,+EAA+E,CAAC,CAAC;IAEnG,MAAM,cAAc,GAAG,KAAK,CAAC,eAAe,CAC1C,IAAI,EACJ,MAAM,KAAK,GAAG;QACZ,CAAC,CAAC;YACE,MAAM,EAAE,UAAU,EAAE,cAAc;YAClC,OAAO,EAAE,UAAU,EAAE,gBAAgB;SACtC;QACH,CAAC,CAAC;YACE,MAAM,EAAE,UAAU;YAClB,OAAO,EAAE,UAAU;SACpB,CACN,CAAC;IACF,cAAc,CAAC,eAAe,EAAE,CAAC,CAAC,SAAS;IAE3C,MAAM,KAAK,GAAG,cAAc,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IAE/D,4BAA4B;IAC5B,8CAA8C;IAC9C,qFAAqF;IAErF,MAAM,OAAO,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;IACvC,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,2BAA2B,EAAE,OAAO,CAAC,CAAC;IAE5E,OAAO,MAAM,CAAC,OAAO,CAAC;AACxB,CAAC,CAAC"}
+{"version":3,"file":"derive-btc-address.js","sourceRoot":"","sources":["../../../src/payment/cryptopay/derive-btc-address.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAElE,oCAAoC;AACpC,2CAA2C;AAC3C,2CAA2C;AAC3C,2CAA2C;AAC3C,2CAA2C;AAC3C,2CAA2C;AAC3C,2CAA2C;AAC3C,gBAAgB;AAChB,KAAK;AAEL,MAAM,cAAc,GAAG,CAAC,MAAM,EAAE,EAAE;IAChC,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;QAAE,OAAO,OAAO,CAAC;IACrD,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC;AAEF,eAAe,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;IAC7B,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAChC,IAAI,MAAM,KAAK,GAAG,IAAI,MAAM,KAAK,GAAG;QAClC,MAAM,IAAI,KAAK,CAAC,+EAA+E,CAAC,CAAC;IAEnG,MAAM,cAAc,GAAG,KAAK,CAAC,eAAe,CAC1C,IAAI,EACJ,MAAM,KAAK,GAAG;QACZ,CAAC,CAAC;YACE,MAAM,EAAE,UAAU,EAAE,cAAc;YAClC,OAAO,EAAE,UAAU,EAAE,gBAAgB;SACtC;QACH,CAAC,CAAC;YACE,MAAM,EAAE,UAAU;YAClB,OAAO,EAAE,UAAU;SACpB,CACN,CAAC;IACF,cAAc,CAAC,eAAe,EAAE,CAAC,CAAC,SAAS;IAE3C,MAAM,KAAK,GAAG,cAAc,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IAE/D,IAAI,CAAC,KAAK,CAAC,SAAS;QAAE,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;IAE3F,MAAM,OAAO,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;IACvC,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,2BAA2B,EAAE,OAAO,CAAC,CAAC;IAE5E,OAAO,MAAM,CAAC,OAAO,CAAC;AACxB,CAAC,CAAC"}

package/lib/payment/cryptopay/derive-eth-address.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"derive-eth-address.d.ts","sourceRoot":"","sources":["../../../src/payment/cryptopay/derive-eth-address.ts"],"names":[],"mappings":"yBAwBgB,SAAI,EAAE,UAAK;AAA3B,wBAaE"}
+{"version":3,"file":"derive-eth-address.d.ts","sourceRoot":"","sources":["../../../src/payment/cryptopay/derive-eth-address.ts"],"names":[],"mappings":"yBAwBgB,SAAI,EAAE,UAAK;AAA3B,wBAeE"}

package/lib/payment/cryptopay/derive-eth-address.js

@@ -22,6 +22,8 @@ export default (xpub, index) => {
     const hardenedMaster = HDKey.fromExtendedKey(xpub);
     hardenedMaster.wipePrivateData(); // Neuter
     const child = hardenedMaster.deriveChild(0).deriveChild(index);
+    if (!child.publicKey)
+        throw new Error('Could not derive child key from extended public key');
     // ETH Address (secp256k1 + keccak_256 + checksum)
     const childSigningKey = secp256k1.Point.fromBytes(child.publicKey).toBytes(false);
     const address = Buffer.from(keccak_256(childSigningKey.slice(1)))

package/lib/payment/cryptopay/derive-eth-address.js.map

@@ -1 +1 @@
-{"version":3,"file":"derive-eth-address.js","sourceRoot":"","sources":["../../../src/payment/cryptopay/derive-eth-address.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAEvD,SAAS,kBAAkB,CAAC,OAAO;IACjC,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAChC,MAAM,QAAQ,GAAG,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC;IACpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;QAC5B,QAAQ,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IACvC,CAAC;IACD,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC;IAEpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QAC/B,IAAI,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7B,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QACpC,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YACjC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QAC5C,CAAC;IACH,CAAC;IAED,OAAO,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAC/B,CAAC;AAED,eAAe,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;IAC7B,MAAM,cAAc,GAAG,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;IACnD,cAAc,CAAC,eAAe,EAAE,CAAC,CAAC,SAAS;IAE3C,MAAM,KAAK,GAAG,cAAc,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IAE/D,kDAAkD;IAClD,MAAM,eAAe,GAAG,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAClF,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;SAC9D,QAAQ,CAAC,KAAK,CAAC;SACf,SAAS,CAAC,EAAE,CAAC,CAAC;IAEjB,OAAO,kBAAkB,CAAC,OAAO,CAAC,CAAC;AACrC,CAAC,CAAC"}
+{"version":3,"file":"derive-eth-address.js","sourceRoot":"","sources":["../../../src/payment/cryptopay/derive-eth-address.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAEvD,SAAS,kBAAkB,CAAC,OAAO;IACjC,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAChC,MAAM,QAAQ,GAAG,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC;IACpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;QAC5B,QAAQ,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IACvC,CAAC;IACD,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC;IAEpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QAC/B,IAAI,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7B,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QACpC,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YACjC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QAC5C,CAAC;IACH,CAAC;IAED,OAAO,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAC/B,CAAC;AAED,eAAe,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;IAC7B,MAAM,cAAc,GAAG,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;IACnD,cAAc,CAAC,eAAe,EAAE,CAAC,CAAC,SAAS;IAE3C,MAAM,KAAK,GAAG,cAAc,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IAE/D,IAAI,CAAC,KAAK,CAAC,SAAS;QAAE,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;IAE7F,kDAAkD;IAClD,MAAM,eAAe,GAAG,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAClF,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;SAC9D,QAAQ,CAAC,KAAK,CAAC;SACf,SAAS,CAAC,EAAE,CAAC,CAAC;IAEjB,OAAO,kBAAkB,CAAC,OAAO,CAAC,CAAC;AACrC,CAAC,CAAC"}