cabloy 5.1.127 → 5.1.128

package/vona/src/suite-vendor/a-pay/modules/pay-paypal/src/lib/paypalGateway.ts

@@ -0,0 +1,129 @@
+import {
+  Client,
+  Environment,
+  OrdersController,
+  PaymentsController,
+} from '@cabloy/paypal-server-sdk';
+
+export interface IPaypalGatewayOptions {
+  environment: 'sandbox' | 'live';
+  clientId: string;
+  clientSecret: string;
+  webhookId: string;
+}
+
+export interface IPaypalGateway {
+  createOrder(options: IPaypalGatewayOptions, input: unknown): Promise<unknown>;
+  captureOrder(options: IPaypalGatewayOptions, input: unknown): Promise<unknown>;
+  getOrder(options: IPaypalGatewayOptions, input: unknown): Promise<unknown>;
+  refundCapturedPayment(options: IPaypalGatewayOptions, input: unknown): Promise<unknown>;
+  getRefund(options: IPaypalGatewayOptions, input: unknown): Promise<unknown>;
+  verifyWebhookSignature(
+    options: IPaypalGatewayOptions,
+    input: { headers: Record<string, string | string[] | undefined>; body: unknown },
+  ): Promise<void>;
+}
+
+export class PaypalGatewayError extends Error {
+  constructor(
+    readonly status: number,
+    message: string,
+  ) {
+    super(message);
+  }
+}
+
+export function createPaypalGateway(fetcher: typeof fetch): IPaypalGateway {
+  return {
+    async createOrder(options, input) {
+      return (await new OrdersController(createClient(options)).createOrder(input as never)).result;
+    },
+    async captureOrder(options, input) {
+      return (await new OrdersController(createClient(options)).captureOrder(input as never))
+        .result;
+    },
+    async getOrder(options, input) {
+      return (await new OrdersController(createClient(options)).getOrder(input as never)).result;
+    },
+    async refundCapturedPayment(options, input) {
+      return (
+        await new PaymentsController(createClient(options)).refundCapturedPayment(input as never)
+      ).result;
+    },
+    async getRefund(options, input) {
+      return (await new PaymentsController(createClient(options)).getRefund(input as never)).result;
+    },
+    async verifyWebhookSignature(options, input) {
+      const transmissionId = getHeader(input.headers, 'paypal-transmission-id');
+      const transmissionTime = getHeader(input.headers, 'paypal-transmission-time');
+      const certUrl = getHeader(input.headers, 'paypal-cert-url');
+      const authAlgo = getHeader(input.headers, 'paypal-auth-algo');
+      const transmissionSig = getHeader(input.headers, 'paypal-transmission-sig');
+      if (!transmissionId || !transmissionTime || !certUrl || !authAlgo || !transmissionSig) {
+        throw new PaypalGatewayError(401, 'PayPal webhook transmission headers are invalid');
+      }
+      const apiBaseUrl =
+        options.environment === 'sandbox'
+          ? 'https://api-m.sandbox.paypal.com'
+          : 'https://api-m.paypal.com';
+      const tokenResponse = await fetcher(`${apiBaseUrl}/v1/oauth2/token`, {
+        method: 'POST',
+        headers: {
+          'authorization': `Basic ${Buffer.from(`${options.clientId}:${options.clientSecret}`).toString('base64')}`,
+          'content-type': 'application/x-www-form-urlencoded',
+        },
+        body: 'grant_type=client_credentials',
+      });
+      const token = asRecord(tokenResponse.ok ? await tokenResponse.json() : undefined);
+      const accessToken = readString(token.access_token);
+      if (!accessToken) {
+        throw new PaypalGatewayError(401, 'PayPal webhook verification authentication failed');
+      }
+      const response = await fetcher(`${apiBaseUrl}/v1/notifications/verify-webhook-signature`, {
+        method: 'POST',
+        headers: {
+          'authorization': `Bearer ${accessToken}`,
+          'content-type': 'application/json',
+        },
+        body: JSON.stringify({
+          auth_algo: authAlgo,
+          cert_url: certUrl,
+          transmission_id: transmissionId,
+          transmission_sig: transmissionSig,
+          transmission_time: transmissionTime,
+          webhook_id: options.webhookId,
+          webhook_event: input.body,
+        }),
+      });
+      if (!response.ok) throw new PaypalGatewayError(401, 'PayPal webhook verification failed');
+      const result = asRecord(await response.json());
+      if (readString(result.verification_status) !== 'SUCCESS') {
+        throw new PaypalGatewayError(401, 'PayPal webhook signature is invalid');
+      }
+    },
+  };
+}
+
+function createClient(options: IPaypalGatewayOptions) {
+  return new Client({
+    clientCredentialsAuthCredentials: {
+      oAuthClientId: options.clientId,
+      oAuthClientSecret: options.clientSecret,
+    },
+    timeout: 0,
+    environment: options.environment === 'live' ? Environment.Production : Environment.Sandbox,
+  });
+}
+
+function asRecord(value: unknown): Record<string, unknown> {
+  return value && typeof value === 'object' ? (value as Record<string, unknown>) : {};
+}
+
+function readString(value: unknown): string | undefined {
+  return typeof value === 'string' && value ? value : undefined;
+}
+
+function getHeader(headers: Record<string, string | string[] | undefined>, key: string) {
+  const value = headers[key];
+  return Array.isArray(value) ? value[0] : value;
+}

