cabloy 5.1.136 → 5.1.138

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-telemetry",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "description": "",
   "keywords": [
     "Vona Module"

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

@@ -4,15 +4,15 @@ export * from '../bean/middlewareSystem.trace.ts';
 import type { IMiddlewareSystemOptionsTrace } from '../bean/middlewareSystem.trace.ts';
 import 'vona-module-a-aspect';
 declare module 'vona-module-a-aspect' {
-  
+
     export interface IMiddlewareSystemRecord {
       'a-telemetry:trace': IMiddlewareSystemOptionsTrace;
     }
 
-  
+
 }
 declare module 'vona-module-a-telemetry' {
-  
+
         export interface MiddlewareSystemTrace {
           /** @internal */
           get scope(): ScopeModuleATelemetry;
@@ -22,7 +22,7 @@ declare module 'vona-module-a-telemetry' {
             get $beanFullName(): 'a-telemetry.middlewareSystem.trace';
             get $onionName(): 'a-telemetry:trace';
             get $onionOptions(): IMiddlewareSystemOptionsTrace;
-          } 
+          }
 }
 /** middlewareSystem: end */
 /** bean: begin */
@@ -30,15 +30,15 @@ export * from '../bean/bean.telemetry.ts';
 
 import 'vona';
 declare module 'vona' {
-  
-  
+
+
 }
 declare module 'vona-module-a-telemetry' {
-  
+
         export interface BeanTelemetry {
           /** @internal */
           get scope(): ScopeModuleATelemetry;
-        } 
+        }
 }
 /** bean: end */
 /** bean: begin */
