vona-module-a-user 5.0.13 → 5.0.15

package/dist/.metadata/index.d.ts

@@ -4,6 +4,7 @@ import type { EventOn } from 'vona-module-a-event';
 /** bean: begin */
 import type { BeanAuthInner } from '../bean/bean.authInner.ts';
 import type { BeanPassport } from '../bean/bean.passport.ts';
+import type { BeanRoleInner } from '../bean/bean.roleInner.ts';
 import type { BeanUserInner } from '../bean/bean.userInner.ts';
 /** event: end */
 /** event: begin */
@@ -17,8 +18,8 @@ import type { EventSignout } from '../bean/event.signout.ts';
 import type { TypeEventSignoutData, TypeEventSignoutResult } from '../bean/event.signout.ts';
 /** guard: end */
 /** bean: begin */
-import type { IGuardOptionsAdmin } from '../bean/guard.admin.ts';
 import type { IGuardOptionsPassport } from '../bean/guard.passport.ts';
+import type { IGuardOptionsRoleName } from '../bean/guard.roleName.ts';
 import type { IGuardOptionsUserName } from '../bean/guard.userName.ts';
 import type { config } from '../config/config.ts';
 /** config: end */
@@ -32,24 +33,25 @@ import 'vona';
 import 'vona';
 export * from '../bean/bean.authInner.ts';
 export * from '../bean/bean.passport.ts';
-export * from '../bean/bean.userInner.ts';
+export * from '../bean/bean.roleInner.ts';
 declare module 'vona-module-a-aspect' {
     interface IGuardRecordGlobal {
         'a-user:passport': IGuardOptionsPassport;
     }
     interface IGuardRecordLocal {
-        'a-user:admin': IGuardOptionsAdmin;
+        'a-user:roleName': IGuardOptionsRoleName;
         'a-user:userName': IGuardOptionsUserName;
     }
 }
 declare module 'vona-module-a-user' {
-    interface GuardAdmin {
-    }
     interface GuardPassport {
     }
+    interface GuardRoleName {
+    }
     interface GuardUserName {
     }
 }
+export * from '../bean/bean.userInner.ts';
 /** bean: end */
 /** event: begin */
 export * from '../bean/event.createUserAnonymous.ts';
@@ -62,6 +64,8 @@ declare module 'vona-module-a-user' {
     }
     interface BeanPassport {
     }
+    interface BeanRoleInner {
+    }
     interface BeanUserInner {
     }
 }
@@ -69,12 +73,13 @@ declare module 'vona' {
     interface IBeanRecordGlobal {
         authInner: BeanAuthInner;
         passport: BeanPassport;
+        roleInner: BeanRoleInner;
         userInner: BeanUserInner;
     }
 }
 /** guard: begin */
-export * from '../bean/guard.admin.ts';
 export * from '../bean/guard.passport.ts';
+export * from '../bean/guard.roleName.ts';
 export * from '../bean/guard.userName.ts';
 declare module 'vona' {
 }

package/dist/bean/bean.authInner.d.ts

@@ -3,5 +3,5 @@ import { BeanBase } from 'vona';
 export declare class BeanAuthInner extends BeanBase {
     private _authInnerAdapter;
     private get authInnerAdapter();
-    get(auth: Partial<IAuthBase>): Promise<IAuthBase | undefined>;
+    findOne(auth: Partial<IAuthBase>): Promise<IAuthBase | undefined>;
 }

package/dist/bean/bean.passport.d.ts

@@ -1,6 +1,7 @@
 import type { IJwtClientRecord, IJwtSignOptions, IJwtToken, IPayloadDataBase } from 'vona-module-a-jwt';
 import type { IAuthBase, IAuthIdRecord, ISigninOptions } from '../types/auth.ts';
 import type { IPassportBase } from '../types/passport.ts';
