cabloy 5.1.140 → 5.1.142

package/vona/src/suite/a-commerce/modules/commerce-trade/src/dto/refundRecoveryView.tsx

@@ -62,8 +62,13 @@ export class DtoRefundRecoveryView {
   @Api.field(v.optional())
   finalizedAt?: Date;
 
-  @Api.field(z.enum(['none', 'reconcile_only', 'query_only', 'retry_same_key']))
-  recoveryDisposition: 'none' | 'reconcile_only' | 'query_only' | 'retry_same_key';
+  @Api.field(z.enum(['none', 'await_webhook', 'reconcile_only', 'query_only', 'retry_same_key']))
+  recoveryDisposition:
+    | 'none'
+    | 'await_webhook'
+    | 'reconcile_only'
+    | 'query_only'
+    | 'retry_same_key';
 
   @Api.field(v.required())
   recoveryMessage: string;

package/vona/src/suite/a-commerce/modules/commerce-trade/src/service/order.ts

@@ -880,6 +880,11 @@ export class ServiceOrder extends BeanBase {
     };
   }
 
+  private _providerSupportsRefundQuery(providerName: string, clientName: string) {
+    const { provider } = this.bean.payProvider.resolveByName(providerName, clientName);
+    return typeof provider.queryRefund === 'function';
+  }
+
   private _refundRecoveryView(
     linked: Awaited<ReturnType<typeof this.refundRecoveryLinkage>>,
   ): DtoRefundRecoveryView {
@@ -893,7 +898,14 @@ export class ServiceOrder extends BeanBase {
       hasUnresolvedReconciliation,
     } = linked;
     const canQuery = Boolean(
-      refundOperation.providerRefundId && providerOperation.state !== 'succeeded',
+      refundOperation.providerRefundId &&
+      providerOperation.state !== 'succeeded' &&
+      this._providerSupportsRefundQuery(paymentSession.providerName, paymentSession.clientName),
+    );
+    const canAwaitWebhook = Boolean(
+      refundOperation.providerRefundId &&
+      providerOperation.state !== 'succeeded' &&
+      !this._providerSupportsRefundQuery(paymentSession.providerName, paymentSession.clientName),
     );
     const canRetry =
       !refundOperation.providerRefundId &&
@@ -909,21 +921,25 @@ export class ServiceOrder extends BeanBase {
       providerOperation.errorCode === 'refund_submission_outcome_unknown' &&
       Boolean(providerOperation.submittedAt) &&
       !hasUnresolvedReconciliation;
-    const recoveryDisposition = canQuery
-      ? 'query_only'
-      : canRetry
-        ? 'retry_same_key'
-        : canReconcile
-          ? 'reconcile_only'
-          : 'none';
+    const recoveryDisposition = canAwaitWebhook
+      ? 'await_webhook'
+      : canQuery
+        ? 'query_only'
+        : canRetry
+          ? 'retry_same_key'
+          : canReconcile
+            ? 'reconcile_only'
+            : 'none';
     const recoveryMessage =
-      recoveryDisposition === 'query_only'
-        ? 'A verified provider refund identifier is available. Reconcile without resubmitting.'
-        : recoveryDisposition === 'reconcile_only'
-          ? 'Provider refund outcome is unknown. Record reconciliation before considering a retry.'
-          : recoveryDisposition === 'retry_same_key'
-            ? 'Reconciliation was unresolved. A single acknowledged retry may reuse the original provider request.'
-            : 'No provider refund submission is available. Do not create or manually declare a replacement refund.';
+      recoveryDisposition === 'await_webhook'
+        ? 'A provider refund identifier is available. Wait for the verified provider webhook; do not resubmit or reconcile by querying.'
+        : recoveryDisposition === 'query_only'
+          ? 'A verified provider refund identifier is available. Reconcile without resubmitting.'
+          : recoveryDisposition === 'reconcile_only'
+            ? 'Provider refund outcome is unknown. Record reconciliation before considering a retry.'
+            : recoveryDisposition === 'retry_same_key'
+              ? 'Reconciliation was unresolved. A single acknowledged retry may reuse the original provider request.'
+              : 'No provider refund submission is available. Do not create or manually declare a replacement refund.';
     return {
       orderId: order.id,
       refundRequestId: refundRequest.id,

package/vona/src/suite/a-home/modules/home-user/package.json

@@ -53,6 +53,7 @@
       "a-mail": "5.0.0",
       "a-ratelimit": "5.0.0",
       "a-redlock": "5.0.0",
+      "a-ssr": "5.0.0",
       "a-vona": "5.0.0",
       "auth-simple": "5.0.0"
     }

package/vona/src/suite/a-home/modules/home-user/src/service/account.ts

@@ -217,7 +217,11 @@ export class ServiceAccount extends BeanBase {
       const link = this._getActivationLinkWithToken(consumerLink, rawToken);
       await this.bean.mail.send({
         to: currentUser.email,
-        subject: this.scope.locale.ActivationEmailSubject(),
+        subject: replaceTemplate(this.scope.locale.ActivationEmailSubject(), {
+          userName: currentUser.name,
+          link,
+          siteName: this.ctx.instance.title || this.app.meta.env.APP_TITLE,
+        }),
         text: replaceTemplate(this.scope.locale.ActivationEmailBody(), {
           userName: currentUser.name,
           link,
@@ -559,12 +563,21 @@ export class ServiceAccount extends BeanBase {
 
   private _getActivationLink(consumerUrl: string): URL {
     const url = this._getConsumerLink(consumerUrl, 'activation');
-    if (url.pathname !== activationConsumerPath) {
+    if (!this._isActivationConsumerPath(url.pathname)) {
       this.app.throw(503, 'account activation consumer URL is invalid');
     }
     return url;
   }
 
+  private _isActivationConsumerPath(pathname: string) {
+    if (pathname === activationConsumerPath) return true;
+    const sites = this.app.scope('a-ssr').service.ssr.getSitesEnabled();
+    return sites.some(site => {
+      const publicPath = String(site.beanOptions.options?.publicPath ?? '');
+      return publicPath && pathname === `/${publicPath}${activationConsumerPath}`;
+    });
+  }
+
   private _getPasswordSetLink(consumerUrl: string): URL {
     return this._getConsumerLink(consumerUrl, 'password-set');
   }

package/vona/src/suite/a-home/modules/home-user/test/accountActivation.test.ts

@@ -5,6 +5,7 @@ import { acquireTestLock, app } from 'vona-mock';
 
 const activationConsumePath = '/home/user/account/activation/consume';
 const activationConsumerUrl = 'https://account.example.test/home/user/activation';
+const activationConsumerUrlAdmin = 'https://account.example.test/admin/home/user/activation';
 
 describe('accountActivation.test.ts', { concurrency: false, sequential: true }, () => {
   const releases: Array<() => void> = [];
@@ -73,6 +74,26 @@ describe('accountActivation.test.ts', { concurrency: false, sequential: true },
     }
   });
 
+  it('preserves an enabled SSR site public path in activation links', async () => {
+    let fixture: IFixture | undefined;
+    let restoreSites: (() => void) | undefined;
+    try {
+      fixture = await createFixture();
+      restoreSites = configureAdminSsrSite();
+      const issued = await issueActivationLink(fixture, activationConsumerUrlAdmin);
+      assert.equal(issued.path, '/admin/home/user/activation');
+      assert.deepEqual(await getActivationState(getDigest(issued.token)), {
+        purpose: 'account-activation',
+        userId: fixture.userId,
+        consumerPath: '/home/user/activation',
+        email: fixture.email,
+      });
+    } finally {
+      restoreSites?.();
+      if (fixture) await removeFixture(fixture);
+    }
+  });
+
   it('issues an activation link through registration and activates the registered user', async () => {
     let registration: IRegistration | undefined;
     try {
@@ -175,6 +196,17 @@ interface IRegistration extends IFixture {
   path: string;
 }
 
+function configureAdminSsrSite() {
+  const service = app.scope('a-ssr').service.ssr;
+  const getSitesEnabled = service.getSitesEnabled;
+  service.getSitesEnabled = (() => [
+    { beanOptions: { options: { publicPath: 'admin' } } },
+  ]) as typeof service.getSitesEnabled;
+  return () => {
+    service.getSitesEnabled = getSitesEnabled;
+  };
+}
+
 async function configureActivation() {
   return await app.bean.executor.mockCtx(async () => {
     const options =
@@ -288,7 +320,7 @@ async function removeFixture(fixture: IFixture) {
   });
 }
 
-async function issueActivationLink(fixture: IFixture) {
+async function issueActivationLink(fixture: IFixture, consumerUrl = activationConsumerUrl) {
   let text: unknown;
   const mail = app.bean.mail;
   const send = mail.send;
@@ -297,9 +329,7 @@ async function issueActivationLink(fixture: IFixture) {
   };
   try {
     await app.bean.executor.mockCtx(async () => {
-      await app
-        .scope('home-user')
-        .service.account.issueActivationLink(fixture.userId, activationConsumerUrl);
+      await app.scope('home-user').service.account.issueActivationLink(fixture.userId, consumerUrl);
     });
   } finally {
     mail.send = send;

package/vona/src/suite-vendor/a-cabloy/modules/a-markdown/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-markdown",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "description": "",
   "keywords": [
     "Vona Module"
@@ -58,6 +58,7 @@
   "title": "a-markdown",
   "vonaModule": {
     "dependencies": {
+      "a-image": "5.0.0",
       "a-vona": "5.0.0"
     }
   }

package/vona/src/suite-vendor/a-cabloy/modules/a-markdown/src/.metadata/index.ts

@@ -1,4 +1,30 @@
 // eslint-disable
+/** imageScene: begin */
+export * from '../bean/imageScene.markdown.ts';
+
+import { type IDecoratorImageSceneOptions } from 'vona-module-a-image';
+declare module 'vona-module-a-image' {
+
+    export interface IImageSceneRecord {
+      'a-markdown:markdown': IDecoratorImageSceneOptions;
+    }
+
+
+}
+declare module 'vona-module-a-markdown' {
+
+        export interface ImageSceneMarkdown {
+          /** @internal */
+          get scope(): ScopeModuleAMarkdown;
+        }
+
+          export interface ImageSceneMarkdown {
+            get $beanFullName(): 'a-markdown.imageScene.markdown';
+            get $onionName(): 'a-markdown:markdown';
+            get $onionOptions(): IDecoratorImageSceneOptions;
+          }
+}
+/** imageScene: end */
 /** bean: begin */
 export * from '../bean/bean.markdown.ts';
 

package/vona/src/suite-vendor/a-cabloy/modules/a-markdown/src/bean/imageScene.markdown.ts

@@ -0,0 +1,13 @@
+import { BeanBase } from 'vona';
+import { ImageScene } from 'vona-module-a-image';
+
+@ImageScene({
+  public: true,
+  upload: {
+    maxSize: 5 * 1024 * 1024,
+    mimeTypes: ['image/jpeg', 'image/png', 'image/webp'],
+    extensions: ['.jpg', '.jpeg', '.png', '.webp'],
+    multiple: false,
+  },
+})
+export class ImageSceneMarkdown extends BeanBase {}

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-suite-a-cabloy",
-  "version": "5.1.45",
+  "version": "5.1.46",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "author": "",
@@ -8,7 +8,7 @@
   "type": "module",
   "dependencies": {
     "vona-module-a-cabloy": "workspace:^",
-    "vona-module-a-markdown": "^5.0.1",
+    "vona-module-a-markdown": "^5.0.2",
     "vona-module-a-rbac": "^5.0.1",
     "vona-module-a-socket": "workspace:^",
     "vona-module-a-ssr": "workspace:^",

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-pay",
-  "version": "5.0.7",
+  "version": "5.0.8",
   "description": "",
   "keywords": [
     "Vona Module"

package/vona/src/suite-vendor/a-pay/modules/a-pay/src/service/providerOperation.ts

@@ -302,6 +302,29 @@ export class ServiceProviderOperation extends BeanBase {
       operation.kind === 'refund' && operation.refundOperationId
         ? await this.scope.model.refundOperation.getByIdForUpdate(operation.refundOperationId)
         : undefined;
+    if (operation.kind === 'refund' && refund?.providerRefundId) {
+      const session = await this.scope.model.paymentSession.getById(operation.paymentSessionId);
+      if (!session) this.app.throw(404, 'payment session not found');
+      const { provider } = this.bean.payProvider.resolveByName(
+        session.providerName,
+        session.clientName,
+      );
+      if (!provider.queryRefund) {
+        if (operation.nextAttemptAt) {
+          await this.scope.model.providerOperation.updateById(operation.id, {
+            nextAttemptAt: undefined,
+          });
+        }
+        return undefined;
+      }
+    }
+    if (
+      operation.kind === 'refund' &&
+      refund &&
+      ['succeeded', 'failed', 'cancelled'].includes(refund.state)
+    ) {
+      return undefined;
+    }
     if (
       operation.kind === 'refund' &&
       operation.submittedAt &&

package/vona/src/suite-vendor/a-pay/modules/a-pay/src/service/refundOperation.ts

@@ -203,6 +203,13 @@ export class ServiceRefundOperation extends BeanBase {
         amountMinor: refund.amountMinor,
         currency: refund.currency,
       });
+      const providerOperation = await this.scope.model.providerOperation.getForUpdate({
+        refundOperationId: refund.id,
+        kind: 'refund',
+      });
+      if (providerOperation) {
+        await this._completeProviderOperation(providerOperation, options.providerRefundId);
+      }
     }
     return {
       refund: {

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-pay-mock",
-  "version": "5.0.7",
+  "version": "5.0.8",
   "description": "",
   "keywords": [
     "Vona Module"

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-pay-paypal",
-  "version": "5.0.7",
+  "version": "5.0.8",
   "description": "",
   "keywords": [
     "Vona Module"

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

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

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

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

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-jsx",
-  "version": "1.1.86",
+  "version": "1.1.87",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "Zova JSX",
   "keywords": [
@@ -50,7 +50,7 @@
     "@cabloy/word-utils": "^2.1.14",
     "typestyle": "^2.4.0",
     "vue": "^3.5.38",
-    "zova-core": "^5.1.86"
+    "zova-core": "^5.1.87"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

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

@@ -1,6 +1,6 @@
 {
   "name": "zova",
-  "version": "5.1.150",
+  "version": "5.1.152",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A vue3 framework with ioc",
   "keywords": [
@@ -45,8 +45,8 @@
     "postpack": "clean-package restore"
   },
   "dependencies": {
-    "zova-core": "^5.1.86",
-    "zova-suite-a-zova": "^5.1.149"
+    "zova-core": "^5.1.87",
+    "zova-suite-a-zova": "^5.1.151"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-core",
-  "version": "5.1.86",
+  "version": "5.1.87",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A vue3 framework with ioc",
   "keywords": [

package/zova/packages-zova/zova-core/src/bean/resource/locale/type.ts

@@ -1,4 +1,5 @@
 export const LocaleModuleNameSeparator = '::';
+export const LocalePattern = '[a-z]{2}-[a-z]{2}|[a-z]{2}';
 
 export interface IModuleLocale {
   (...args: any[]): string;