@@ -55,15 +55,15 @@ export * from '../service/telemetry.ts';
 
 import 'vona-module-a-bean';
 declare module 'vona-module-a-bean' {
-  
+
     export interface IServiceRecord {
       'a-telemetry:telemetry': never;
     }
 
-  
+
 }
 declare module 'vona-module-a-telemetry' {
-  
+
         export interface ServiceTelemetry {
           /** @internal */
           get scope(): ScopeModuleATelemetry;
@@ -72,8 +72,7 @@ declare module 'vona-module-a-telemetry' {
           export interface ServiceTelemetry {
             get $beanFullName(): 'a-telemetry.service.telemetry';
             get $onionName(): 'a-telemetry:telemetry';
-            
-          } 
+          }
 }
 /** service: end */
 /** service: begin */
@@ -120,13 +119,13 @@ declare module 'vona' {
   export interface IBeanScopeContainer {
     telemetry: ScopeModuleATelemetry;
   }
-  
+
   export interface IBeanScopeConfig {
     'a-telemetry': ReturnType<typeof config>;
   }
 
-  
 
-  
+
+
 }
 /** scope: end */

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

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

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

@@ -4,15 +4,15 @@ export * from '../bean/interceptor.upload.ts';
 import type { IInterceptorOptionsUpload } from '../bean/interceptor.upload.ts';
 import 'vona-module-a-aspect';
 declare module 'vona-module-a-aspect' {
-  
-  
+
+
 export interface IInterceptorRecordLocal {
   'a-upload:upload': IInterceptorOptionsUpload;
 }
 
 }
 declare module 'vona-module-a-upload' {
-  
+
         export interface InterceptorUpload {
           /** @internal */
           get scope(): ScopeModuleAUpload;
@@ -22,7 +22,7 @@ declare module 'vona-module-a-upload' {
             get $beanFullName(): 'a-upload.interceptor.upload';
             get $onionName(): 'a-upload:upload';
             get $onionOptions(): IInterceptorOptionsUpload;
-          } 
+          }
 }
 /** interceptor: end */
 /** scope: begin */
@@ -45,11 +45,11 @@ declare module 'vona' {
   export interface IBeanScopeContainer {
     upload: ScopeModuleAUpload;
   }
-  
-  
 
-  
 
-  
+
+
+
+
 }
 /** scope: end */

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

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

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

@@ -6,19 +6,19 @@ import type { IGuardOptionsPassport } from '../bean/guard.passport.ts';
 import type { IGuardOptionsRoleName } from '../bean/guard.roleName.ts';
 import 'vona-module-a-aspect';
 declare module 'vona-module-a-aspect' {
-  
+
     export interface IGuardRecordGlobal {
       'a-user:passport': IGuardOptionsPassport;
     }
 
-  
+
 export interface IGuardRecordLocal {
   'a-user:roleName': IGuardOptionsRoleName;
 }
 
 }
 declare module 'vona-module-a-user' {
-  
+
         export interface GuardPassport {
           /** @internal */
           get scope(): ScopeModuleAUser;
@@ -39,7 +39,7 @@ declare module 'vona-module-a-user' {
             get $beanFullName(): 'a-user.guard.roleName';
             get $onionName(): 'a-user:roleName';
             get $onionOptions(): IGuardOptionsRoleName;
-          } 
+          }
 }
 /** guard: end */
 /** bean: begin */
@@ -49,11 +49,11 @@ export * from '../bean/bean.user.ts';
 
 import 'vona';
 declare module 'vona' {
-  
-  
+
+
 }
 declare module 'vona-module-a-user' {
-  
+
         export interface BeanPassport {
           /** @internal */
           get scope(): ScopeModuleAUser;
@@ -67,7 +67,7 @@ declare module 'vona-module-a-user' {
         export interface BeanUser {
           /** @internal */
           get scope(): ScopeModuleAUser;
-        } 
+        }
 }
 /** bean: end */
 /** bean: begin */
@@ -89,16 +89,16 @@ export * from '../service/redisToken.ts';
 
 import 'vona-module-a-bean';
 declare module 'vona-module-a-bean' {
-  
+
     export interface IServiceRecord {
       'a-user:authTokenAdapter': never;
 'a-user:redisToken': never;
     }
 
-  
+
 }
 declare module 'vona-module-a-user' {
-  
+
         export interface ServiceAuthTokenAdapter {
           /** @internal */
           get scope(): ScopeModuleAUser;
@@ -107,7 +107,6 @@ declare module 'vona-module-a-user' {
           export interface ServiceAuthTokenAdapter {
             get $beanFullName(): 'a-user.service.authTokenAdapter';
             get $onionName(): 'a-user:authTokenAdapter';
-            
           }
 
         export interface ServiceRedisToken {
@@ -118,8 +117,7 @@ declare module 'vona-module-a-user' {
           export interface ServiceRedisToken {
             get $beanFullName(): 'a-user.service.redisToken';
             get $onionName(): 'a-user:redisToken';
-            
-          } 
+          }
 }
 /** service: end */
 /** service: begin */
@@ -145,15 +143,15 @@ export * from '../bean/cacheRedis.authToken.ts';
 
 import { type IDecoratorCacheRedisOptions } from 'vona-module-a-cache';
 declare module 'vona-module-a-cache' {
-  
+
     export interface ICacheRedisRecord {
       'a-user:authToken': IDecoratorCacheRedisOptions;
     }
 
-  
+
 }
 declare module 'vona-module-a-user' {
-  
+
         export interface CacheRedisAuthToken {
           /** @internal */
           get scope(): ScopeModuleAUser;
@@ -163,7 +161,7 @@ declare module 'vona-module-a-user' {
             get $beanFullName(): 'a-user.cacheRedis.authToken';
             get $onionName(): 'a-user:authToken';
             get $onionOptions(): IDecoratorCacheRedisOptions;
-          } 
+          }
 }
 /** cacheRedis: end */
 /** cacheRedis: begin */
@@ -181,11 +179,11 @@ export * from '../bean/event.signout.ts';
 
 import 'vona';
 declare module 'vona' {
-  
-  
+
+
 }
 declare module 'vona-module-a-user' {
-  
+
         export interface EventActivate {
           /** @internal */
           get scope(): ScopeModuleAUser;
@@ -194,7 +192,6 @@ declare module 'vona-module-a-user' {
           export interface EventActivate {
             get $beanFullName(): 'a-user.event.activate';
             get $onionName(): 'a-user:activate';
-            
           }
 
         export interface EventCreateAnonymous {
@@ -205,7 +202,6 @@ declare module 'vona-module-a-user' {
           export interface EventCreateAnonymous {
             get $beanFullName(): 'a-user.event.createAnonymous';
             get $onionName(): 'a-user:createAnonymous';
-            
           }
 
         export interface EventRegister {
@@ -216,7 +212,6 @@ declare module 'vona-module-a-user' {
           export interface EventRegister {
             get $beanFullName(): 'a-user.event.register';
             get $onionName(): 'a-user:register';
-            
           }
 
         export interface EventSignin {
@@ -227,7 +222,6 @@ declare module 'vona-module-a-user' {
           export interface EventSignin {
             get $beanFullName(): 'a-user.event.signin';
             get $onionName(): 'a-user:signin';
-            
           }
 
         export interface EventSignout {
@@ -238,8 +232,7 @@ declare module 'vona-module-a-user' {
           export interface EventSignout {
             get $beanFullName(): 'a-user.event.signout';
             get $onionName(): 'a-user:signout';
-            
-          } 
+          }
 }
 /** event: end */
 /** event: begin */
@@ -262,7 +255,7 @@ import type { TypeEventCreateAnonymousData, TypeEventCreateAnonymousResult } fro
 import type { TypeEventRegisterData, TypeEventRegisterResult } from '../bean/event.register.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'; 
+import type { EventOn } from 'vona-module-a-event';
 declare module 'vona-module-a-event' {
   export interface IEventRecord {
     'a-user:activate': EventOn<TypeEventActivateData, TypeEventActivateResult>;
@@ -279,16 +272,16 @@ export * from '../bean/meta.runtime.ts';
 
 import 'vona-module-a-meta';
 declare module 'vona-module-a-meta' {
-  
+
     export interface IMetaRecord {
       'a-user:printTip': never;
 'a-user:runtime': never;
     }
 
-  
+
 }
 declare module 'vona-module-a-user' {
-  
+
         export interface MetaPrintTip {
           /** @internal */
           get scope(): ScopeModuleAUser;
@@ -297,7 +290,6 @@ declare module 'vona-module-a-user' {
           export interface MetaPrintTip {
             get $beanFullName(): 'a-user.meta.printTip';
             get $onionName(): 'a-user:printTip';
-            
           }
 
         export interface MetaRuntime {
@@ -308,8 +300,7 @@ declare module 'vona-module-a-user' {
           export interface MetaRuntime {
             get $beanFullName(): 'a-user.meta.runtime';
             get $onionName(): 'a-user:runtime';
-            
-          } 
+          }
 }
 /** meta: end */
 /** config: begin */
@@ -352,7 +343,7 @@ declare module 'vona' {
   export interface IBeanScopeContainer {
     user: ScopeModuleAUser;
   }
-  
+
   export interface IBeanScopeConfig {
     'a-user': ReturnType<typeof config>;
   }

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

@@ -6,9 +6,11 @@ import { BeanBase, Global } from 'vona';
 import { Guard } from 'vona-module-a-aspect';
 import { checkErrorJwtExpiredAndThrow } from 'vona-module-a-jwt';
 
+import type { TypePassportActivated } from '../lib/passport.ts';
+
 export interface IGuardOptionsPassport extends IDecoratorGuardOptionsGlobal {
   public: boolean;
-  activated?: boolean;
+  activated?: TypePassportActivated;
   checkAuthToken: boolean; // default is true
 }
 
@@ -43,7 +45,7 @@ export class GuardPassport extends BeanBase implements IGuardExecute {
       return this.app.throw(403);
     }
     // check activated
-    if (this.bean.passport.isAuthenticated) {
+    if (!options.public && this.bean.passport.isAuthenticated) {
       if (options.activated === true && !this.bean.passport.isActivated) {
         return this.app.throw(403);
       }

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

@@ -1,34 +1,16 @@
-import type { Next } from 'vona';
-import type { IDecoratorGuardOptions, IGuardExecute } from 'vona-module-a-aspect';
+import type { IDecoratorGuardOptions } from 'vona-module-a-aspect';
 
-import { BeanBase } from 'vona';
-import { Guard } from 'vona-module-a-aspect';
+import { Guard, GuardBase } from 'vona-module-a-aspect';
 
 import type { IRoleNameRecord } from '../types/role.ts';
 
 export interface IGuardOptionsRoleName extends IDecoratorGuardOptions {
   name?: keyof IRoleNameRecord | (keyof IRoleNameRecord)[];
-  passWhenMatched: boolean;
-  rejectWhenDismatched: boolean;
 }
 
-@Guard<IGuardOptionsRoleName>({
-  passWhenMatched: true,
-  rejectWhenDismatched: true,
-})
-export class GuardRoleName extends BeanBase implements IGuardExecute {
-  async execute(options: IGuardOptionsRoleName, next: Next): Promise<boolean> {
-    const result = await this._check(options);
-    if (!result) {
-      if (options.rejectWhenDismatched) return this.app.throw(403);
-    } else {
-      if (options.passWhenMatched) return true;
-    }
-    // next
-    return next();
-  }
-
-  private async _check(options: IGuardOptionsRoleName) {
+@Guard<IGuardOptionsRoleName>()
+export class GuardRoleName extends GuardBase {
+  async check(options: IGuardOptionsRoleName): Promise<boolean> {
     if (!options.name) return false;
     return this.bean.passport.checkRoleName(options.name);
   }

package/vona/src/suite-vendor/a-vona/modules/a-user/src/lib/passport.ts

@@ -1,13 +1,16 @@
+import type { IGuardOptionsRbac } from 'vona-module-a-rbac';
+
 import { Aspect } from 'vona-module-a-aspect';
 
 import type { IGuardOptionsRoleName } from '../bean/guard.roleName.ts';
 
+export type TypePassportActivated = boolean | 'noCheck';
+
 function Public(_public: boolean = true): ClassDecorator & MethodDecorator {
   return Aspect.guardGlobal('a-user:passport', { public: _public });
 }
 
-// true/false/undefined
-function Activated(activated?: boolean): ClassDecorator & MethodDecorator {
+function Activated(activated: TypePassportActivated): ClassDecorator & MethodDecorator {
   return Aspect.guardGlobal('a-user:passport', { activated });
 }
 
@@ -24,11 +27,22 @@ function SystemAdmin(
   );
 }
 
+function Rbac(options?: Partial<IGuardOptionsRbac>): MethodDecorator {
+  const decorator = Aspect.guard('a-rbac:rbac', { ...options });
+  return (target, propertyKey, descriptor) => {
+    if (propertyKey === undefined) {
+      throw new Error('Passport.rbac must decorate an action');
+    }
+    return decorator(target, propertyKey, descriptor);
+  };
+}
+
 export interface IDecoratorGroupPassport {
   public: typeof Public;
   activated: typeof Activated;
   roleName: typeof RoleName;
   systemAdmin: typeof SystemAdmin;
+  rbac: typeof Rbac;
 }
 
 export const Passport: IDecoratorGroupPassport = {
@@ -36,4 +50,5 @@ export const Passport: IDecoratorGroupPassport = {
   activated: Activated,
   roleName: RoleName,
   systemAdmin: SystemAdmin,
+  rbac: Rbac,
 } as unknown as IDecoratorGroupPassport;

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-validation",
-  "version": "5.1.13",
+  "version": "5.1.14",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

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

@@ -4,15 +4,15 @@ export * from '../bean/bean.validator.ts';
 
 import 'vona';
 declare module 'vona' {
-  
-  
+
+
 }
 declare module 'vona-module-a-validation' {
-  
+
         export interface BeanValidator {
           /** @internal */
           get scope(): ScopeModuleAValidation;
-        } 
+        }
 }
 /** bean: end */
 /** bean: begin */
@@ -48,13 +48,13 @@ declare module 'vona' {
   export interface IBeanScopeContainer {
     validation: ScopeModuleAValidation;
   }
-  
-  
+
+
 
   export interface IBeanScopeLocale {
     'a-validation': (typeof locales)[TypeLocaleBase];
   }
 
-  
+
 }
 /** scope: end */

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

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