cabloy 5.1.155 → 5.1.156

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-suite-a-cabloy",
-  "version": "5.1.48",
+  "version": "5.1.49",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "author": "",
@@ -9,7 +9,7 @@
   "dependencies": {
     "vona-module-a-cabloy": "workspace:^",
     "vona-module-a-markdown": "^5.0.3",
-    "vona-module-a-rbac": "^5.0.2",
+    "vona-module-a-rbac": "^5.0.3",
     "vona-module-a-socket": "workspace:^",
     "vona-module-a-ssr": "workspace:^",
     "vona-module-a-ssrhmr": "workspace:^"

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

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

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-permission",
-  "version": "5.1.18",
+  "version": "5.1.19",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-queue",
-  "version": "5.1.15",
+  "version": "5.1.16",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-queue/src/lib/beanQueueBase.ts

@@ -11,7 +11,7 @@ export class BeanQueueBase<DATA = unknown, RESULT = unknown> extends BeanBase {
     );
   }
 
-  push(data: DATA, options?: IQueuePushOptions) {
+  push(data: DATA, options?: IQueuePushOptions): Promise<void> {
     return this.$scope.queue.service.queue.push(
       this.$scope.queue.service.queue.prepareJobInfo(this.$onionName as any, data, options),
     );

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

@@ -24,9 +24,9 @@ export class ServiceQueue extends BeanBase {
   _queues: IQueueQueues = {};
   _queueCallbacks: IQueueCallbacks = {};
 
-  push<DATA>(info: IQueueJobContext<DATA>) {
+  push<DATA>(info: IQueueJobContext<DATA>): Promise<void> {
     if (!info.options?.dbInfo) throw new Error('should specify the options.dbInfo');
-    this._queuePush(info, false);
+    return this._queuePush(info, false);
   }
 
   // { locale, instanceName, module, queueName,queueNameSub,data }

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-user",
-  "version": "5.1.24",
+  "version": "5.1.25",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

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

@@ -174,6 +174,7 @@ export interface IModuleCacheRedis {
 export * from '../bean/event.activate.ts';
 export * from '../bean/event.createAnonymous.ts';
 export * from '../bean/event.register.ts';
+export * from '../bean/event.roleMembershipChanged.ts';
 export * from '../bean/event.signin.ts';
 export * from '../bean/event.signout.ts';
 
@@ -214,6 +215,16 @@ declare module 'vona-module-a-user' {
             get $onionName(): 'a-user:register';
           }
 
+        export interface EventRoleMembershipChanged {
+          /** @internal */
+          get scope(): ScopeModuleAUser;
+        }
+
+          export interface EventRoleMembershipChanged {
+            get $beanFullName(): 'a-user.event.roleMembershipChanged';
+            get $onionName(): 'a-user:roleMembershipChanged';
+          }
+
         export interface EventSignin {
           /** @internal */
           get scope(): ScopeModuleAUser;
@@ -239,12 +250,14 @@ declare module 'vona-module-a-user' {
 import type { EventActivate } from '../bean/event.activate.ts';
 import type { EventCreateAnonymous } from '../bean/event.createAnonymous.ts';
 import type { EventRegister } from '../bean/event.register.ts';
+import type { EventRoleMembershipChanged } from '../bean/event.roleMembershipChanged.ts';
 import type { EventSignin } from '../bean/event.signin.ts';
 import type { EventSignout } from '../bean/event.signout.ts';
 export interface IModuleEvent {
   'activate': EventActivate;
 'createAnonymous': EventCreateAnonymous;
 'register': EventRegister;
+'roleMembershipChanged': EventRoleMembershipChanged;
 'signin': EventSignin;
 'signout': EventSignout;
 }
@@ -253,6 +266,7 @@ export interface IModuleEvent {
 import type { TypeEventActivateData, TypeEventActivateResult } from '../bean/event.activate.ts';
 import type { TypeEventCreateAnonymousData, TypeEventCreateAnonymousResult } from '../bean/event.createAnonymous.ts';
 import type { TypeEventRegisterData, TypeEventRegisterResult } from '../bean/event.register.ts';
+import type { TypeEventRoleMembershipChangedData, TypeEventRoleMembershipChangedResult } from '../bean/event.roleMembershipChanged.ts';
 import type { TypeEventSigninData, TypeEventSigninResult } from '../bean/event.signin.ts';
 import type { TypeEventSignoutData, TypeEventSignoutResult } from '../bean/event.signout.ts';
 import type { EventOn } from 'vona-module-a-event';
@@ -261,6 +275,7 @@ declare module 'vona-module-a-event' {
     'a-user:activate': EventOn<TypeEventActivateData, TypeEventActivateResult>;
 'a-user:createAnonymous': EventOn<TypeEventCreateAnonymousData, TypeEventCreateAnonymousResult>;
 'a-user:register': EventOn<TypeEventRegisterData, TypeEventRegisterResult>;
+'a-user:roleMembershipChanged': EventOn<TypeEventRoleMembershipChangedData, TypeEventRoleMembershipChangedResult>;
 'a-user:signin': EventOn<TypeEventSigninData, TypeEventSigninResult>;
 'a-user:signout': EventOn<TypeEventSignoutData, TypeEventSignoutResult>;
   }

package/vona/src/suite-vendor/a-vona/modules/a-user/src/bean/bean.role.ts

@@ -2,8 +2,9 @@ import type { TableIdentity } from 'table-identity';
 
 import { BeanBase, beanFullNameFromOnionName } from 'vona';
 import { Bean } from 'vona-module-a-bean';
+import { Core } from 'vona-module-a-core';
 
-import type { IRole, IRoleAdapter } from '../types/role.ts';
+import type { IRole, IRoleAdapter, IRoleMembershipReplaceResult } from '../types/role.ts';
 
 @Bean()
 export class BeanRole extends BeanBase {
@@ -33,7 +34,47 @@ export class BeanRole extends BeanBase {
     return this.roleAdapter.findAllByUserId(userId);
   }
 
-  addUserId(id: TableIdentity, userId: TableIdentity): Promise<TableIdentity> {
-    return this.roleAdapter.addUserId(id, userId);
+  @Core.transaction()
+  async addUserId(id: TableIdentity, userId: TableIdentity): Promise<boolean> {
+    const changed = await this.roleAdapter.addUserId(id, userId);
+    if (changed) await this.emitMembershipChanged(userId, [id]);
+    return changed;
+  }
+
+  @Core.transaction()
+  async removeUserId(id: TableIdentity, userId: TableIdentity): Promise<boolean> {
+    const changed = await this.roleAdapter.removeUserId(id, userId);
+    if (changed) await this.emitMembershipChanged(userId, [id]);
+    return changed;
+  }
+
+  @Core.transaction()
+  async replaceUserRoleIds(
+    userId: TableIdentity,
+    roleIds: TableIdentity[],
+    options?: { preserveRoleIds?: TableIdentity[] },
+  ): Promise<IRoleMembershipReplaceResult> {
+    const result = await this.roleAdapter.replaceUserRoleIds(userId, roleIds, options);
+    const changedRoleIds = [...result.addedRoleIds, ...result.removedRoleIds];
+    if (changedRoleIds.length) await this.emitMembershipChanged(userId, changedRoleIds);
+    return result;
+  }
+
+  private async emitMembershipChanged(
+    userId: TableIdentity,
+    roleIds: TableIdentity[],
+  ): Promise<void> {
+    await this.scope.event.roleMembershipChanged.emit({
+      userIds: this.uniqueIds([userId]),
+      roleIds: this.uniqueIds(roleIds),
+    });
+  }
+
+  private uniqueIds(ids: TableIdentity[]): TableIdentity[] {
+    const values = new Map<string, TableIdentity>();
+    for (const id of ids) values.set(String(id), id);
+    return [...values.entries()]
+      .toSorted(([left], [right]) => left.localeCompare(right))
+      .map(([, id]) => id);
   }
 }

package/vona/src/suite-vendor/a-vona/modules/a-user/src/bean/event.roleMembershipChanged.ts

@@ -0,0 +1,16 @@
+import type { TableIdentity } from 'table-identity';
+
+import { BeanEventBase, Event } from 'vona-module-a-event';
+
+export interface TypeEventRoleMembershipChangedData {
+  userIds: TableIdentity[];
+  roleIds: TableIdentity[];
+}
+
+export type TypeEventRoleMembershipChangedResult = void;
+
+@Event()
+export class EventRoleMembershipChanged extends BeanEventBase<
+  TypeEventRoleMembershipChangedData,
+  TypeEventRoleMembershipChangedResult
+> {}

package/vona/src/suite-vendor/a-vona/modules/a-user/src/types/role.ts

@@ -18,9 +18,20 @@ export interface IRole {
   builtin?: boolean;
 }
 
+export interface IRoleMembershipReplaceResult {
+  addedRoleIds: TableIdentity[];
+  removedRoleIds: TableIdentity[];
+}
+
 export interface IRoleAdapter {
   findOneByName(name: string): Promise<IRole | undefined>;
   findOne(role: Partial<IRole>): Promise<IRole | undefined>;
   findAllByUserId(userId: TableIdentity): Promise<IRole[] | undefined>;
-  addUserId(id: TableIdentity, userId: TableIdentity): Promise<TableIdentity>;
+  addUserId(id: TableIdentity, userId: TableIdentity): Promise<boolean>;
+  removeUserId(id: TableIdentity, userId: TableIdentity): Promise<boolean>;
+  replaceUserRoleIds(
+    userId: TableIdentity,
+    roleIds: TableIdentity[],
+    options?: { preserveRoleIds?: TableIdentity[] },
+  ): Promise<IRoleMembershipReplaceResult>;
 }

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

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

package/zova/pnpm-lock.yaml

@@ -977,7 +977,7 @@ importers:
         specifier: ^5.0.1
         version: link:modules/a-rbac
       zova-module-rest-resource:
-        specifier: ^5.1.48
+        specifier: ^5.1.49
         version: link:modules/rest-resource
 
   src/suite-vendor/a-cabloy/modules/a-rbac: