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

package/src/files/gridfs/handler-express.ts

@@ -10,7 +10,7 @@ import { getFileAdapter } from '@unchainedshop/core-files';
 
 const { ROOT_URL } = process.env;
 
-const logger = createLogger('unchained:plugins:gridfs');
+const logger = createLogger('unchained:gridfs');
 
 const gridfsHandler = async (
   req: express.Request & {
@@ -44,6 +44,12 @@ const gridfsHandler = async (
       const fileId = await buildHashedFilename(directoryName, fileName, expiryDate);
       if ((await sign(directoryName, fileId, expiryDate.getTime())) === signature) {
         const file = await modules.files.findFile({ fileId });
+
+        if (!file) {
+          res.status(404).send('File not found');
+          return;
+        }
+
         if (file.expires === null) {
           res.status(400).send('File already linked');
           return;
@@ -97,7 +103,7 @@ const gridfsHandler = async (
         const fileUploadAdapter = getFileAdapter();
         const signedUrl = await fileUploadAdapter.createDownloadURL(fileDocument, expiry);
 
-        if (new URL(signedUrl, 'file://').searchParams.get('s') !== signature) {
+        if (!signedUrl || new URL(signedUrl, 'file://').searchParams.get('s') !== signature) {
           res.status(403).send('Access restricted: Invalid signature.');
           return;
         }

package/src/files/gridfs/handler-fastify.ts

@@ -8,7 +8,7 @@ import { Context } from '@unchainedshop/api';
 import { createLogger } from '@unchainedshop/logger';
 import { getFileAdapter } from '@unchainedshop/core-files';
 
-const logger = createLogger('unchained:plugins:gridfs');
+const logger = createLogger('unchained:gridfs');
 
 const gridfsHandler: RouteHandlerMethod = async (
   req: FastifyRequest & {
@@ -39,6 +39,17 @@ const gridfsHandler: RouteHandlerMethod = async (
       const fileId = await buildHashedFilename(directoryName, fileName, expiryDate);
       if ((await sign(directoryName, fileId, expiryDate.getTime())) === signature) {
         const file = await modules.files.findFile({ fileId });
+
+        if (!file) {
+          reply.status(404);
+          logger.error('File not found', { fileId });
+          return reply.send({
+            success: false,
+            message: 'File not found',
+            name: 'FILE_NOT_FOUND',
+          });
+        }
+
         if (file.expires === null) {
           reply.status(400);
           logger.error('File already linked', { fileId });
@@ -113,7 +124,7 @@ const gridfsHandler: RouteHandlerMethod = async (
         const fileUploadAdapter = getFileAdapter();
         const signedUrl = await fileUploadAdapter.createDownloadURL(fileDocument, expiry);
 
-        if (new URL(signedUrl, 'file://').searchParams.get('s') !== signature) {
+        if (!signedUrl || new URL(signedUrl, 'file://').searchParams.get('s') !== signature) {
           reply.status(403);
           logger.error('Invalid signature', { fileId, expiry });
           return reply.send({

package/src/files/minio/handler-express.ts

@@ -1,6 +1,6 @@
 import { createLogger } from '@unchainedshop/logger';
 
-const logger = createLogger('unchained:plugins:minio');
+const logger = createLogger('unchained:minio');
 
 const { MINIO_WEBHOOK_AUTH_TOKEN } = process.env;
 

package/src/files/minio/handler-fastify.ts

@@ -2,7 +2,7 @@ import { Context } from '@unchainedshop/api';
 import { createLogger } from '@unchainedshop/logger';
 import { FastifyRequest, RouteHandlerMethod } from 'fastify';
 
-const logger = createLogger('unchained:plugins:minio');
+const logger = createLogger('unchained:minio');
 
 const { MINIO_WEBHOOK_AUTH_TOKEN } = process.env;
 

package/src/files/minio/index.ts

@@ -14,7 +14,7 @@ import { AssumeRoleProvider } from 'minio/dist/esm/AssumeRoleProvider.mjs';
 import { expiryOffsetInMs } from '@unchainedshop/file-upload/lib/put-expiration.js';
 import { createLogger } from '@unchainedshop/logger';
 
-const logger = createLogger('unchained:plugins:minio');
+const logger = createLogger('unchained:minio');
 
 const {
   MINIO_ACCESS_KEY,
@@ -28,7 +28,7 @@ const {
   AMAZON_S3_SESSION_TOKEN,
 } = process.env;
 
-let client: Client;
+let client: Client | null = null;
 
 export async function connectToMinio() {
   if (!MINIO_ENDPOINT || !MINIO_BUCKET_NAME) {
@@ -56,8 +56,8 @@ export async function connectToMinio() {
     if (MINIO_STS_ENDPOINT) {
       const ap = new AssumeRoleProvider({
         stsEndpoint: MINIO_STS_ENDPOINT,
-        accessKey: MINIO_ACCESS_KEY,
-        secretKey: MINIO_SECRET_KEY,
+        accessKey: MINIO_ACCESS_KEY!,
+        secretKey: MINIO_SECRET_KEY!,
       });
       // eslint-disable-next-line
       // @ts-ignore
@@ -76,17 +76,17 @@ const generateMinioPath = (directoryName: string, fileName: string) => {
 };
 
 const generateMinioUrl = (directoryName: string, hashedFilename: string) => {
-  return `${MINIO_ENDPOINT}/${MINIO_BUCKET_NAME}/${generateMinioPath(directoryName, hashedFilename)}`;
+  return `${MINIO_ENDPOINT}/${MINIO_BUCKET_NAME!}/${generateMinioPath(directoryName, hashedFilename)}`;
 };
 
 connectToMinio().then(function setClient(c) {
-  client = c;
+  client = c || client;
 });
 
 const getObjectStats = async (fileName: string) => {
   if (!client) throw new Error('Minio not connected, check env variables');
 
-  return client.statObject(MINIO_BUCKET_NAME, fileName);
+  return client.statObject(MINIO_BUCKET_NAME!, fileName);
 };
 
 const bufferToStream = (buffer: any) => {
@@ -116,7 +116,7 @@ export const MinioAdapter: IFileAdapter = {
     const _id = await buildHashedFilename(directoryName, fileName, expiryDate);
 
     const url = await client.presignedPutObject(
-      MINIO_BUCKET_NAME,
+      MINIO_BUCKET_NAME!,
       generateMinioPath(directoryName, _id),
       expiryOffsetInMs() / 1000,
     );
@@ -139,7 +139,7 @@ export const MinioAdapter: IFileAdapter = {
       return `${path}/${_id}`;
     });
 
-    await client.removeObjects(MINIO_BUCKET_NAME, fileIds);
+    await client.removeObjects(MINIO_BUCKET_NAME!, fileIds);
   },
 
   async uploadFileFromStream(directoryName: string, rawFile: any) {
@@ -164,7 +164,7 @@ export const MinioAdapter: IFileAdapter = {
     };
 
     await client.putObject(
-      MINIO_BUCKET_NAME,
+      MINIO_BUCKET_NAME!,
       generateMinioPath(directoryName, _id),
       stream,
       undefined,
@@ -200,7 +200,7 @@ export const MinioAdapter: IFileAdapter = {
     };
 
     await client.putObject(
-      MINIO_BUCKET_NAME,
+      MINIO_BUCKET_NAME!,
       generateMinioPath(directoryName, hashedFilename),
       readable,
       undefined,
@@ -222,7 +222,7 @@ export const MinioAdapter: IFileAdapter = {
   async createDownloadStream(file) {
     if (!client) throw new Error('Minio not connected, check env variables');
 
-    const stream = await client.getObject(MINIO_BUCKET_NAME, generateMinioPath(file.path, file._id));
+    const stream = await client.getObject(MINIO_BUCKET_NAME!, generateMinioPath(file.path, file._id));
     return stream;
   },
 };

package/src/filters/local-search.ts

@@ -5,7 +5,7 @@ import { FilterDirector, FilterAdapter, IFilterAdapter } from '@unchainedshop/co
 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: IFilterAdapter = {
   ...FilterAdapter,

package/src/payment/apple-iap/adapter.ts

@@ -3,7 +3,7 @@ import { createLogger } from '@unchainedshop/logger';
 import { AppleTransactionsModule } from './module.js';
 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;
 
@@ -42,7 +42,7 @@ const AppleIAP: IPaymentAdapter = {
       },
 
       async sign() {
-        throw new Error('Apple IAP does not support payment signing');
+        throw new Error('Payment signing not supported');
       },
 
       async validate() {
@@ -60,7 +60,7 @@ const AppleIAP: IPaymentAdapter = {
         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,
@@ -68,7 +68,7 @@ const AppleIAP: IPaymentAdapter = {
           };
         }
 
-        logger.warn('Apple IAP Plugin: Receipt invalid', {
+        logger.warn('Receipt invalid', {
           status: response.status,
         });
         return null;
@@ -79,9 +79,11 @@ const AppleIAP: IPaymentAdapter = {
         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({
@@ -90,7 +92,7 @@ const AppleIAP: IPaymentAdapter = {
           }));
 
         if (receiptResponse && receiptResponse.status !== 0) {
-          throw new Error('Apple IAP Plugin: Receipt invalid');
+          throw new Error('Receipt invalid');
         }
 
         const transactions =
@@ -99,9 +101,7 @@ const AppleIAP: IPaymentAdapter = {
           (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({
@@ -117,7 +117,7 @@ const AppleIAP: IPaymentAdapter = {
         );
 
         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;
@@ -126,14 +126,12 @@ const AppleIAP: IPaymentAdapter = {
           parseInt(matchedTransaction.quantity, 10) === quantity &&
           matchedTransaction.product_id === productId;
 
-        if (!isMatchesTransaction)
-          throw new Error('Apple IAP Plugin: Product in order does not match transaction');
+        if (!isMatchesTransaction) 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');
+        if (alreadyProcessedTransaction) throw new Error('Transaction already processed');
 
         // All good
         await modules.appleTransactions.createTransaction({

package/src/payment/apple-iap/db/AppleTransactionsCollection.ts

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

package/src/payment/apple-iap/handler-express.ts

@@ -3,7 +3,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;
 
@@ -43,10 +43,16 @@ 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,
@@ -72,9 +78,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: {
@@ -88,7 +97,7 @@ export const appleIAPHandler = async (req, res) => {
             transactionId: latestTransaction.original_transaction_id,
             transactions,
             enrollmentId: enrollment._id,
-            orderId: originalOrder._id,
+            orderId: originalOrder!._id,
           },
           resolvedContext,
         );

package/src/payment/apple-iap/handler-fastify.ts

@@ -5,7 +5,7 @@ import { fixPeriods } from './fix-periods.js';
 import { FastifyRequest, RouteHandlerMethod } from 'fastify';
 import { AppleTransactionsModule } from './module.js';
 
-const logger = createLogger('unchained:core-payment:apple-iap:handler');
+const logger = createLogger('unchained:apple-iap:handler');
 
 const { APPLE_IAP_SHARED_SECRET } = process.env;
 
@@ -51,10 +51,16 @@ export const appleIAPHandler: RouteHandlerMethod = async (
           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,
@@ -65,7 +71,7 @@ export const appleIAPHandler: RouteHandlerMethod = async (
         resolvedContext,
       );
 
-      logger.info(`Apple IAP Webhook: Confirmed checkout for order ${order.orderNumber}`, {
+      logger.info(`Webhook confirmed checkout for order ${order.orderNumber}`, {
         orderId: order._id,
       });
     } else {
@@ -80,9 +86,13 @@ export const appleIAPHandler: RouteHandlerMethod = async (
       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: {
@@ -96,13 +106,13 @@ export const appleIAPHandler: RouteHandlerMethod = async (
           transactionId: latestTransaction.original_transaction_id,
           transactions,
           enrollmentId: enrollment._id,
-          orderId: originalOrder._id,
+          orderId: originalOrder!._id,
         },
         resolvedContext,
       );
 
       logger.info(
-        `Apple IAP Webhook: Processed notification for ${latestTransaction.original_transaction_id} and type ${responseBody.notification_type}`,
+        `Webhook rocessed notification for ${latestTransaction.original_transaction_id} and type ${responseBody.notification_type}`,
       );
 
       if (responseBody.notification_type === AppleNotificationTypes.DID_RECOVER) {

package/src/payment/apple-iap/module.ts

@@ -1,19 +1,24 @@
+import { generateDbObjectId } from '@unchainedshop/mongodb';
 import { AppleTransaction, AppleTransactionsCollection } from './db/AppleTransactionsCollection.js';
 
 export const configureAppleTransactionsModule = async ({ db }) => {
   const AppleTransactions = await AppleTransactionsCollection(db);
 
   return {
-    findTransactionById: async (transactionIdentifier: string): Promise<AppleTransaction> => {
+    findTransactionById: async (transactionIdentifier: string): Promise<AppleTransaction | null> => {
       return AppleTransactions.findOne({ _id: transactionIdentifier });
     },
 
-    createTransaction: async (doc: AppleTransaction) => {
-      await AppleTransactions.insertOne({
+    createTransaction: async (
+      doc: Omit<AppleTransaction, '_id' | 'created'> &
+        Pick<Partial<AppleTransaction>, '_id' | 'created'>,
+    ) => {
+      const { insertedId } = await AppleTransactions.insertOne({
+        _id: generateDbObjectId(),
         ...doc,
         created: new Date(),
       });
-      return doc._id;
+      return insertedId;
     },
   };
 };

package/src/payment/braintree.ts

@@ -7,7 +7,7 @@ import {
   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;
 
@@ -108,6 +108,9 @@ const BraintreeDirect: IPaymentAdapter = {
 
       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');
 

package/src/payment/cryptopay/db/CryptopayTransactions.ts

@@ -2,7 +2,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/src/payment/cryptopay/derive-btc-address.ts

@@ -37,9 +37,7 @@ export default (xpub, index) => {
 
   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);

package/src/payment/cryptopay/derive-eth-address.ts

@@ -28,6 +28,8 @@ export default (xpub, index) => {
 
   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/src/payment/cryptopay/handle-webhook.ts

@@ -6,7 +6,7 @@ import { ProductPriceRate } from '@unchainedshop/core-products';
 
 const { CRYPTOPAY_SECRET, CRYPTOPAY_MAX_RATE_AGE = '360' } = process.env;
 
-const logger = createLogger('unchained:core-payment:cryptopay:handler');
+const logger = createLogger('unchained:cryptopay:handler');
 
 export default async function handleWebhook(
   {
@@ -54,7 +54,7 @@ export default async function handleWebhook(
       blockHeight,
       amount,
       contract,
-      decimals,
+      decimals: decimals ?? 0,
       currencyCode,
     });
 
@@ -68,10 +68,10 @@ export default async function handleWebhook(
       // Try to process order to next status
       // TODO: Not sure if it's correct to use processOrder here if status is PENDING!
       const order = await modules.orders.findOrder({ orderId: orderPayment.orderId });
-      if (order.status === null) {
-        await services.orders.checkoutOrder(order._id, {});
-      } else if (order.status === OrderStatus.PENDING) {
-        await services.orders.processOrder(order, {});
+      if (order!.status === null) {
+        await services.orders.checkoutOrder(order!._id, {});
+      } else if (order!.status === OrderStatus.PENDING) {
+        await services.orders.processOrder(order!, {});
       } else {
         throw new Error('Already processed');
       }

package/src/payment/cryptopay/handler-express.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@unchainedshop/logger';
 import handleWebhook from './handle-webhook.js';
 
-const logger = createLogger('unchained:core-payment:cryptopay:handler');
+const logger = createLogger('unchained:cryptopay:handler');
 
 const cryptopayHandler = async (req, res) => {
   if (req.method === 'POST') {

package/src/payment/cryptopay/handler-fastify.ts

@@ -2,7 +2,7 @@ import { createLogger } from '@unchainedshop/logger';
 import handleWebhook from './handle-webhook.js';
 import { FastifyRequest, RouteHandlerMethod } from 'fastify';
 
-const logger = createLogger('unchained:core-payment:cryptopay:handler');
+const logger = createLogger('unchained:cryptopay:handler');
 
 const cryptopayHandler: RouteHandlerMethod = async (
   req: FastifyRequest & {

package/src/payment/cryptopay/module.ts

@@ -4,7 +4,10 @@ import { CryptopayTransaction, CryptopayTransactionsCollection } from './db/Cryp
 const configureCryptopayModule = ({ db }) => {
   const CryptoTransactions = CryptopayTransactionsCollection(db);
 
-  const getWalletAddress = async (address: string, contract?: string): Promise<CryptopayTransaction> => {
+  const getWalletAddress = async (
+    address: string,
+    contract?: string,
+  ): Promise<CryptopayTransaction | null> => {
     const addressId = [address, contract].filter(Boolean).join(':');
     return CryptoTransactions.findOne({ _id: addressId });
   };
@@ -35,7 +38,7 @@ const configureCryptopayModule = ({ db }) => {
   }): Promise<CryptopayTransaction> => {
     const addressId = [address, contract].filter(Boolean).join(':');
 
-    return CryptoTransactions.findOneAndUpdate(
+    return (await CryptoTransactions.findOneAndUpdate(
       {
         _id: addressId,
       },
@@ -54,7 +57,7 @@ const configureCryptopayModule = ({ db }) => {
         },
       },
       { upsert: true, returnDocument: 'after' },
-    );
+    )) as CryptopayTransaction;
   };
 
   const getNextDerivationNumber = async (currencyCode: string): Promise<number> => {
@@ -92,7 +95,7 @@ const configureCryptopayModule = ({ db }) => {
     decimals: number;
   }): Promise<CryptopayTransaction> => {
     const addressId = [address, contract].filter(Boolean).join(':');
-    return CryptoTransactions.findOneAndUpdate(
+    return (await CryptoTransactions.findOneAndUpdate(
       {
         _id: addressId,
       },
@@ -111,7 +114,7 @@ const configureCryptopayModule = ({ db }) => {
         },
       },
       { upsert: true, returnDocument: 'after' },
-    );
+    )) as CryptopayTransaction;
   };
 
   return {

package/src/payment/cryptopay/plugin.ts

@@ -12,7 +12,7 @@ import deriveBtcAddress from './derive-btc-address.js';
 import deriveEthAddress from './derive-eth-address.js';
 import denoteAmount from './denote-amount.js';
 
-const logger = createLogger('unchained:core-payment:cryptopay');
+const logger = createLogger('unchained:cryptopay');
 
 const { CRYPTOPAY_SECRET, CRYPTOPAY_BTC_XPUB, CRYPTOPAY_ETH_XPUB } = process.env;
 
@@ -44,6 +44,9 @@ const Cryptopay: IPaymentAdapter = {
 
     const setConversionRates = async (currencyCode: string, existingAddresses: any[]) => {
       const originCurrencyObj = await modules.currencies.findCurrency({ isoCode: currencyCode });
+
+      if (!originCurrencyObj?.isActive) throw new Error('Origin currency is not supported');
+
       const updatedAddresses = await Promise.all(
         existingAddresses.map(async (addressData) => {
           const targetCurrencyObj = await modules.currencies.findCurrency({
@@ -113,6 +116,8 @@ const Cryptopay: IPaymentAdapter = {
         if (!orderPayment)
           throw new Error('Payment Credential Registration is not yet supported for Cryptopay');
 
+        if (!order) throw new Error('Order context is required for signing with Cryptopay');
+
         const existingAddresses = await modules.cryptopay.getWalletAddressesByOrderPaymentId(
           orderPayment._id,
         );
@@ -166,6 +171,11 @@ const Cryptopay: IPaymentAdapter = {
       charge: async () => {
         const { order, orderPayment } = context;
 
+        if (!orderPayment)
+          throw new Error('Order Payment context is required for charging with Cryptopay');
+
+        if (!order) throw new Error('Order context is required for charging with Cryptopay');
+
         const foundWalletsWithBalances = await modules.cryptopay.getWalletAddressesByOrderPaymentId(
           orderPayment._id,
         );
@@ -180,18 +190,25 @@ const Cryptopay: IPaymentAdapter = {
         });
         const totalAmount = BigInt(pricing?.total({ useNetPrice: false }).amount);
 
-        if (walletForOrderPayment.currencyCode !== order.currencyCode) {
+        if (walletForOrderPayment && walletForOrderPayment.currencyCode !== order.currencyCode) {
           const baseCurrency = await modules.currencies.findCurrency({
             isoCode: walletForOrderPayment.currencyCode,
           });
+
+          if (!baseCurrency) throw new Error('Base currency not found');
+
           const quoteCurrency = await modules.currencies.findCurrency({ isoCode: order.currencyCode });
 
-          const { /* min, */ max } = await modules.products.prices.rates.getRateRange(
+          if (!quoteCurrency) throw new Error('Quote currency not found');
+
+          const rate = await modules.products.prices.rates.getRateRange(
             baseCurrency,
             quoteCurrency,
             order.confirmed || new Date(),
           );
 
+          if (!rate) throw new Error('No conversion rate found');
+
           const convertedAmount = denoteAmount(
             walletForOrderPayment.amount.toString(),
             walletForOrderPayment.decimals,
@@ -199,7 +216,7 @@ const Cryptopay: IPaymentAdapter = {
 
           // Add a Promille 🍻
           // const minAmount = parseFloat(convertedAmount.toString()) * min * 0.999;
-          const maxAmount = parseFloat(convertedAmount.toString()) * max * 1.001;
+          const maxAmount = parseFloat(convertedAmount.toString()) * rate.max * 1.001;
 
           if (maxAmount && maxAmount >= totalAmount) {
             // Enough sent