package/vona/src/suite-vendor/a-pay/modules/pay-paypal/src/types/index.ts

@@ -3,6 +3,8 @@ declare module 'vona' {
     PAYPAL_CLIENT_ID: string | undefined;
     PAYPAL_CLIENT_SECRET: string | undefined;
     PAYPAL_WEBHOOK_ID: string | undefined;
+    PAYPAL_MERCHANT_REFERENCE: string | undefined;
+    PAYPAL_ENVIRONMENT: 'sandbox' | 'live';
   }
 }
 

package/vona/src/suite-vendor/a-pay/modules/pay-stripe/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-pay-stripe",
-  "version": "5.0.3",
+  "version": "5.0.4",
   "description": "",
   "keywords": [
     "Vona Module"

package/vona/src/suite-vendor/a-pay/modules/pay-stripe/src/bean/payProvider.stripe.ts

@@ -59,6 +59,13 @@ export class PayProviderStripe
     this.app.throw(501, 'Stripe provider is not implemented');
   }
 
+  async confirmPayment(
+    _input: IPayProviderPaymentInput,
+    _clientOptions: IPayProviderStripeClientOptions,
+  ): Promise<IPayProviderPaymentSnapshot> {
+    this.app.throw(501, 'Stripe provider is not implemented');
+  }
+
   async queryPayment(
     _input: IPayProviderPaymentInput,
     _clientOptions: IPayProviderStripeClientOptions,

package/vona/src/suite-vendor/a-pay/package.json

@@ -1,15 +1,15 @@
 {
   "name": "vona-suite-a-pay",
-  "version": "5.0.3",
+  "version": "5.0.4",
   "description": "",
   "author": "",
   "files": [],
   "type": "module",
   "dependencies": {
-    "vona-module-a-pay": "^5.0.3",
-    "vona-module-pay-mock": "^5.0.3",
-    "vona-module-pay-paypal": "^5.0.3",
-    "vona-module-pay-stripe": "^5.0.3"
+    "vona-module-a-pay": "^5.0.4",
+    "vona-module-pay-mock": "^5.0.4",
+    "vona-module-pay-paypal": "^5.0.4",
+    "vona-module-pay-stripe": "^5.0.4"
   },
   "title": "a-pay"
 }

package/vona/src/suite-vendor/a-vona/modules/a-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-core",
-  "version": "5.1.48",
+  "version": "5.1.49",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-vona/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-suite-a-vona",
-  "version": "5.1.77",
+  "version": "5.1.78",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "author": "",

package/zova/packages-cli/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-cli",
-  "version": "1.2.101",
+  "version": "1.2.102",
   "gitHead": "6f675a8cc46d596142c591c28a40cc4d82fcc6cc",
   "description": "zova cli",
   "keywords": [
@@ -40,11 +40,11 @@
     "postpack": "clean-package restore"
   },
   "dependencies": {
-    "@cabloy/cli": "^3.1.28",
+    "@cabloy/cli": "^3.1.29",
     "@cabloy/process-helper": "^3.1.8",
     "fs-extra": "^11.3.5",
     "semver": "^7.6.2",
-    "zova-cli-set-front": "^1.2.99"
+    "zova-cli-set-front": "^1.2.100"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/packages-cli/cli-set-front/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-cli-set-front",
-  "version": "1.2.99",
+  "version": "1.2.100",
   "gitHead": "6f675a8cc46d596142c591c28a40cc4d82fcc6cc",
   "description": "zova cli-set-front",
   "keywords": [
@@ -41,11 +41,11 @@
     "@babel/plugin-proposal-decorators": "^7.29.0",
     "@babel/plugin-transform-class-properties": "^7.28.6",
     "@babel/plugin-transform-typescript": "^7.28.6",
-    "@cabloy/cli": "^3.1.28",
+    "@cabloy/cli": "^3.1.29",
     "@cabloy/extend": "^3.2.8",
     "@cabloy/module-info": "^2.0.3",
     "@cabloy/openapi-typescript": "^7.9.2",
-    "@cabloy/utils": "^2.1.26",
+    "@cabloy/utils": "^2.1.27",
     "@cabloy/vite-plugin-babel": "^1.3.3",
     "@cabloy/vue-babel-plugin-jsx": "^2.0.1",
     "@cabloy/word-utils": "^2.1.14",
@@ -70,7 +70,7 @@
     "vite": "^8.0.14",
     "yaml": "^2.8.3",
     "zova-openapi": "^1.1.17",
-    "zova-vite": "^1.1.43"
+    "zova-vite": "^1.1.44"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/packages-utils/zova-jsx/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-jsx",
-  "version": "1.1.81",
+  "version": "1.1.82",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "Zova JSX",
   "keywords": [
@@ -46,11 +46,11 @@
   },
   "dependencies": {
     "@cabloy/compose": "^2.1.9",
-    "@cabloy/utils": "^2.1.26",
+    "@cabloy/utils": "^2.1.27",
     "@cabloy/word-utils": "^2.1.14",
     "typestyle": "^2.4.0",
     "vue": "^3.5.38",
-    "zova-core": "^5.1.81"
+    "zova-core": "^5.1.82"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/packages-utils/zova-vite/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-vite",
-  "version": "1.1.43",
+  "version": "1.1.44",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "zova vite",
   "keywords": [
@@ -42,7 +42,7 @@
     "@babel/plugin-transform-typescript": "^7.28.6",
     "@cabloy/dotenv": "^1.2.8",
     "@cabloy/extend": "^3.2.8",
-    "@cabloy/module-glob": "^5.3.17",
+    "@cabloy/module-glob": "^5.3.18",
     "@cabloy/module-info": "^2.0.3",
     "@cabloy/vite-plugin-babel": "^1.3.3",
     "@cabloy/vue-babel-plugin-jsx": "^2.0.1",

package/zova/packages-zova/zova/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova",
-  "version": "5.1.144",
+  "version": "5.1.145",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A vue3 framework with ioc",
   "keywords": [
@@ -45,8 +45,8 @@
     "postpack": "clean-package restore"
   },
   "dependencies": {
-    "zova-core": "^5.1.81",
-    "zova-suite-a-zova": "^5.1.143"
+    "zova-core": "^5.1.82",
+    "zova-suite-a-zova": "^5.1.144"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/packages-zova/zova-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-core",
-  "version": "5.1.81",
+  "version": "5.1.82",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A vue3 framework with ioc",
   "keywords": [
@@ -52,7 +52,7 @@
     "@cabloy/localeutil": "^2.1.8",
     "@cabloy/logger": "^1.1.24",
     "@cabloy/module-info": "^2.0.3",
-    "@cabloy/utils": "^2.1.26",
+    "@cabloy/utils": "^2.1.27",
     "@cabloy/vue-compiler-sfc": "^3.5.14",
     "@cabloy/vue-reactivity": "^3.5.16",
     "@cabloy/vue-router": "^4.4.16",

package/zova/src/suite/a-commerce/modules/commerce-member/src/api/openapi/schemas.ts

@@ -117,6 +117,14 @@ export type ApiSchemaCommerceTradeDtoCartUpdateItem =
   components['schemas']['commerce-trade.dto.cartUpdateItem'];
 export type ApiSchemaCommerceTradeDtoCartUpdateItemPartial =
   Partial<ApiSchemaCommerceTradeDtoCartUpdateItem>;
+export type ApiSchemaCommerceTradeDtoCheckoutPaymentMethods =
+  components['schemas']['commerce-trade.dto.checkoutPaymentMethods'];
+export type ApiSchemaCommerceTradeDtoCheckoutPaymentMethodsPartial =
+  Partial<ApiSchemaCommerceTradeDtoCheckoutPaymentMethods>;
+export type ApiSchemaCommerceTradeDtoCheckoutPaymentMethod =
+  components['schemas']['commerce-trade.dto.checkoutPaymentMethod'];
+export type ApiSchemaCommerceTradeDtoCheckoutPaymentMethodPartial =
+  Partial<ApiSchemaCommerceTradeDtoCheckoutPaymentMethod>;
 export type ApiSchemaCommerceTradeDtoCheckoutResult =
   components['schemas']['commerce-trade.dto.checkoutResult'];
 export type ApiSchemaCommerceTradeDtoCheckoutResultPartial =

package/zova/src/suite/a-commerce/modules/commerce-member/src/api/openapi/types.ts

@@ -95,6 +95,38 @@ export interface paths {
     patch?: never;
     trace?: never;
   };
+  '/api/payment-callback/return': {
+    parameters: {
+      query?: never;
+      header?: never;
+      path?: never;
+      cookie?: never;
+    };
+    get: operations['PaymentCallback_returned'];
+    put?: never;
+    post?: never;
+    delete?: never;
+    options?: never;
+    head?: never;
+    patch?: never;
+    trace?: never;
+  };
+  '/api/payment-callback/cancel': {
+    parameters: {
+      query?: never;
+      header?: never;
+      path?: never;
+      cookie?: never;
+    };
+    get: operations['PaymentCallback_cancelled'];
+    put?: never;
+    post?: never;
+    delete?: never;
+    options?: never;
+    head?: never;
+    patch?: never;
+    trace?: never;
+  };
   '/api/payment-session/{id}/start': {
     parameters: {
       query?: never;
@@ -111,6 +143,22 @@ export interface paths {
     patch?: never;
     trace?: never;
   };
+  '/api/payment-session/{id}/reconcile': {
+    parameters: {
+      query?: never;
+      header?: never;
+      path?: never;
+      cookie?: never;
+    };
+    get?: never;
+    put?: never;
+    post: operations['PaymentSession_reconcile'];
+    delete?: never;
+    options?: never;
+    head?: never;
+    patch?: never;
+    trace?: never;
+  };
   '/api/payment-session/{id}': {
     parameters: {
       query?: never;
@@ -527,6 +575,22 @@ export interface paths {
     patch: operations['CommerceTradeCart_updateItem'];
     trace?: never;
   };
+  '/api/commerce/trade/checkout/payment-methods': {
+    parameters: {
+      query?: never;
+      header?: never;
+      path?: never;
+      cookie?: never;
+    };
+    get: operations['CommerceTradeCheckout_paymentMethods'];
+    put?: never;
+    post?: never;
+    delete?: never;
+    options?: never;
+    head?: never;
+    patch?: never;
+    trace?: never;
+  };
   '/api/commerce/trade/checkout': {
     parameters: {
       query?: never;
@@ -2652,6 +2716,16 @@ export interface components {
       /** @description Quantity */
       quantity: number;
     };
+    'commerce-trade.dto.checkoutPaymentMethods': {
+      items: components['schemas']['commerce-trade.dto.checkoutPaymentMethod'][];
+      defaultKey: string;
+    };
+    'commerce-trade.dto.checkoutPaymentMethod': {
+      key: string;
+      label: string;
+      /** @enum {string} */
+      interaction: 'redirect' | 'embedded';
+    };
     'commerce-trade.dto.checkoutResult': {
       orderId: number | string;
       paymentAttemptId: number | string;
@@ -2670,6 +2744,7 @@ export interface components {
       addressId: number | string;
       couponGrantId?: number | string | undefined;
       correlationId: string;
+      providerCandidateKey?: string | undefined;
     };
     'commerce-trade.dto.orderMineRes': {
       list: components['schemas']['commerce-trade.dto.orderSummary'][];
@@ -5219,6 +5294,56 @@ export interface operations {
       };
     };
   };
+  PaymentCallback_returned: {
+    parameters: {
+      query: {
+        state: string;
+      };
+      header?: never;
+      path?: never;
+      cookie?: never;
+    };
+    requestBody?: never;
+    responses: {
+      200: {
+        headers: {
+          [name: string]: unknown;
+        };
+        content: {
+          'application/json': {
+            code: string;
+            message: string;
+            data?: unknown;
+          };
+        };
+      };
+    };
+  };
+  PaymentCallback_cancelled: {
+    parameters: {
+      query: {
+        state: string;
+      };
+      header?: never;
+      path?: never;
+      cookie?: never;
+    };
+    requestBody?: never;
+    responses: {
+      200: {
+        headers: {
+          [name: string]: unknown;
+        };
+        content: {
+          'application/json': {
+            code: string;
+            message: string;
+            data?: unknown;
+          };
+        };
+      };
+    };
+  };
   PaymentSession_start: {
     parameters: {
       query?: never;
@@ -5245,6 +5370,32 @@ export interface operations {
     };
     authToken: true;
   };
+  PaymentSession_reconcile: {
+    parameters: {
+      query?: never;
+      header?: never;
+      path: {
+        id: number | string;
+      };
+      cookie?: never;
+    };
+    requestBody?: never;
+    responses: {
+      200: {
+        headers: {
+          [name: string]: unknown;
+        };
+        content: {
+          'application/json': {
+            code: string;
+            message: string;
+            data: components['schemas']['a-pay.dto.paymentSessionView'];
+          };
+        };
+      };
+    };
+    authToken: true;
+  };
   PaymentSession_view: {
     parameters: {
       query?: never;
@@ -6106,6 +6257,30 @@ export interface operations {
     };
     authToken: true;
   };
+  CommerceTradeCheckout_paymentMethods: {
+    parameters: {
+      query?: never;
+      header?: never;
+      path?: never;
+      cookie?: never;
+    };
+    requestBody?: never;
+    responses: {
+      200: {
+        headers: {
+          [name: string]: unknown;
+        };
+        content: {
+          'application/json': {
+            code: string;
+            message: string;
+            data: components['schemas']['commerce-trade.dto.checkoutPaymentMethods'];
+          };
+        };
+      };
+    };
+    authToken: true;
+  };
   CommerceTradeCheckout_create: {
     parameters: {
       query?: never;

package/zova/src/suite/a-commerce/modules/commerce-trade/cli/openapi.config.ts

@@ -9,6 +9,7 @@ export default function (): ZovaOpenapiConfigModule {
         'CommerceTradeCart_updateItem',
         'CommerceTradeCart_deleteItem',
         'CommerceTradeCart_clear',
+        'CommerceTradeCheckout_paymentMethods',
         'CommerceTradeCheckout_create',
         'CommerceTradeOrder_select',
         'CommerceTradeOrder_view',

package/zova/src/suite/a-commerce/modules/commerce-trade/src/api/commerceTradeCheckout.ts

@@ -6,6 +6,15 @@ import type { components, paths } from './openapi/index.js';
 
 import { OpenApiBaseURL } from './openapi/index.js';
 
+/** CommerceTradeCheckout_paymentMethods */
+export const ApiApiCommerceTradeCheckoutpaymentMethodsPath =
+  '/api/commerce/trade/checkout/payment-methods';
+export type ApiApiCommerceTradeCheckoutpaymentMethodsPath =
+  '/api/commerce/trade/checkout/payment-methods';
+export type ApiApiCommerceTradeCheckoutpaymentMethodsMethod = 'get';
+export type ApiApiCommerceTradeCheckoutpaymentMethodsResponseBody =
+  paths[ApiApiCommerceTradeCheckoutpaymentMethodsPath][ApiApiCommerceTradeCheckoutpaymentMethodsMethod]['responses']['200']['content']['application/json']['data'];
+
 /** CommerceTradeCheckout_create */
 export const ApiApiCommerceTradeCheckoutcreatePath = '/api/commerce/trade/checkout';
 export type ApiApiCommerceTradeCheckoutcreatePath = '/api/commerce/trade/checkout';
@@ -17,6 +26,13 @@ export type ApiApiCommerceTradeCheckoutcreateResponseBody =
 
 @Api()
 export class ApiCommerceTradeCheckout extends BeanApiBase {
+  paymentMethods(options?: IApiActionOptions) {
+    return this.$fetch.get<any, ApiApiCommerceTradeCheckoutpaymentMethodsResponseBody>(
+      ApiApiCommerceTradeCheckoutpaymentMethodsPath,
+      this.$configPrepare(OpenApiBaseURL(this.sys), options, true),
+    );
+  }
+
   create(body: ApiApiCommerceTradeCheckoutcreateRequestBody, options?: IApiActionOptions) {
     return this.$fetch.post<any, ApiApiCommerceTradeCheckoutcreateResponseBody>(
       ApiApiCommerceTradeCheckoutcreatePath,

package/zova/src/suite/a-commerce/modules/commerce-trade/src/api/openapi/schemas.ts

@@ -117,6 +117,14 @@ export type ApiSchemaCommerceTradeDtoCartUpdateItem =
   components['schemas']['commerce-trade.dto.cartUpdateItem'];
 export type ApiSchemaCommerceTradeDtoCartUpdateItemPartial =
   Partial<ApiSchemaCommerceTradeDtoCartUpdateItem>;
+export type ApiSchemaCommerceTradeDtoCheckoutPaymentMethods =
+  components['schemas']['commerce-trade.dto.checkoutPaymentMethods'];
+export type ApiSchemaCommerceTradeDtoCheckoutPaymentMethodsPartial =
+  Partial<ApiSchemaCommerceTradeDtoCheckoutPaymentMethods>;
+export type ApiSchemaCommerceTradeDtoCheckoutPaymentMethod =
+  components['schemas']['commerce-trade.dto.checkoutPaymentMethod'];
+export type ApiSchemaCommerceTradeDtoCheckoutPaymentMethodPartial =
+  Partial<ApiSchemaCommerceTradeDtoCheckoutPaymentMethod>;
 export type ApiSchemaCommerceTradeDtoCheckoutResult =
   components['schemas']['commerce-trade.dto.checkoutResult'];
 export type ApiSchemaCommerceTradeDtoCheckoutResultPartial =