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

package/src/payment/datatrans-v2/handler-express.ts

@@ -9,12 +9,19 @@ const {
   DATATRANS_SECURITY = Security.DYNAMIC_SIGN,
 } = process.env;
 
-const logger = createLogger('unchained:core-payment:datatrans:handler');
+const logger = createLogger('unchained:datatrans:handler');
 
 export const datatransHandler = async (req, res) => {
   const resolvedContext = req.unchainedContext as Context;
   const { modules, services } = resolvedContext;
   const signature = req.headers['datatrans-signature'];
+
+  if (!DATATRANS_SIGN_KEY && !DATATRANS_SIGN2_KEY) {
+    logger.warn('No sign key configured');
+    res.status(404).end();
+    return;
+  }
+
   if (req.method === 'POST' && signature) {
     const [rawTimestamp, rawHash] = signature.split(',');
     const [, hash] = rawHash.split('=');
@@ -22,7 +29,7 @@ export const datatransHandler = async (req, res) => {
 
     const comparableSignature = await generateSignature({
       security: DATATRANS_SECURITY as any,
-      signKey: DATATRANS_SIGN2_KEY || DATATRANS_SIGN_KEY,
+      signKey: DATATRANS_SIGN2_KEY! || DATATRANS_SIGN_KEY!,
     })(timestamp, req.body);
 
     if (hash !== comparableSignature) {
@@ -64,6 +71,9 @@ export const datatransHandler = async (req, res) => {
           const order = await services.orders.checkoutOrder(orderPayment.orderId, {
             paymentContext: { userId, transactionId: transaction.transactionId },
           });
+
+          if (!order) throw new Error(`Order with id ${orderPayment.orderId} not found`);
+
           logger.info(`confirmed checkout for order ${order.orderNumber}`, {
             orderId: order._id,
           });

package/src/payment/datatrans-v2/handler-fastify.ts

@@ -10,7 +10,7 @@ const {
   DATATRANS_SECURITY = Security.DYNAMIC_SIGN,
 } = process.env;
 
-const logger = createLogger('unchained:core-payment:datatrans:handler');
+const logger = createLogger('unchained:datatrans:handler');
 
 export const datatransHandler: RouteHandlerMethod = async (
   req: FastifyRequest & {
@@ -21,6 +21,12 @@ export const datatransHandler: RouteHandlerMethod = async (
   const resolvedContext = req.unchainedContext as Context;
   const { modules, services } = resolvedContext;
   const signature = req.headers['datatrans-signature'] as string;
+
+  if (!DATATRANS_SIGN_KEY && !DATATRANS_SIGN2_KEY) {
+    logger.warn('No sign key configured');
+    return reply.send({ success: false, message: 'No sign key configured', name: 'NO_SIGN_KEY' });
+  }
+
   if (signature) {
     const [rawTimestamp, rawHash] = signature.split(',');
     const [, hash] = rawHash.split('=');
@@ -28,7 +34,7 @@ export const datatransHandler: RouteHandlerMethod = async (
 
     const comparableSignature = await generateSignature({
       security: DATATRANS_SECURITY as any,
-      signKey: DATATRANS_SIGN2_KEY || DATATRANS_SIGN_KEY,
+      signKey: DATATRANS_SIGN2_KEY! || DATATRANS_SIGN_KEY!,
     })(timestamp, req.body as string);
 
     if (hash !== comparableSignature) {
@@ -70,6 +76,9 @@ export const datatransHandler: RouteHandlerMethod = async (
           const order = await services.orders.checkoutOrder(orderPayment.orderId, {
             paymentContext: { userId, transactionId: transaction.transactionId },
           });
+
+          if (!order) throw new Error(`Order with id ${orderPayment.orderId} not found`);
+
           reply.status(200);
           logger.info(`confirmed checkout for order ${order.orderNumber}`, {
             orderId: order._id,

package/src/payment/datatrans-v2/index.ts

@@ -19,8 +19,10 @@ import {
   PaymentPricingSheet,
   OrderPricingSheet,
 } from '@unchainedshop/core';
+import { Order, OrderPayment } from '@unchainedshop/core-orders';
+import { PaymentConfiguration } from '@unchainedshop/core-payment';
 
-const logger = createLogger('unchained:core-payment:datatrans');
+const logger = createLogger('unchained:datatrans');
 
 // v2
 const {
@@ -43,6 +45,56 @@ const throwIfResponseError = (result) => {
   }
 };
 
+const getMarketplaceSplits = async ({
+  order,
+  orderPayment,
+  config,
+}: {
+  order: Order;
+  orderPayment: OrderPayment;
+  config: PaymentConfiguration;
+}): Promise<
+  {
+    subMerchantId: string;
+    amount: number;
+    commission: number;
+  }[]
+> => {
+  const pricingForOrderPayment = PaymentPricingSheet({
+    calculation: orderPayment.calculation,
+    currencyCode: order.currencyCode,
+  });
+  const pricing = OrderPricingSheet({
+    calculation: order.calculation,
+    currencyCode: order.currencyCode,
+  });
+
+  const { amount: total } = pricing.total({ useNetPrice: false });
+
+  return Promise.all(
+    config
+      .filter((item) => item.key === 'marketplaceSplit')
+      .map((item) => {
+        const [subMerchantId, staticDiscountId, sharePercentage] =
+          item.value || ''.split(';').map((f) => f.trim());
+
+        const { amount: discountSum } = pricingForOrderPayment.total({
+          category: PaymentPricingRowCategory.Discount,
+          discountId: staticDiscountId,
+        });
+        const shareFactor = sharePercentage ? parseInt(sharePercentage, 10) / 100 : 1;
+        const amount = Math.round(total * shareFactor);
+        const commission = Math.round(discountSum * -1 * shareFactor);
+
+        return {
+          subMerchantId,
+          amount,
+          commission,
+        };
+      }),
+  );
+};
+
 const Datatrans: IPaymentAdapter = {
   ...PaymentAdapter,
 
@@ -67,8 +119,11 @@ const Datatrans: IPaymentAdapter = {
     };
 
     const api = () => {
-      if (!DATATRANS_SECRET) throw new Error('Credentials not Set');
-      return createDatatransAPI(DATATRANS_API_ENDPOINT, getMerchantId(), DATATRANS_SECRET);
+      const merchantId = getMerchantId();
+      if (!DATATRANS_SECRET) throw new Error('Credential DATATRANS_SECRET not Set');
+      if (!merchantId) throw new Error('Credential Merchant ID not configured');
+      if (!DATATRANS_API_ENDPOINT) throw new Error('Credential DATATRANS_API_ENDPOINT not Set');
+      return createDatatransAPI(DATATRANS_API_ENDPOINT, merchantId!, DATATRANS_SECRET);
     };
 
     const shouldSettleInUnchained = () => {
@@ -78,58 +133,21 @@ const Datatrans: IPaymentAdapter = {
       }, true);
     };
 
-    const getMarketplaceSplits = async (): Promise<
-      {
-        subMerchantId: string;
-        amount: number;
-        commission: number;
-      }[]
-    > => {
+    const authorize = async ({ paymentCredentials, ...arbitraryFields }): Promise<string> => {
       const { order, orderPayment } = context;
 
-      const pricingForOrderPayment = PaymentPricingSheet({
-        calculation: orderPayment.calculation,
-        currencyCode: order.currencyCode,
-      });
-      const pricing = OrderPricingSheet({
-        calculation: order.calculation,
-        currencyCode: order.currencyCode,
-      });
-
-      const { amount: total } = pricing.total({ useNetPrice: false });
-
-      return Promise.all(
-        config
-          .filter((item) => item.key === 'marketplaceSplit')
-          .map((item) => {
-            const [subMerchantId, staticDiscountId, sharePercentage] = item.value
-              .split(';')
-              .map((f) => f.trim());
-
-            const { amount: discountSum } = pricingForOrderPayment.total({
-              category: PaymentPricingRowCategory.Discount,
-              discountId: staticDiscountId,
-            });
-            const shareFactor = sharePercentage ? parseInt(sharePercentage, 10) / 100 : 1;
-            const amount = Math.round(total * shareFactor);
-            const commission = Math.round(discountSum * -1 * shareFactor);
-
-            return {
-              subMerchantId,
-              amount,
-              commission,
-            };
-          }),
-      );
-    };
+      if (!orderPayment) throw new Error('Order Payment missing in context');
+      if (!order) throw new Error('Order missing in context');
 
-    const authorize = async ({ paymentCredentials, ...arbitraryFields }): Promise<string> => {
-      const { order, orderPayment } = context;
       const refno = Buffer.from(orderPayment._id, 'hex').toString('base64');
       const userId = order?.userId || context?.userId;
       const refno2 = userId;
       const { currencyCode, amount } = roundedAmountFromOrder(order);
-      const splits = await getMarketplaceSplits();
+      const splits = await getMarketplaceSplits({
+        orderPayment,
+        order,
+        config,
+      });
       const result = await api().authorize({
         ...arbitraryFields,
         amount,
@@ -158,6 +176,7 @@ const Datatrans: IPaymentAdapter = {
       ...arbitraryFields
     }): Promise<string> => {
       const { order } = context;
+      if (!order) throw new Error('Order missing in context');
       const { currencyCode, amount } = roundedAmountFromOrder(order);
       const result = await api().authorizeAuthenticated({
         ...arbitraryFields,
@@ -174,6 +193,7 @@ const Datatrans: IPaymentAdapter = {
 
     const isTransactionAmountValid = (transaction: StatusResponseSuccess): boolean => {
       const { order } = context;
+      if (!order) throw new Error('Order missing in context');
       const { currencyCode, amount } = roundedAmountFromOrder(order);
       if (
         transaction.currency !== currencyCode ||
@@ -207,9 +227,15 @@ const Datatrans: IPaymentAdapter = {
     };
 
     const settle = async ({ transactionId, refno, refno2, extensions }): Promise<boolean> => {
-      const { order } = context;
+      const { order, orderPayment } = context;
+      if (!orderPayment) throw new Error('Order Payment missing in context');
+      if (!order) throw new Error('Order missing in context');
       const { currencyCode, amount } = roundedAmountFromOrder(order);
-      const splits = await getMarketplaceSplits();
+      const splits = await getMarketplaceSplits({
+        orderPayment,
+        order,
+        config,
+      });
       const result = await api().settle({
         transactionId,
         amount,
@@ -320,6 +346,9 @@ const Datatrans: IPaymentAdapter = {
       async confirm() {
         if (!shouldSettleInUnchained()) return false;
         const { orderPayment, transactionContext } = context;
+
+        if (!orderPayment) throw new Error('Order Payment missing in context');
+
         const { transactionId } = orderPayment;
 
         const { extensions } = transactionContext || {};
@@ -350,6 +379,9 @@ const Datatrans: IPaymentAdapter = {
       async cancel() {
         if (!shouldSettleInUnchained()) return false;
         const { orderPayment } = context;
+
+        if (!orderPayment) throw new Error('Order Payment missing in context');
+
         const { transactionId } = orderPayment;
         if (!transactionId) {
           return false;

package/src/payment/paypal-checkout.ts

@@ -17,7 +17,7 @@ try {
   /* */
 }
 
-const logger = createLogger('unchained:core-payment:paypal-checkout');
+const logger = createLogger('unchained:paypal-checkout');
 
 const { PAYPAL_CLIENT_ID, PAYPAL_SECRET, PAYPAL_ENVIRONMENT = 'sandbox' } = process.env;
 
@@ -72,12 +72,14 @@ const PaypalCheckout: IPaymentAdapter = {
       },
 
       sign: async () => {
-        return PAYPAL_CLIENT_ID;
+        return PAYPAL_CLIENT_ID || null;
       },
 
       charge: async ({ orderID }) => {
         const { order } = context;
 
+        if (!order) throw new Error('Order missing in payment context');
+
         if (!orderID) {
           throw new Error('You have to provide orderID in paymentContext');
         }

package/src/payment/payrexx/api/index.ts

@@ -51,7 +51,7 @@ const createPayrexxAPI = (instance: string, secret: string) => {
       throw new Error(await result.text());
     },
 
-    async getGateway(id): Promise<GatewayObject> {
+    async getGateway(id): Promise<GatewayObject | null> {
       const result = await fetchPayrexx(`Gateway/${id}`, 'GET');
       if (!result.ok) throw new Error(await result.text());
       const { status, data } = await result.json();

package/src/payment/payrexx/api/makeFetcher.ts

@@ -6,8 +6,8 @@ const logger = createLogger('unchained:payrexx');
 
 export default (
   baseUrl = 'https://api.payrexx.com/v1.0/',
-  instance: string = null,
-  secret: string = null,
+  instance: string,
+  secret: string,
 ): ((path: string, method: 'GET' | 'DELETE' | 'PUT' | 'POST', data?: any) => Promise<Response>) => {
   if (MOCK_APIS) {
     return async (path): Promise<Response> => {

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

@@ -1,7 +1,7 @@
 import { Context } from '@unchainedshop/api';
 import { createLogger } from '@unchainedshop/logger';
 
-const logger = createLogger('unchained:core-payment:payrexx:handler');
+const logger = createLogger('unchained:payrexx:handler');
 
 export const payrexxHandler = async (request, response) => {
   const resolvedContext = request.unchainedContext as Context;
@@ -70,6 +70,8 @@ export const payrexxHandler = async (request, response) => {
           gatewayId: invoice.paymentRequestId,
         },
       });
+      if (!order) throw new Error(`Order with id ${orderPayment.orderId} not found`);
+
       logger.info(`checkout successful`, {
         orderPaymentId,
         orderId: order._id,

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

@@ -2,19 +2,18 @@ import { Context } from '@unchainedshop/api';
 import { createLogger } from '@unchainedshop/logger';
 import { FastifyRequest, RouteHandlerMethod } from 'fastify';
 
-const logger = createLogger('unchained:core-payment:payrexx:handler');
+const logger = createLogger('unchained:payrexx:handler');
 
 export const payrexxHandler: RouteHandlerMethod = async (
   request: FastifyRequest & {
     unchainedContext: Context;
-  },
+  } & { body: Record<string, any> },
   reply,
 ) => {
   const resolvedContext = request.unchainedContext as Context;
   const { modules, services } = resolvedContext;
 
-  const { transaction } = request.body as Record<string, any>;
-
+  const { transaction } = request.body;
   if (!transaction) {
     logger.info(`unhandled event type`, {
       type: Object.keys(request.body).join(','),
@@ -80,6 +79,8 @@ export const payrexxHandler: RouteHandlerMethod = async (
           gatewayId: invoice.paymentRequestId,
         },
       });
+      if (!order) throw new Error(`Order with id ${orderPayment.orderId} not found`);
+
       logger.info(`checkout successful`, {
         orderPaymentId,
         orderId: order._id,

package/src/payment/payrexx/index.ts

@@ -9,7 +9,7 @@ import {
   PaymentError,
 } from '@unchainedshop/core';
 
-const logger = createLogger('unchained:core-payment:payrexx');
+const logger = createLogger('unchained:payrexx');
 
 const Payrexx: IPaymentAdapter = {
   ...PaymentAdapter,
@@ -25,11 +25,7 @@ const Payrexx: IPaymentAdapter = {
   actions: (config, context) => {
     const { modules } = context;
 
-    const getInstance = () => {
-      return config.find((c) => c.key === 'instance')?.value;
-    };
-
-    const api = createPayrexxAPI(getInstance(), process.env.PAYREXX_SECRET);
+    const instance = config.find((c) => c.key === 'instance')?.value;
 
     const adapterActions = {
       ...PaymentAdapter.actions(config, context),
@@ -38,7 +34,7 @@ const Payrexx: IPaymentAdapter = {
         if (!process.env.PAYREXX_SECRET) {
           return PaymentError.INCOMPLETE_CONFIGURATION;
         }
-        if (!getInstance()) {
+        if (!instance) {
           return PaymentError.INCOMPLETE_CONFIGURATION;
         }
         return null;
@@ -55,6 +51,11 @@ const Payrexx: IPaymentAdapter = {
 
       sign: async (transactionContext = {}) => {
         const { orderPayment, userId, order } = context;
+
+        if (!order) throw new Error('No order in context, can only sign with order context');
+
+        const api = createPayrexxAPI(instance!, process.env.PAYREXX_SECRET!);
+
         if (orderPayment) {
           // Order Checkout signing (One-time payment)
           const pricing = OrderPricingSheet({
@@ -70,7 +71,10 @@ const Payrexx: IPaymentAdapter = {
         }
 
         // Payment Credential Registration signing
-        const user = await modules.users.findUserById(userId);
+
+        const user = userId && (await modules.users.findUserById(userId));
+        if (!user) throw new Error('User not found, can only sign registrations with user context');
+
         const emailAddress = modules.users.primaryEmail(user)?.address;
         const gateway = await api.createGateway(
           mapUserToGatewayObject({
@@ -107,11 +111,13 @@ const Payrexx: IPaymentAdapter = {
 
       async confirm() {
         const { orderPayment } = context;
-        const { transactionId } = orderPayment;
 
-        if (!transactionId) {
+        if (!orderPayment?.transactionId) {
           return false;
         }
+        const { transactionId } = orderPayment;
+
+        const api = createPayrexxAPI(instance!, process.env.PAYREXX_SECRET!);
 
         const gatewayObject = await api.getGateway(transactionId);
 
@@ -140,10 +146,12 @@ const Payrexx: IPaymentAdapter = {
 
       async cancel() {
         const { orderPayment } = context;
-        const { transactionId } = orderPayment;
-        if (!transactionId) {
+        if (!orderPayment?.transactionId) {
           return false;
         }
+        const { transactionId } = orderPayment;
+
+        const api = createPayrexxAPI(instance!, process.env.PAYREXX_SECRET!);
 
         const gatewayObject = await api.getGateway(transactionId);
 
@@ -170,10 +178,12 @@ const Payrexx: IPaymentAdapter = {
           throw new Error('You have to provide gatewayId or paymentCredentials');
         }
 
-        const { order } = context;
-        const orderPayment = await modules.orders.payments.findOrderPayment({
-          orderPaymentId: order.paymentId,
-        });
+        const { order, orderPayment } = context;
+
+        if (!order) throw new Error('No order in context, can only charge with order context');
+        if (!orderPayment) throw new Error('Order payment not found');
+
+        const api = createPayrexxAPI(instance!, process.env.PAYREXX_SECRET!);
 
         const gatewayObject = await api.getGateway(gatewayId);
 

package/src/payment/postfinance-checkout/handler-express.ts

@@ -3,7 +3,7 @@ import { createLogger } from '@unchainedshop/logger';
 import { WebhookData } from './types.js';
 import { getTransaction, getTransactionCompletion } from './api.js';
 
-const logger = createLogger('unchained:core-payment:postfinance-checkout:handler');
+const logger = createLogger('unchained:postfinance-checkout:handler');
 
 export const postfinanceCheckoutHandler = async (req, res) => {
   const context = req.unchainedContext as Context;
@@ -26,8 +26,11 @@ export const postfinanceCheckoutHandler = async (req, res) => {
           transactionId: transactionCompletion.linkedTransaction,
         },
       });
+
+      if (!order) throw new Error(`Order with id ${orderPayment.orderId} not found`);
+
       logger.info(
-        `Transaction ${transactionCompletion.linkedTransaction} marked order payment ID ${transaction.metaData.orderPaymentId} as paid`,
+        `Transaction ${transactionCompletion.linkedTransaction} marked order payment ID ${transaction.metaData?.orderPaymentId} as paid`,
       );
       res.status(200).send(`Order marked as paid: ${order.orderNumber}`);
     } catch (e) {

package/src/payment/postfinance-checkout/handler-fastify.ts

@@ -4,7 +4,7 @@ import { WebhookData } from './types.js';
 import { getTransaction, getTransactionCompletion } from './api.js';
 import { FastifyRequest, RouteHandlerMethod } from 'fastify';
 
-const logger = createLogger('unchained:core-payment:postfinance-checkout:handler');
+const logger = createLogger('unchained:postfinance-checkout:handler');
 
 export const postfinanceCheckoutHandler: RouteHandlerMethod = async (
   req: FastifyRequest & {
@@ -32,8 +32,11 @@ export const postfinanceCheckoutHandler: RouteHandlerMethod = async (
           transactionId: transaction.id,
         },
       });
+
+      if (!order) throw new Error(`Order with id ${orderPayment.orderId} not found`);
+
       logger.info(
-        `Transaction ${transaction.id} marked order payment ID ${transaction.metaData.orderPaymentId} as paid`,
+        `Transaction ${transaction.id} marked order payment ID ${transaction.metaData?.orderPaymentId} as paid`,
       );
       reply.status(200);
       return reply.send({ success: true, orderNumber: order.orderNumber });

package/src/payment/postfinance-checkout/index.ts

@@ -40,7 +40,7 @@ const {
   PFCHECKOUT_FAILED_URL,
 } = process.env;
 
-const logger = createLogger('unchained:core-payment:postfinance-checkout');
+const logger = createLogger('unchained:postfinance-checkout');
 
 const newError = ({ code, message }: { code: string; message: string }) => {
   const error = new Error(message);
@@ -104,6 +104,10 @@ const PostfinanceCheckout: IPaymentAdapter = {
       sign: async (transactionContext: any = {}) => {
         const { orderPayment, order } = context;
 
+        if (!order) throw new Error('No order in context, can only sign with order context');
+        if (!orderPayment)
+          throw new Error('No order payment in context, can only sign with order payment context');
+
         const { integrationMode = IntegrationModes.PaymentPage }: { integrationMode: IntegrationModes } =
           transactionContext;
         const completionMode = adapter.getCompletionMode();
@@ -146,7 +150,10 @@ const PostfinanceCheckout: IPaymentAdapter = {
         }
 
         const transactionId = await createTransaction(transaction);
-        let location = null;
+
+        if (!transactionId) throw new Error('Could not create transaction');
+
+        let location: string | null = null;
         if (integrationMode === IntegrationModes.PaymentPage) {
           location = await getPaymentPageUrl(transactionId);
         } else if (integrationMode === IntegrationModes.Lightbox) {
@@ -185,7 +192,11 @@ const PostfinanceCheckout: IPaymentAdapter = {
           });
         }
 
-        const isPaid = await orderIsPaid(context.order, transaction);
+        const { order, orderPayment } = context;
+        if (!orderPayment) throw new Error('No order payment in context, cannot charge payment');
+        if (!order) throw new Error('No order in context, can only sign with order context');
+
+        const isPaid = await orderIsPaid(order, transaction);
         if (!isPaid) {
           logger.error(`Transaction #${transactionId}: Invalid state / Amount incorrect`);
           throw newError({
@@ -194,7 +205,7 @@ const PostfinanceCheckout: IPaymentAdapter = {
           });
         }
 
-        if (transaction.metaData.orderPaymentId !== context.orderPayment._id) {
+        if (transaction.metaData?.orderPaymentId !== orderPayment._id) {
           logger.error(`Transaction #${transactionId}: Invalid state / Amount incorrect`);
           throw newError({
             code: `TRANSACTION_ALREADY_USED`,
@@ -216,10 +227,11 @@ const PostfinanceCheckout: IPaymentAdapter = {
 
       cancel: async () => {
         const { orderPayment, order } = context;
-        const { transactionId } = orderPayment;
-        if (!transactionId) {
+        if (!order) throw new Error('No order in context, can only cancel with order context');
+        if (!orderPayment?.transactionId) {
           return false;
         }
+        const { transactionId } = orderPayment;
         const transaction = await getTransaction(transactionId);
         const refund = transaction.state === TransactionState.FULFILL;
         const pricing = OrderPricingSheet({
@@ -237,10 +249,10 @@ const PostfinanceCheckout: IPaymentAdapter = {
 
       confirm: async () => {
         const { orderPayment } = context;
-        const { transactionId } = orderPayment;
-        if (!transactionId) {
+        if (!orderPayment?.transactionId) {
           return false;
         }
+        const { transactionId } = orderPayment;
         const transaction = await getTransaction(transactionId);
         if (transaction.state === TransactionState.AUTHORIZED) {
           return confirmDeferredTransaction(transactionId);

package/src/payment/saferpay/adapter.ts

@@ -133,8 +133,8 @@ export const WordlineSaferpay: IPaymentAdapter = {
           saferpayTransactionId,
         );
 
-        paymentPageInitInput.Notification.SuccessNotifyUrl = addTransactionId(
-          paymentPageInitInput.Notification.SuccessNotifyUrl,
+        paymentPageInitInput.Notification!.SuccessNotifyUrl = addTransactionId(
+          paymentPageInitInput.Notification!.SuccessNotifyUrl,
           saferpayTransactionId,
         );
 
@@ -166,6 +166,10 @@ export const WordlineSaferpay: IPaymentAdapter = {
           mongodb.ObjectId.createFromHexString(transactionId),
         );
 
+        if (!saferpayTransaction?.token) {
+          throw new Error('No initialized transaction Token');
+        }
+
         const api = createSaferPayClient();
         const paymentPageAssert = await api.paymentPageAssert(orderPayment, {
           Token: saferpayTransaction.token,
@@ -205,6 +209,10 @@ export const WordlineSaferpay: IPaymentAdapter = {
           mongodb.ObjectId.createFromHexString(transactionId),
         );
 
+        if (!saferpayTransaction?.token) {
+          throw new Error('No initialized transaction Token');
+        }
+
         const api = createSaferPayClient();
         const paymentPageAssert = await api.paymentPageAssert(orderPayment, {
           Token: saferpayTransaction.token,
@@ -236,6 +244,10 @@ export const WordlineSaferpay: IPaymentAdapter = {
           mongodb.ObjectId.createFromHexString(transactionId),
         );
 
+        if (!saferpayTransaction?.token) {
+          throw new Error('No initialized transaction Token');
+        }
+
         const api = createSaferPayClient();
         const paymentPageAssert = await api.paymentPageAssert(orderPayment, {
           Token: saferpayTransaction.token,

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

@@ -3,7 +3,7 @@ import { createLogger } from '@unchainedshop/logger';
 import { buildSignature } from './buildSignature.js';
 import { SaferpayTransactionsModule } from './module.js';
 
-const logger = createLogger('unchained:core-payment:saferpay:handler');
+const logger = createLogger('unchained:saferpay:handler');
 
 export const saferpayHandler = async (request, response) => {
   const resolvedContext = request.unchainedContext as Context & {
@@ -46,6 +46,9 @@ export const saferpayHandler = async (request, response) => {
         transactionId,
       },
     });
+
+    if (!order) throw new Error(`Order with id ${orderPayment.orderId} not found`);
+
     logger.info(`checkout successful`, {
       orderPaymentId,
       orderId: order._id,