cabloy 5.1.134 → 5.1.136

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

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

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

@@ -53,6 +53,18 @@ export class BeanPassport extends BeanBase {
     return !!user && !!user.activated;
   }
 
+  public get isAccountActive(): boolean {
+    const user = this.currentUser;
+    return !!user && !user.anonymous && user.accountStatus !== 'disabled';
+  }
+
+  public ensureAccountActive(passport?: IPassport): void {
+    const user = passport?.user ?? this.currentUser;
+    if (user && !user.anonymous && user.accountStatus === 'disabled') {
+      this.app.throw(403);
+    }
+  }
+
   public async isSystemAdmin(): Promise<boolean> {
     const passport = this.current;
     return await this.passportAdapter.isSystemAdmin(passport);
@@ -80,6 +92,7 @@ export class BeanPassport extends BeanBase {
 
   public async signin(passport: IPassport, options?: ISigninOptions): Promise<IJwtToken> {
     if (isNil(this.ctx.instanceName)) throw new Error('should specify instance');
+    this.ensureAccountActive(passport);
     // current
     await this.setCurrent(passport);
     // event
@@ -163,6 +176,7 @@ export class BeanPassport extends BeanBase {
     if (!payloadData) return; // no jwt token
     const passport = await this.passportAdapter.deserialize(payloadData);
     if (!passport) return this.app.throw(401);
+    this.ensureAccountActive(passport);
     // verified
     const authTokenOptions = await this._combineAuthTokenOptions(
       passport.auth!.authProviderId,

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

@@ -38,6 +38,10 @@ export class GuardPassport extends BeanBase implements IGuardExecute {
     if (!this.bean.passport.current) {
       await this.bean.passport.signinWithAnonymous();
     }
+    // check account status
+    if (this.bean.passport.isAuthenticated && !this.bean.passport.isAccountActive) {
+      return this.app.throw(403);
+    }
     // check activated
     if (this.bean.passport.isAuthenticated) {
       if (options.activated === true && !this.bean.passport.isActivated) {

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

@@ -1,5 +1,6 @@
 import type { TableIdentity } from 'table-identity';
-import type { ILocaleRecord } from 'vona';
+
+export type LocalizedTextMap = Record<string, string>;
 
 export interface IRoleNameRecord {
   registeredUser: never;
@@ -12,7 +13,7 @@ export interface IRole {
   id: TableIdentity;
   name: string;
   title: string;
-  locales?: Partial<Record<keyof ILocaleRecord, string>>;
+  titleLocales?: LocalizedTextMap;
   siteIds: string[];
 }
 

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

@@ -3,6 +3,8 @@ import type { ILocaleRecord } from 'vona';
 
 import type { IAuthUserProfile } from './authProfile.ts';
 
+export type TypeAccountStatus = 'active' | 'disabled';
+
 export interface IUserNameRecord {
   admin: never;
 }
@@ -18,6 +20,7 @@ export interface IUser {
   email?: string;
   mobile?: string;
   activated?: boolean;
+  accountStatus?: TypeAccountStatus;
   locale?: keyof ILocaleRecord;
   tz?: string;
   anonymous?: boolean;
@@ -32,4 +35,5 @@ export interface IUserAdapter {
   update(user: Partial<IUser>): Promise<void>;
   remove(user: Partial<IUser>): Promise<void>;
   setActivated(id: TableIdentity, activated: boolean): Promise<void>;
+  setAccountStatus(id: TableIdentity, accountStatus: TypeAccountStatus): Promise<void>;
 }

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

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

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

@@ -1,6 +1,6 @@
 {
   "name": "@cabloy/logger",
-  "version": "1.1.24",
+  "version": "1.1.25",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "logger",
   "keywords": [
@@ -36,7 +36,7 @@
     "postpack": "clean-package restore"
   },
   "dependencies": {
-    "@cabloy/localeutil": "^2.1.8",
+    "@cabloy/localeutil": "^2.1.9",
     "fecha": "^4.2.3"
   },
   "devDependencies": {

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-jsx",
-  "version": "1.1.84",
+  "version": "1.1.85",
   "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.84"
+    "zova-core": "^5.1.85"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

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

@@ -1,6 +1,6 @@
 {
   "name": "zova",
-  "version": "5.1.147",
+  "version": "5.1.148",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A vue3 framework with ioc",
   "keywords": [
@@ -45,8 +45,8 @@
     "postpack": "clean-package restore"
   },
   "dependencies": {
-    "zova-core": "^5.1.84",
-    "zova-suite-a-zova": "^5.1.146"
+    "zova-core": "^5.1.85",
+    "zova-suite-a-zova": "^5.1.147"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-core",
-  "version": "5.1.84",
+  "version": "5.1.85",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A vue3 framework with ioc",
   "keywords": [
@@ -49,8 +49,8 @@
     "@cabloy/compose": "^2.1.9",
     "@cabloy/extend": "^3.2.8",
     "@cabloy/json5": "^1.1.9",
-    "@cabloy/localeutil": "^2.1.8",
-    "@cabloy/logger": "^1.1.24",
+    "@cabloy/localeutil": "^2.1.9",
+    "@cabloy/logger": "^1.1.25",
     "@cabloy/module-info": "^2.0.3",
     "@cabloy/utils": "^2.1.27",
     "@cabloy/vue-compiler-sfc": "^3.5.14",

package/zova/packages-zova/zova-core/src/core/sys/resource.ts

@@ -43,7 +43,7 @@ export class AppResource {
     uses[options.prop] = options;
     if (process.env.DEV) {
       if (typeof options.prop === 'string' && !options.prop.startsWith('$$')) {
-        console.error(`inject prop name should start with $$: ${options.prop}`);
+        throw new Error(`inject prop name should start with $$: ${options.prop}`);
       }
     }
   }

package/zova/packages-zova/zova-core/src/core/sys/util.ts

@@ -1,6 +1,7 @@
 import { extend } from '@cabloy/extend';
 import {
   combineApiPathControllerAndAction,
+  combineQueries,
   defaultPathSerializer,
   isEmptyObject,
 } from '@cabloy/utils';
@@ -98,6 +99,13 @@ export class SysUtil extends BeanSimple {
     // custom
     const optionsCustom: any = {
       params: options?.query,
+      paramsSerializer: {
+        serialize: params => {
+          const query = combineQueries(undefined, params);
+          const index = query.indexOf('?');
+          return index === -1 ? '' : query.substring(index + 1);
+        },
+      },
       query: undefined,
     };
     const interceptors = {};