+import type { IRoleBase } from '../types/role.ts';
 import type { IUserBase, IUserNameRecord } from '../types/user.ts';
 import { BeanBase } from 'vona';
 export declare class BeanPassport extends BeanBase {
@@ -15,6 +16,7 @@ export declare class BeanPassport extends BeanBase {
     getCurrent(): IPassportBase | undefined;
     getCurrentUser(): IUserBase | undefined;
     getCurrentAuth(): IAuthBase | undefined;
+    getCurrentRoles(): IRoleBase[] | undefined;
     signin(passport: IPassportBase, options?: ISigninOptions): Promise<IJwtToken>;
     signout(): Promise<void>;
     signinSystem<K extends keyof IAuthIdRecord>(authName: IAuthIdRecord[K], authId: K, name?: string, options?: ISigninOptions): Promise<IJwtToken>;

package/dist/bean/bean.roleInner.d.ts

@@ -0,0 +1,10 @@
+import type { TableIdentity } from 'vona-module-a-database';
+import type { IRoleBase } from '../types/role.ts';
+import { BeanBase } from 'vona';
+export declare class BeanRoleInner extends BeanBase {
+    private _roleInnerAdapter;
+    private get roleInnerAdapter();
+    findOneByName(name: string): Promise<IRoleBase | undefined>;
+    findOne(role: Partial<IRoleBase>): Promise<IRoleBase | undefined>;
+    findAllByUserId(userId: TableIdentity): Promise<IRoleBase[]>;
+}

package/dist/bean/bean.userInner.d.ts

@@ -6,8 +6,8 @@ export declare class BeanUserInner extends BeanBase {
     private get userInnerAdapter();
     createByProfile(profile: IAuthUserProfile): Promise<IUserBase>;
     createAnonymous(): Promise<IUserBase>;
-    getByName(name: string): Promise<IUserBase | undefined>;
-    get(user: Partial<IUserBase>): Promise<IUserBase | undefined>;
+    findOneByName(name: string): Promise<IUserBase | undefined>;
+    findOne(user: Partial<IUserBase>): Promise<IUserBase | undefined>;
     update(user: Partial<IUserBase>): Promise<void>;
-    delete(user: Partial<IUserBase>): Promise<void>;
+    remove(user: Partial<IUserBase>): Promise<void>;
 }

package/dist/bean/guard.roleName.d.ts

@@ -0,0 +1,11 @@
+import type { Next } from 'vona';
+import type { IDecoratorGuardOptions, IGuardExecute } from 'vona-module-a-aspect';
+import type { IRoleNameRecord } from '../types/role.ts';
+import { BeanBase } from 'vona';
+export interface IGuardOptionsRoleName extends IDecoratorGuardOptions {
+    name?: keyof IRoleNameRecord | (keyof IRoleNameRecord)[];
+    passWhenMatched: boolean;
+}
+export declare class GuardRoleName extends BeanBase implements IGuardExecute {
+    execute(options: IGuardOptionsRoleName, next: Next): Promise<boolean>;
+}

package/dist/config/config.d.ts

@@ -10,5 +10,6 @@ export declare function config(_app: VonaApplication): {
         passport: keyof IServiceRecord;
         userInner: keyof IServiceRecord;
         authInner: keyof IServiceRecord;
+        roleInner: keyof IServiceRecord;
     };
 };

package/dist/index.js

@@ -5,10 +5,10 @@ import { Event, BeanEventBase } from 'vona-module-a-event';
 import { Guard, Aspect } from 'vona-module-a-aspect';
 import { Meta } from 'vona-module-a-meta';
 
-var _dec$a, _dec2$a, _class$a;
-let BeanAuthInner = (_dec$a = Bean(), _dec2$a = BeanInfo({
+var _dec$b, _dec2$b, _class$b;
+let BeanAuthInner = (_dec$b = Bean(), _dec2$b = BeanInfo({
   module: "a-user"
-}), _dec$a(_class$a = _dec2$a(_class$a = class BeanAuthInner extends BeanBase {
+}), _dec$b(_class$b = _dec2$b(_class$b = class BeanAuthInner extends BeanBase {
   constructor(...args) {
     super(...args);
     this._authInnerAdapter = void 0;
@@ -20,11 +20,11 @@ let BeanAuthInner = (_dec$a = Bean(), _dec2$a = BeanInfo({
     }
     return this._authInnerAdapter;
   }
-  async get(auth) {
+  async findOne(auth) {
     if (String(auth.id).charAt(0) === '-') return auth;
-    return await this.authInnerAdapter.get(auth);
+    return await this.authInnerAdapter.findOne(auth);
   }
-}) || _class$a) || _class$a);
+}) || _class$b) || _class$b);
 
 let __authAdapter;
 function setAuthAdapter(authAdapter) {
@@ -60,10 +60,10 @@ function $getUserIdSystem(_userName, userId) {
   return userId;
 }
 
-var _dec$9, _dec2$9, _class$9;
-let BeanPassport = (_dec$9 = Bean(), _dec2$9 = BeanInfo({
+var _dec$a, _dec2$a, _class$a;
+let BeanPassport = (_dec$a = Bean(), _dec2$a = BeanInfo({
   module: "a-user"
-}), _dec$9(_class$9 = _dec2$9(_class$9 = class BeanPassport extends BeanBase {
+}), _dec$a(_class$a = _dec2$a(_class$a = class BeanPassport extends BeanBase {
   constructor(...args) {
     super(...args);
     this._authTokenAdapter = void 0;
@@ -89,8 +89,8 @@ let BeanPassport = (_dec$9 = Bean(), _dec2$9 = BeanInfo({
     return !!user && !$getUserAnonymous(user);
   }
   async isAdmin() {
-    const user = this.getCurrentUser();
-    return !!user && this.isAuthenticated && (await this.passportAdapter.isAdmin(user));
+    const passport = this.getCurrent();
+    return await this.passportAdapter.isAdmin(passport);
   }
   async setCurrent(passport) {
     this.ctx.state.passport = await this.passportAdapter.setCurrent(passport);
@@ -104,6 +104,9 @@ let BeanPassport = (_dec$9 = Bean(), _dec2$9 = BeanInfo({
   getCurrentAuth() {
     return this.ctx.state.passport?.auth;
   }
+  getCurrentRoles() {
+    return this.ctx.state.passport?.roles;
+  }
   async signin(passport, options) {
     // current
     await this.setCurrent(passport);
@@ -129,7 +132,7 @@ let BeanPassport = (_dec$9 = Bean(), _dec2$9 = BeanInfo({
     await this.setCurrent(undefined);
   }
   async signinSystem(authName, authId, name, options) {
-    const user = await this.bean.userInner.getByName(name ?? 'admin');
+    const user = await this.bean.userInner.findOneByName(name ?? 'admin');
     if (!user) return this.app.throw(401);
     const auth = {
       id: $getAuthIdSystem(authName, authId)
@@ -251,6 +254,32 @@ let BeanPassport = (_dec$9 = Bean(), _dec2$9 = BeanInfo({
       return payloadData2;
     }
   }
+}) || _class$a) || _class$a);
+
+var _dec$9, _dec2$9, _class$9;
+let BeanRoleInner = (_dec$9 = Bean(), _dec2$9 = BeanInfo({
+  module: "a-user"
+}), _dec$9(_class$9 = _dec2$9(_class$9 = class BeanRoleInner extends BeanBase {
+  constructor(...args) {
+    super(...args);
+    this._roleInnerAdapter = void 0;
+  }
+  get roleInnerAdapter() {
+    if (!this._roleInnerAdapter) {
+      const beanFullName = beanFullNameFromOnionName(this.scope.config.adapter.roleInner, 'service');
+      this._roleInnerAdapter = this.bean._getBean(beanFullName);
+    }
+    return this._roleInnerAdapter;
+  }
+  findOneByName(name) {
+    return this.roleInnerAdapter.findOneByName(name);
+  }
+  findOne(role) {
+    return this.roleInnerAdapter.findOne(role);
+  }
+  findAllByUserId(userId) {
+    return this.roleInnerAdapter.findAllByUserId(userId);
+  }
 }) || _class$9) || _class$9);
 
 var _dec$8, _dec2$8, _class$8;
@@ -274,17 +303,17 @@ let BeanUserInner = (_dec$8 = Bean(), _dec2$8 = BeanInfo({
   createAnonymous() {
     return this.userInnerAdapter.createAnonymous();
   }
-  getByName(name) {
-    return this.userInnerAdapter.getByName(name);
+  findOneByName(name) {
+    return this.userInnerAdapter.findOneByName(name);
   }
-  get(user) {
-    return this.userInnerAdapter.get(user);
+  findOne(user) {
+    return this.userInnerAdapter.findOne(user);
   }
   update(user) {
     return this.userInnerAdapter.update(user);
   }
-  delete(user) {
-    return this.userInnerAdapter.delete(user);
+  remove(user) {
+    return this.userInnerAdapter.remove(user);
   }
 }) || _class$8) || _class$8);
 
@@ -304,31 +333,13 @@ let EventSignout = (_dec$5 = Event(), _dec2$5 = BeanInfo({
 }), _dec$5(_class$5 = _dec2$5(_class$5 = class EventSignout extends BeanEventBase {}) || _class$5) || _class$5);
 
 var _dec$4, _dec2$4, _class$4;
-let GuardAdmin = (_dec$4 = Guard({
-  admin: true,
-  passWhenMatched: true
-}), _dec2$4 = BeanInfo({
-  module: "a-user"
-}), _dec$4(_class$4 = _dec2$4(_class$4 = class GuardAdmin extends BeanBase {
-  async execute(options, next) {
-    if (options.admin) {
-      const isAdmin = await this.bean.passport.isAdmin();
-      if (!isAdmin) return this.app.throw(403);
-      if (options.passWhenMatched) return true;
-    }
-    // next
-    return next();
-  }
-}) || _class$4) || _class$4);
-
-var _dec$3, _dec2$3, _class$3;
-let GuardPassport = (_dec$3 = Guard({
+let GuardPassport = (_dec$4 = Guard({
   global: true,
   public: false,
   checkAuthToken: true
-}), _dec2$3 = BeanInfo({
+}), _dec2$4 = BeanInfo({
   module: "a-user"
-}), _dec$3(_class$3 = _dec2$3(_class$3 = class GuardPassport extends BeanBase {
+}), _dec$4(_class$4 = _dec2$4(_class$4 = class GuardPassport extends BeanBase {
   async execute(options, next) {
     // auth token
     if (!this.bean.passport.getCurrent()) {
@@ -354,6 +365,38 @@ let GuardPassport = (_dec$3 = Guard({
     // next
     return next();
   }
+}) || _class$4) || _class$4);
+
+let __roleAdapter;
+function setRoleAdapter(roleAdapter) {
+  __roleAdapter = roleAdapter;
+}
+function $getRoleId(role) {
+  return __roleAdapter.getRoleId(role);
+}
+function $getRoleName(role) {
+  return __roleAdapter.getRoleName(role);
+}
+
+var _dec$3, _dec2$3, _class$3;
+let GuardRoleName = (_dec$3 = Guard({
+  passWhenMatched: true
+}), _dec2$3 = BeanInfo({
+  module: "a-user"
+}), _dec$3(_class$3 = _dec2$3(_class$3 = class GuardRoleName extends BeanBase {
+  async execute(options, next) {
+    if (!options.name) return this.app.throw(403);
+    const user = this.bean.passport.getCurrentUser();
+    if (!user || $getUserAnonymous(user)) return this.app.throw(403);
+    const roles = this.bean.passport.getCurrentRoles();
+    if (!roles) return this.app.throw(403);
+    const roleNames = roles?.map(item => $getRoleName(item));
+    const optionsName = Array.isArray(options.name) ? options.name : [options.name];
+    if (!roleNames.some(roleName => optionsName.includes(roleName))) return this.app.throw(403);
+    if (options.passWhenMatched) return true;
+    // next
+    return next();
+  }
 }) || _class$3) || _class$3);
 
 var _dec$2, _dec2$2, _class$2;
@@ -404,7 +447,8 @@ function config(_app) {
       authToken: 'home-user:authTokenAdapter',
       passport: 'home-user:passportAdapter',
       userInner: 'home-user:userInnerAdapter',
-      authInner: 'home-user:authInnerAdapter'
+      authInner: 'home-user:authInnerAdapter',
+      roleInner: 'home-user:roleInnerAdapter'
     }
   };
 }
@@ -422,16 +466,22 @@ function Public(options) {
     public: _public
   });
 }
-function Admin(options) {
-  return Aspect.guard('a-user:admin', options);
-}
 function UserName(options) {
   return Aspect.guard('a-user:userName', options);
 }
+function RoleName(options) {
+  return Aspect.guard('a-user:roleName', options);
+}
+function Admin(options) {
+  return Aspect.guard('a-user:roleName', Object.assign({}, options, {
+    name: 'admin'
+  }));
+}
 const Passport = {
-  admin: Admin,
   public: Public,
-  userName: UserName
+  userName: UserName,
+  roleName: RoleName,
+  admin: Admin
 };
 
-export { $getAuthId, $getAuthIdSystem, $getUserAnonymous, $getUserAvatar, $getUserId, $getUserIdSystem, $getUserLocale, $getUserName, BeanAuthInner, BeanPassport, BeanUserInner, EventCreateUserAnonymous, EventSignin, EventSignout, GuardAdmin, GuardPassport, GuardUserName, MetaPrintTip, Passport, ScopeModuleAUser, config, setAuthAdapter, setUserAdapter };
+export { $getAuthId, $getAuthIdSystem, $getRoleId, $getRoleName, $getUserAnonymous, $getUserAvatar, $getUserId, $getUserIdSystem, $getUserLocale, $getUserName, BeanAuthInner, BeanPassport, BeanRoleInner, BeanUserInner, EventCreateUserAnonymous, EventSignin, EventSignout, GuardPassport, GuardRoleName, GuardUserName, MetaPrintTip, Passport, ScopeModuleAUser, config, setAuthAdapter, setRoleAdapter, setUserAdapter };

package/dist/lib/index.d.ts

@@ -1,3 +1,4 @@
 export * from './auth.ts';
 export * from './passport.ts';
+export * from './role.ts';
 export * from './user.ts';

package/dist/lib/passport.d.ts

@@ -1,14 +1,16 @@
 import type { TypeUseOnionOmitOptionsGlobal } from 'vona-module-a-onion';
-import type { IGuardOptionsAdmin } from '../bean/guard.admin.ts';
 import type { IGuardOptionsPassport } from '../bean/guard.passport.ts';
+import type { IGuardOptionsRoleName } from '../bean/guard.roleName.ts';
 import type { IGuardOptionsUserName } from '../bean/guard.userName.ts';
 declare function Public(options?: Partial<TypeUseOnionOmitOptionsGlobal<IGuardOptionsPassport>>): ClassDecorator & MethodDecorator;
-declare function Admin(options?: Partial<IGuardOptionsAdmin>): ClassDecorator & MethodDecorator;
 declare function UserName(options?: Partial<IGuardOptionsUserName>): ClassDecorator & MethodDecorator;
+declare function RoleName(options?: Partial<IGuardOptionsRoleName>): ClassDecorator & MethodDecorator;
+declare function Admin(options?: Partial<Omit<IGuardOptionsRoleName, 'name'>>): ClassDecorator & MethodDecorator;
 export interface IDecoratorGroupPassport {
-    admin: typeof Admin;
     public: typeof Public;
     userName: typeof UserName;
+    roleName: typeof RoleName;
+    admin: typeof Admin;
 }
 export declare const Passport: IDecoratorGroupPassport;
 export {};

package/dist/lib/role.d.ts

@@ -0,0 +1,5 @@
+import type { TableIdentity } from 'vona-module-a-database';
+import type { IRoleAdapter, IRoleBase } from '../types/role.ts';
+export declare function setRoleAdapter(roleAdapter: IRoleAdapter): void;
+export declare function $getRoleId(role: IRoleBase): TableIdentity;
+export declare function $getRoleName(role: IRoleBase): string;

package/dist/types/auth.d.ts

@@ -15,5 +15,5 @@ export interface ISigninOptions {
     authToken?: TypeAuthToken;
 }
 export interface IAuthInnerAdapter {
-    get(auth: Partial<IAuthBase>): Promise<IAuthBase | undefined>;
+    findOne(auth: Partial<IAuthBase>): Promise<IAuthBase | undefined>;
 }

package/dist/types/index.d.ts

@@ -2,4 +2,5 @@ export * from './auth.ts';
 export * from './authProfile.ts';
 export * from './authToken.ts';
 export * from './passport.ts';
+export * from './role.ts';
 export * from './user.ts';

package/dist/types/passport.d.ts

@@ -1,12 +1,14 @@
 import type { IPayloadDataBase } from 'vona-module-a-jwt';
 import type { IAuthBase } from './auth.ts';
+import type { IRoleBase } from './role.ts';
 import type { IUserBase } from './user.ts';
 export interface IPassportBase {
     user?: IUserBase;
     auth?: IAuthBase;
+    roles?: IRoleBase[];
 }
 export interface IPassportAdapter {
-    isAdmin(user: IUserBase): Promise<boolean>;
+    isAdmin(passport: IPassportBase | undefined): Promise<boolean>;
     setCurrent(passport: IPassportBase | undefined): Promise<IPassportBase | undefined>;
     serialize(passport: IPassportBase): Promise<IPayloadDataBase>;
     deserialize(payloadData: IPayloadDataBase): Promise<IPassportBase | undefined>;

package/dist/types/role.d.ts

@@ -0,0 +1,18 @@
+import type { TableIdentity } from 'vona-module-a-database';
+export interface IRoleNameRecord {
+    admin: never;
+}
+export interface IRoleIdRecord {
+}
+export interface IRoleBase {
+    id: TableIdentity;
+}
+export interface IRoleAdapter {
+    getRoleId(role: IRoleBase): TableIdentity;
+    getRoleName(role: IRoleBase): string;
+}
+export interface IRoleInnerAdapter {
+    findOneByName(name: string): Promise<IRoleBase | undefined>;
+    findOne(role: Partial<IRoleBase>): Promise<IRoleBase | undefined>;
+    findAllByUserId(userId: TableIdentity): Promise<IRoleBase[]>;
+}

package/dist/types/user.d.ts

@@ -20,8 +20,8 @@ export interface IUserAdapter {
 export interface IUserInnerAdapter {
     createByProfile(profile: IAuthUserProfile): Promise<IUserBase>;
     createAnonymous(): Promise<IUserBase>;
-    getByName(name: string): Promise<IUserBase | undefined>;
-    get(user: Partial<IUserBase>): Promise<IUserBase | undefined>;
+    findOneByName(name: string): Promise<IUserBase | undefined>;
+    findOne(user: Partial<IUserBase>): Promise<IUserBase | undefined>;
     update(user: Partial<IUserBase>): Promise<void>;
-    delete(user: Partial<IUserBase>): Promise<void>;
+    remove(user: Partial<IUserBase>): Promise<void>;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-a-user",
   "type": "module",
-  "version": "5.0.13",
+  "version": "5.0.15",
   "title": "a-user",
   "vonaModule": {
     "dependencies": {}

package/dist/bean/guard.admin.d.ts

@@ -1,10 +0,0 @@
-import type { Next } from 'vona';
-import type { IDecoratorGuardOptions, IGuardExecute } from 'vona-module-a-aspect';
-import { BeanBase } from 'vona';
-export interface IGuardOptionsAdmin extends IDecoratorGuardOptions {
-    admin: boolean;
-    passWhenMatched: boolean;
-}
-export declare class GuardAdmin extends BeanBase implements IGuardExecute {
-    execute(options: IGuardOptionsAdmin, next: Next): Promise<boolean>;
-}