@unchainedshop/plugins 2.8.8 → 2.8.11

package/lib/payment/payrexx/payrexx.js

@@ -1,5 +1,12 @@
+const getRedirects = () => {
+    const { EMAIL_WEBSITE_URL, DATATRANS_SUCCESS_PATH = '/payrexx/success', DATATRANS_ERROR_PATH = '/payrexx/error', DATATRANS_CANCEL_PATH = '/payrexx/cancel', } = process.env;
+    return {
+        successRedirectUrl: `${EMAIL_WEBSITE_URL}${DATATRANS_SUCCESS_PATH}`,
+        failedRedirectUrl: `${EMAIL_WEBSITE_URL}${DATATRANS_ERROR_PATH}`,
+        cancelRedirectUrl: `${EMAIL_WEBSITE_URL}${DATATRANS_CANCEL_PATH}`,
+    };
+};
 export const mapOrderDataToGatewayObject = ({ order, orderPayment, pricing }, options = {}) => {
-    const { EMAIL_WEBSITE_NAME = 'Unchained', EMAIL_WEBSITE_URL, DATATRANS_SUCCESS_PATH = '/payrexx/success', DATATRANS_ERROR_PATH = '/payrexx/error', DATATRANS_CANCEL_PATH = '/payrexx/cancel', } = process.env;
     const { currency, amount } = pricing.total({ useNetPrice: false });
     const customerData = {};
     if (order.contact?.emailAddress) {
@@ -14,17 +21,33 @@ export const mapOrderDataToGatewayObject = ({ order, orderPayment, pricing }, op
     const gatewayObject = {
         amount: Math.round(amount),
         currency: currency.toUpperCase(),
-        purpose: encodeURIComponent(`${EMAIL_WEBSITE_NAME} #${order._id}`),
-        // preAuthorization: true -> tokenization!
+        purpose: encodeURIComponent(`${process.env.EMAIL_WEBSITE_NAME || 'Unchained'} #${order._id}`),
         reservation: true,
         skipResultPage: true,
-        successRedirectUrl: `${EMAIL_WEBSITE_URL}${DATATRANS_SUCCESS_PATH}`,
-        failedRedirectUrl: `${EMAIL_WEBSITE_URL}${DATATRANS_ERROR_PATH}`,
-        cancelRedirectUrl: `${EMAIL_WEBSITE_URL}${DATATRANS_CANCEL_PATH}`,
+        ...getRedirects(),
         referenceId: orderPayment._id,
         ...customerData,
         ...options,
     };
     return gatewayObject;
 };
+export const mapUserToGatewayObject = ({ userId, emailAddress, currencyCode }, options = {}) => {
+    const customerData = {};
+    if (emailAddress) {
+        customerData['fields[email][value]'] = emailAddress;
+    }
+    customerData['fields[custom_field_1][name][0]'] = 'userId';
+    customerData['fields[custom_field_1][value]'] = userId;
+    const gatewayObject = {
+        amount: Math.round(0),
+        currency: currencyCode,
+        purpose: encodeURIComponent(`${process.env.EMAIL_WEBSITE_NAME || 'Unchained'} ${userId}`),
+        preAuthorization: true,
+        skipResultPage: true,
+        ...getRedirects(),
+        referenceId: userId,
+        ...options,
+    };
+    return gatewayObject;
+};
 //# sourceMappingURL=payrexx.js.map

package/lib/payment/payrexx/payrexx.js.map

@@ -1 +1 @@
-{"version":3,"file":"payrexx.js","sourceRoot":"","sources":["../../../src/payment/payrexx/payrexx.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,EAAE,OAAO,GAAG,EAAE,EAAE,EAAE;IAC5F,MAAM,EACJ,kBAAkB,GAAG,WAAW,EAChC,iBAAiB,EACjB,sBAAsB,GAAG,kBAAkB,EAC3C,oBAAoB,GAAG,gBAAgB,EACvC,qBAAqB,GAAG,iBAAiB,GAC1C,GAAG,OAAO,CAAC,GAAG,CAAC;IAEhB,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC;IAEnE,MAAM,YAAY,GAAG,EAAE,CAAC;IACxB,IAAI,KAAK,CAAC,OAAO,EAAE,YAAY,EAAE,CAAC;QAChC,YAAY,CAAC,sBAAsB,CAAC,GAAG,KAAK,CAAC,OAAO,EAAE,YAAY,CAAC;IACrE,CAAC;IACD,IAAI,KAAK,CAAC,cAAc,EAAE,SAAS,EAAE,CAAC;QACpC,YAAY,CAAC,yBAAyB,CAAC,GAAG,KAAK,CAAC,cAAc,EAAE,SAAS,CAAC;IAC5E,CAAC;IACD,IAAI,KAAK,CAAC,cAAc,EAAE,QAAQ,EAAE,CAAC;QACnC,YAAY,CAAC,wBAAwB,CAAC,GAAG,KAAK,CAAC,cAAc,EAAE,QAAQ,CAAC;IAC1E,CAAC;IAED,MAAM,aAAa,GAAG;QACpB,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;QAC1B,QAAQ,EAAE,QAAQ,CAAC,WAAW,EAAE;QAChC,OAAO,EAAE,kBAAkB,CAAC,GAAG,kBAAkB,KAAK,KAAK,CAAC,GAAG,EAAE,CAAC;QAClE,0CAA0C;QAC1C,WAAW,EAAE,IAAI;QACjB,cAAc,EAAE,IAAI;QACpB,kBAAkB,EAAE,GAAG,iBAAiB,GAAG,sBAAsB,EAAE;QACnE,iBAAiB,EAAE,GAAG,iBAAiB,GAAG,oBAAoB,EAAE;QAChE,iBAAiB,EAAE,GAAG,iBAAiB,GAAG,qBAAqB,EAAE;QACjE,WAAW,EAAE,YAAY,CAAC,GAAG;QAC7B,GAAG,YAAY;QACf,GAAG,OAAO;KACX,CAAC;IACF,OAAO,aAAa,CAAC;AACvB,CAAC,CAAC"}
+{"version":3,"file":"payrexx.js","sourceRoot":"","sources":["../../../src/payment/payrexx/payrexx.ts"],"names":[],"mappings":"AAAA,MAAM,YAAY,GAAG,GAAG,EAAE;IACxB,MAAM,EACJ,iBAAiB,EACjB,sBAAsB,GAAG,kBAAkB,EAC3C,oBAAoB,GAAG,gBAAgB,EACvC,qBAAqB,GAAG,iBAAiB,GAC1C,GAAG,OAAO,CAAC,GAAG,CAAC;IAEhB,OAAO;QACL,kBAAkB,EAAE,GAAG,iBAAiB,GAAG,sBAAsB,EAAE;QACnE,iBAAiB,EAAE,GAAG,iBAAiB,GAAG,oBAAoB,EAAE;QAChE,iBAAiB,EAAE,GAAG,iBAAiB,GAAG,qBAAqB,EAAE;KAClE,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,EAAE,OAAO,GAAG,EAAE,EAAE,EAAE;IAC5F,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC;IAEnE,MAAM,YAAY,GAAG,EAAE,CAAC;IACxB,IAAI,KAAK,CAAC,OAAO,EAAE,YAAY,EAAE,CAAC;QAChC,YAAY,CAAC,sBAAsB,CAAC,GAAG,KAAK,CAAC,OAAO,EAAE,YAAY,CAAC;IACrE,CAAC;IACD,IAAI,KAAK,CAAC,cAAc,EAAE,SAAS,EAAE,CAAC;QACpC,YAAY,CAAC,yBAAyB,CAAC,GAAG,KAAK,CAAC,cAAc,EAAE,SAAS,CAAC;IAC5E,CAAC;IACD,IAAI,KAAK,CAAC,cAAc,EAAE,QAAQ,EAAE,CAAC;QACnC,YAAY,CAAC,wBAAwB,CAAC,GAAG,KAAK,CAAC,cAAc,EAAE,QAAQ,CAAC;IAC1E,CAAC;IAED,MAAM,aAAa,GAAG;QACpB,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;QAC1B,QAAQ,EAAE,QAAQ,CAAC,WAAW,EAAE;QAChC,OAAO,EAAE,kBAAkB,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,WAAW,KAAK,KAAK,CAAC,GAAG,EAAE,CAAC;QAC7F,WAAW,EAAE,IAAI;QACjB,cAAc,EAAE,IAAI;QACpB,GAAG,YAAY,EAAE;QACjB,WAAW,EAAE,YAAY,CAAC,GAAG;QAC7B,GAAG,YAAY;QACf,GAAG,OAAO;KACX,CAAC;IACF,OAAO,aAAa,CAAC;AACvB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,EAAE,OAAO,GAAG,EAAE,EAAE,EAAE;IAC7F,MAAM,YAAY,GAAG,EAAE,CAAC;IAExB,IAAI,YAAY,EAAE,CAAC;QACjB,YAAY,CAAC,sBAAsB,CAAC,GAAG,YAAY,CAAC;IACtD,CAAC;IAED,YAAY,CAAC,iCAAiC,CAAC,GAAG,QAAQ,CAAC;IAC3D,YAAY,CAAC,+BAA+B,CAAC,GAAG,MAAM,CAAC;IAEvD,MAAM,aAAa,GAAG;QACpB,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;QACrB,QAAQ,EAAE,YAAY;QACtB,OAAO,EAAE,kBAAkB,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,WAAW,IAAI,MAAM,EAAE,CAAC;QACzF,gBAAgB,EAAE,IAAI;QACtB,cAAc,EAAE,IAAI;QACpB,GAAG,YAAY,EAAE;QACjB,WAAW,EAAE,MAAM;QACnB,GAAG,OAAO;KACX,CAAC;IACF,OAAO,aAAa,CAAC;AACvB,CAAC,CAAC"}

package/lib/payment/postfinance-checkout/api.d.ts

@@ -1,5 +1,4 @@
 import * as pf from 'postfinancecheckout';
-declare const PostFinanceCheckout: typeof pf.PostFinanceCheckout;
 export declare const getTransaction: (transactionId: string) => Promise<pf.PostFinanceCheckout.model.Transaction>;
 export declare const getTransactionCompletion: (entityId: string) => Promise<pf.PostFinanceCheckout.model.TransactionCompletion>;
 export declare const getToken: (spaceId: number, tokenId: number) => Promise<pf.PostFinanceCheckout.model.Token>;
@@ -10,4 +9,3 @@ export declare const confirmDeferredTransaction: (transactionId: string) => Prom
 export declare const getPaymentPageUrl: (transactionId: number) => Promise<string>;
 export declare const getLightboxJavascriptUrl: (transactionId: number) => Promise<string>;
 export declare const getIframeJavascriptUrl: (transactionId: number) => Promise<string>;
-export {};

package/lib/payment/postfinance-checkout/utils.d.ts

@@ -1,6 +1,4 @@
 import { Order, OrdersModule } from '@unchainedshop/types/orders.js';
 import * as pf from 'postfinancecheckout';
-declare const PostFinanceCheckout: typeof pf.PostFinanceCheckout;
 export declare const transactionIsPaid: (transaction: pf.PostFinanceCheckout.model.Transaction, expectedCurrency: string, expectedAmount: number) => Promise<boolean>;
 export declare const orderIsPaid: (order: Order, transaction: pf.PostFinanceCheckout.model.Transaction, orderModule: OrdersModule) => Promise<boolean>;
-export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unchainedshop/plugins",
-  "version": "2.8.8",
+  "version": "2.8.11",
   "main": "lib/plugins-index.js",
   "types": "lib/plugins-index.d.ts",
   "exports": {
@@ -80,44 +80,44 @@
     "lru-cache": "^10.0.0",
     "open": "^10.0.0",
     "postfinancecheckout": "^4.1.1",
-    "stripe": "^14.20.0",
+    "stripe": "^14.25.0",
     "tiny-secp256k1": "^2.2.3",
-    "twilio": "^4.23.0",
+    "twilio": "^5.0.3",
     "web-push": "^3.6.3"
   },
   "devDependencies": {
     "@redis/client": "^1.5.14",
-    "@types/node": "^20.11.25",
-    "@unchainedshop/api": "^2.8.5",
-    "@unchainedshop/core-delivery": "^2.8.5",
-    "@unchainedshop/core-enrollments": "^2.8.5",
-    "@unchainedshop/core-filters": "^2.8.5",
-    "@unchainedshop/core-messaging": "^2.8.5",
-    "@unchainedshop/core-orders": "^2.8.5",
-    "@unchainedshop/core-payment": "^2.8.5",
-    "@unchainedshop/core-products": "^2.8.5",
-    "@unchainedshop/core-quotations": "^2.8.5",
-    "@unchainedshop/core-warehousing": "^2.8.5",
-    "@unchainedshop/core-worker": "^2.8.5",
-    "@unchainedshop/events": "^2.8.5",
-    "@unchainedshop/file-upload": "^2.8.5",
-    "@unchainedshop/logger": "^2.8.5",
-    "@unchainedshop/types": "^2.8.5",
-    "@unchainedshop/utils": "^2.8.5",
+    "@types/node": "^20.12.7",
+    "@unchainedshop/api": "^2.8.11",
+    "@unchainedshop/core-delivery": "^2.8.11",
+    "@unchainedshop/core-enrollments": "^2.8.11",
+    "@unchainedshop/core-filters": "^2.8.11",
+    "@unchainedshop/core-messaging": "^2.8.11",
+    "@unchainedshop/core-orders": "^2.8.11",
+    "@unchainedshop/core-payment": "^2.8.11",
+    "@unchainedshop/core-products": "^2.8.11",
+    "@unchainedshop/core-quotations": "^2.8.11",
+    "@unchainedshop/core-warehousing": "^2.8.11",
+    "@unchainedshop/core-worker": "^2.8.11",
+    "@unchainedshop/events": "^2.8.11",
+    "@unchainedshop/file-upload": "^2.8.11",
+    "@unchainedshop/logger": "^2.8.11",
+    "@unchainedshop/types": "^2.8.11",
+    "@unchainedshop/utils": "^2.8.11",
     "bluebird": "^3.7.2",
     "event-iterator": "^2.0.0",
-    "express": "^4.18.3",
+    "express": "^4.19.2",
     "jest": "^29.7.0",
     "JSONStream": "^1.3.5",
     "lru-cache": "^10.2.0",
     "minio": "^7.1.3",
     "node-sheets": "^1.2.0",
-    "nodemailer": "^6.9.11",
-    "open": "^10.0.4",
+    "nodemailer": "^6.9.13",
+    "open": "^10.1.0",
     "postfinancecheckout": "^4.5.0",
     "request": "^2.88.2",
     "ts-jest": "^29.1.2",
-    "typescript": "^5.3.3",
+    "typescript": "^5.4.5",
     "web-push": "^3.6.7",
     "xml-js": "^1.6.11"
   }

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

@@ -49,7 +49,7 @@ export const datatransHandler = async (req, res) => {
           const paymentCredentials = await modules.payment.registerCredentials(
             paymentProviderId,
             { userId, transactionContext: { transactionId: transaction.transactionId } },
-            { ...resolvedContext },
+            resolvedContext,
           );
           logger.info(`registered payment credentials for ${userId}`, {
             userId,

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

@@ -1,3 +1,5 @@
+import makeFetcher from './makeFetcher.js';
+
 const baseUrl = 'https://api.payrexx.com/v1.0/';
 
 export enum GatewayObjectStatus {
@@ -29,93 +31,43 @@ export type GatewayObject = {
 
 export type TransactionObject = any;
 
-const createPayrexxAPI = (instance: string, secret: string) => ({
-  async buildSignature(query = '') {
-    const key = await crypto.subtle.importKey(
-      'raw',
-      new TextEncoder().encode(secret),
-      { name: 'HMAC', hash: 'SHA-256' },
-      false,
-      ['sign', 'verify'],
-    );
-    const signature = await crypto.subtle.sign('HMAC', key, new TextEncoder().encode(query));
-    return btoa(String.fromCharCode(...new Uint8Array(signature)));
-  },
-
-  buildUrl(path, params = {}) {
-    const url = new URL(path, baseUrl);
-    url.search = new URLSearchParams({ instance, ...params }).toString();
-    return url.href;
-  },
-
-  async chargePreAuthorized(id, params) {
-    const queryParams = { ...params };
-    const signature = await this.buildSignature(new URLSearchParams(queryParams).toString());
-    queryParams.ApiSignature = signature;
-
-    const url = this.buildUrl(`Transaction/${id}/`);
-
-    const result = await fetch(url, {
-      method: 'POST',
-      body: new URLSearchParams(queryParams).toString(),
-      headers: {
-        accept: 'application/json',
-        'content-type': 'application/x-www-form-urlencoded',
-      },
-    });
-
-    if (result.ok) {
-      return result.json();
-    }
-    throw new Error(await result.text());
-  },
-
-  async deleteReservation(id) {
-    const url = this.buildUrl(`Transaction/${id}/`, { ApiSignature: await this.buildSignature() });
-    const result = await fetch(url, {
-      method: 'DELETE',
-      headers: {
-        accept: 'application/json',
-        'content-type': 'application/x-www-form-urlencoded',
-      },
-    });
-
-    if (result.ok) {
-      return result.json();
-    }
-    throw new Error(await result.text());
-  },
-
-  async getGateway(id): Promise<GatewayObject> {
-    const url = this.buildUrl(`Gateway/${id}/`, { ApiSignature: await this.buildSignature() });
-    const result = await fetch(url);
-    if (!result.ok) throw new Error(await result.text());
-    const { status, data } = await result.json();
-    if (status !== 'success') return null;
-    return data?.[0];
-  },
-
-  async createGateway(params): Promise<GatewayObject> {
-    const queryParams = { ...params };
-    const signature = await this.buildSignature(new URLSearchParams(queryParams).toString());
-    queryParams.ApiSignature = signature;
-
-    const url = this.buildUrl('Gateway/');
-    const result = await fetch(url, {
-      method: 'POST',
-      body: new URLSearchParams(queryParams).toString(),
-      headers: {
-        accept: 'application/json',
-        'content-type': 'application/x-www-form-urlencoded',
-      },
-    });
-
-    if (result.ok) {
-      return result.json();
-    }
-    throw new Error(await result.text());
-  },
-});
+const createPayrexxAPI = (instance: string, secret: string) => {
+  const fetchPayrexx = makeFetcher(baseUrl, instance, secret);
+
+  return {
+    async chargePreAuthorized(id, params) {
+      const result = await fetchPayrexx(`Transaction/${id}`, 'POST', params);
+      if (result.ok) {
+        return result.json();
+      }
+      throw new Error(await result.text());
+    },
+
+    async deleteReservation(id) {
+      const result = await fetchPayrexx(`Transaction/${id}`, 'DELETE');
+      if (result.ok) {
+        return result.json();
+      }
+      throw new Error(await result.text());
+    },
+
+    async getGateway(id): Promise<GatewayObject> {
+      const result = await fetchPayrexx(`Gateway/${id}`, 'GET');
+      if (!result.ok) throw new Error(await result.text());
+      const { status, data } = await result.json();
+      if (status !== 'success') return null;
+      return data?.[0];
+    },
+
+    async createGateway(params): Promise<GatewayObject> {
+      const result = await fetchPayrexx('Gateway', 'POST', params);
+      if (result.ok) {
+        return result.json();
+      }
+      throw new Error(await result.text());
+    },
+  };
+};
 
 export default createPayrexxAPI;
 

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

@@ -0,0 +1,87 @@
+/// <reference lib="dom" />
+import fs from 'fs';
+import util from 'util';
+import { resolve } from 'path';
+import { createLogger } from '@unchainedshop/logger';
+
+const readFile = util.promisify(fs.readFile);
+
+const { PAYREXX_API_MOCKS_PATH } = process.env;
+
+const logger = createLogger('unchained:payrexx');
+
+export default (
+  baseUrl: string = 'https://api.payrexx.com/v1.0/',
+  instance: string = null,
+  secret: string = null,
+): ((path: string, method: 'GET' | 'DELETE' | 'PUT' | 'POST', data?: any) => Promise<Response>) => {
+  if (PAYREXX_API_MOCKS_PATH) {
+    return async (path): Promise<Response> => {
+      try {
+        const filePath = resolve(process.env.PWD, PAYREXX_API_MOCKS_PATH, `${path}.json`);
+        const content = await readFile(filePath);
+        const textData = content.toString();
+        const jsonData = JSON.parse(textData);
+        return {
+          json: async () => jsonData,
+          text: async () => textData,
+          ok: !jsonData?.error,
+          status: jsonData?.error ? 500 : 204,
+        } as any;
+      } catch (error) {
+        logger.error('Mock: Error while trying reading and parsing file', {
+          ...error,
+        });
+        return {
+          json: async () => ({ error: { code: 'MOCK', message: 'MOCK' } }),
+          text: async () => 'MOCK',
+          ok: false,
+          status: 500,
+        } as any;
+      }
+    };
+  }
+
+  const buildSignature = async (query = '') => {
+    const key = await crypto.subtle.importKey(
+      'raw',
+      new TextEncoder().encode(secret),
+      { name: 'HMAC', hash: 'SHA-256' },
+      false,
+      ['sign', 'verify'],
+    );
+    const signature = await crypto.subtle.sign('HMAC', key, new TextEncoder().encode(query));
+    return btoa(String.fromCharCode(...new Uint8Array(signature)));
+  };
+
+  const buildUrl = (path, params = {}) => {
+    const url = new URL(`${path}/`, baseUrl);
+    url.search = new URLSearchParams({ instance, ...params }).toString();
+    return url.href;
+  };
+
+  return async (path: string, method: 'GET' | 'DELETE' | 'POST', data?: any): Promise<Response> => {
+    logger.verbose(`${method} ${path}`);
+    if (method === 'POST') {
+      const queryParams = { ...data };
+      const signature = await buildSignature(new URLSearchParams(queryParams).toString());
+      queryParams.ApiSignature = signature;
+      const url = buildUrl(path);
+      return fetch(url, {
+        method,
+        body: new URLSearchParams(queryParams).toString(),
+        headers: {
+          accept: 'application/json',
+          'content-type': 'application/x-www-form-urlencoded',
+        },
+      });
+    }
+    if (method === 'DELETE' || method === 'GET') {
+      const url = buildUrl(path, { ApiSignature: await buildSignature() });
+      return fetch(url, {
+        method,
+      });
+    }
+    throw new Error('Method not supported');
+  };
+};

package/src/payment/payrexx/index.ts

@@ -1,7 +1,7 @@
 import { IPaymentAdapter } from '@unchainedshop/types/payments.js';
 import { PaymentAdapter, PaymentDirector, PaymentError } from '@unchainedshop/core-payment';
 import { createLogger } from '@unchainedshop/logger';
-import { mapOrderDataToGatewayObject } from './payrexx.js';
+import { mapOrderDataToGatewayObject, mapUserToGatewayObject } from './payrexx.js';
 import createPayrexxAPI, { GatewayObjectStatus } from './api/index.js';
 
 export * from './middleware.js';
@@ -50,17 +50,10 @@ const Payrexx: IPaymentAdapter = {
         return false;
       },
 
-      validate: async () => {
-        throw new Error('Token Registration Flow not implemented yet');
-      },
-
-      register: async () => {
-        throw new Error('Token Registration Flow not implemented yet');
-      },
-
       sign: async (transactionContext = {}) => {
-        const { orderPayment, order } = params.paymentContext;
+        const { orderPayment, userId, order } = params.paymentContext;
         if (orderPayment) {
+          // Order Checkout signing (One-time payment)
           const pricing = await modules.orders.pricingSheet(order);
           const gatewayObject = mapOrderDataToGatewayObject(
             { order, orderPayment, pricing },
@@ -70,7 +63,41 @@ const Payrexx: IPaymentAdapter = {
           return JSON.stringify(gateway);
         }
 
-        throw new Error('Token Registration Flow not implemented yet');
+        // Payment Credential Registration signing
+        const user = await modules.users.findUserById(userId);
+        const emailAddress = modules.users.primaryEmail(user)?.address;
+        const gateway = await api.createGateway(
+          mapUserToGatewayObject({
+            userId,
+            emailAddress,
+            currencyCode: 'CHF',
+          }),
+        );
+        return JSON.stringify(gateway);
+      },
+
+      // async validate(credentials) {
+      //   if (!credentials.meta) return false;
+      //   const { objectKey, currency } = credentials.meta;
+      //   const result = await api().validate({
+      //     refno: Buffer.from(`valid-${new Date().getTime()}`, 'hex').toString('base64'),
+      //     currency,
+      //     [objectKey]: JSON.parse(credentials.token),
+      //   });
+      //   return Boolean((result as ValidateResponseSuccess)?.transactionId);
+      // },
+
+      async register(transactionResponse) {
+        // const { transactionId } = transactionResponse;
+        console.log({ transactionResponse });
+        throw new Error('Not implemented');
+        // const result = (await api().status({
+        //   transactionId,
+        // })) as StatusResponseSuccess;
+        // if (result.transactionId) {
+        //   return parseRegistrationData(result);
+        // }
+        return null;
       },
 
       async confirm() {
@@ -88,16 +115,22 @@ const Payrexx: IPaymentAdapter = {
         }
 
         if (
-          gatewayObject.status === GatewayObjectStatus.authorized ||
+          // gatewayObject.status === GatewayObjectStatus.authorized || // authorized is only used for tokenization!
           gatewayObject.status === GatewayObjectStatus.reserved
         ) {
           const allTransactions = gatewayObject.invoices?.flatMap((invoice) => invoice.transactions);
           await Promise.all(
-            allTransactions.map(async (transaction) => api.chargePreAuthorized(transaction.id, {})),
+            allTransactions.map(async (transaction) =>
+              api.chargePreAuthorized(transaction.id, { referenceId: '__IGNORE_WEBHOOK__' }),
+            ),
           );
           return true;
         }
-        return false;
+
+        if (gatewayObject.status === GatewayObjectStatus.confirmed) {
+          return true; // already confirmed, no need to confirm
+        }
+        return false; // some other status with refund or anything, can't confirm!
       },
 
       async cancel() {
@@ -120,7 +153,11 @@ const Payrexx: IPaymentAdapter = {
           );
           return true;
         }
-        return false;
+
+        if (gatewayObject.status === GatewayObjectStatus.confirmed) {
+          return false; // already confirmed, can't cancel anymore
+        }
+        return true; // some other status with refund or anything, no need to cancel
       },
 
       charge: async ({ gatewayId, paymentCredentials }) => {
@@ -143,24 +180,21 @@ const Payrexx: IPaymentAdapter = {
         const { currency, amount } = pricing.total({ useNetPrice: false });
 
         if (
-          gatewayObject.currency !== currency.toUpperCase() ||
-          gatewayObject.amount !== Math.round(amount)
+          // gatewayObject.status === 'authorized' || // authorized is only used for tokenization!
+          gatewayObject.status === 'reserved' ||
+          gatewayObject.status === 'confirmed'
         ) {
-          throw new Error('The price has changed since the intent has been created');
-        }
-        if (gatewayObject.referenceId !== orderPayment?._id) {
-          throw new Error('The order payment is different from the initiating intent');
-        }
+          try {
+            if (
+              gatewayObject.currency !== currency.toUpperCase() ||
+              gatewayObject.amount !== Math.round(amount)
+            ) {
+              throw new Error('The price has changed since the intent has been created');
+            }
+            if (gatewayObject.referenceId !== orderPayment?._id) {
+              throw new Error('The order payment is different from the initiating intent');
+            }
 
-        switch (gatewayObject.status) {
-          case GatewayObjectStatus.waiting:
-            logger.verbose('Charge postponed because Gateway is pending', {
-              orderPaymentId: gatewayObject.referenceId,
-            });
-            return false;
-          case GatewayObjectStatus.authorized:
-          case GatewayObjectStatus.reserved:
-          case GatewayObjectStatus.confirmed:
             // confirm will do the transition, to do a checkout those stati above are fine
             logger.verbose(`Mark as charged, status is ${gatewayObject.status}`, {
               orderPaymentId: gatewayObject.referenceId,
@@ -169,13 +203,23 @@ const Payrexx: IPaymentAdapter = {
               transactionId: gatewayId,
               gatewayObject,
             };
-          default:
-            logger.verbose('Charge not possible', {
-              orderPaymentId: gatewayObject.referenceId,
-              status: gatewayObject.status,
-            });
-            throw new Error(`Gateway Status ${gatewayObject.status} does not allow checkout`);
+          } catch (e) {
+            if (gatewayObject.status === GatewayObjectStatus.reserved) {
+              // Cancel the reservation if it's reserved and the order has been manipulated
+              const allTransactions = gatewayObject.invoices?.flatMap((invoice) => invoice.transactions);
+              await Promise.all(
+                allTransactions.map(async (transaction) => api.deleteReservation(transaction.id)),
+              );
+            }
+            throw e;
+          }
         }
+
+        logger.verbose('Charge not possible', {
+          orderPaymentId: gatewayObject.referenceId,
+          status: gatewayObject.status,
+        });
+        throw new Error(`Gateway Status ${gatewayObject.status} does not allow checkout`);
       },
     };