vona-module-a-user 5.0.14 → 5.0.15

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

@@ -18,7 +18,6 @@ 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';
@@ -35,20 +34,16 @@ import 'vona';
 export * from '../bean/bean.authInner.ts';
 export * from '../bean/bean.passport.ts';
 export * from '../bean/bean.roleInner.ts';
-export * from '../bean/bean.userInner.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 {
@@ -56,13 +51,12 @@ declare module 'vona-module-a-user' {
     interface GuardUserName {
     }
 }
+export * from '../bean/bean.userInner.ts';
 /** bean: end */
 /** event: begin */
 export * from '../bean/event.createUserAnonymous.ts';
 export * from '../bean/event.signin.ts';
 export * from '../bean/event.signout.ts';
-/** guard: begin */
-export * from '../bean/guard.admin.ts';
 declare module 'vona' {
 }
 declare module 'vona-module-a-user' {
@@ -83,6 +77,7 @@ declare module 'vona' {
         userInner: BeanUserInner;
     }
 }
+/** guard: begin */
 export * from '../bean/guard.passport.ts';
 export * from '../bean/guard.roleName.ts';
 export * from '../bean/guard.userName.ts';

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$c, _dec2$c, _class$c;
-let BeanAuthInner = (_dec$c = Bean(), _dec2$c = BeanInfo({
+var _dec$b, _dec2$b, _class$b;
+let BeanAuthInner = (_dec$b = Bean(), _dec2$b = BeanInfo({
   module: "a-user"
-}), _dec$c(_class$c = _dec2$c(_class$c = class BeanAuthInner extends BeanBase {
+}), _dec$b(_class$b = _dec2$b(_class$b = class BeanAuthInner extends BeanBase {
   constructor(...args) {
     super(...args);
     this._authInnerAdapter = void 0;
@@ -24,7 +24,7 @@ let BeanAuthInner = (_dec$c = Bean(), _dec2$c = BeanInfo({
     if (String(auth.id).charAt(0) === '-') return auth;
     return await this.authInnerAdapter.findOne(auth);
   }
-}) || _class$c) || _class$c);
+}) || _class$b) || _class$b);
 
 let __authAdapter;
 function setAuthAdapter(authAdapter) {
@@ -60,10 +60,10 @@ function $getUserIdSystem(_userName, userId) {
   return userId;
 }
 
-var _dec$b, _dec2$b, _class$b;
-let BeanPassport = (_dec$b = Bean(), _dec2$b = BeanInfo({
+var _dec$a, _dec2$a, _class$a;
+let BeanPassport = (_dec$a = Bean(), _dec2$a = BeanInfo({
   module: "a-user"
-}), _dec$b(_class$b = _dec2$b(_class$b = 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$b = Bean(), _dec2$b = 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);
@@ -254,12 +254,12 @@ let BeanPassport = (_dec$b = Bean(), _dec2$b = BeanInfo({
       return payloadData2;
     }
   }
-}) || _class$b) || _class$b);
+}) || _class$a) || _class$a);
 
-var _dec$a, _dec2$a, _class$a;
-let BeanRoleInner = (_dec$a = Bean(), _dec2$a = BeanInfo({
+var _dec$9, _dec2$9, _class$9;
+let BeanRoleInner = (_dec$9 = Bean(), _dec2$9 = BeanInfo({
   module: "a-user"
-}), _dec$a(_class$a = _dec2$a(_class$a = class BeanRoleInner extends BeanBase {
+}), _dec$9(_class$9 = _dec2$9(_class$9 = class BeanRoleInner extends BeanBase {
   constructor(...args) {
     super(...args);
     this._roleInnerAdapter = void 0;
@@ -280,12 +280,12 @@ let BeanRoleInner = (_dec$a = Bean(), _dec2$a = BeanInfo({
   findAllByUserId(userId) {
     return this.roleInnerAdapter.findAllByUserId(userId);
   }
-}) || _class$a) || _class$a);
+}) || _class$9) || _class$9);
 
-var _dec$9, _dec2$9, _class$9;
-let BeanUserInner = (_dec$9 = Bean(), _dec2$9 = BeanInfo({
+var _dec$8, _dec2$8, _class$8;
+let BeanUserInner = (_dec$8 = Bean(), _dec2$8 = BeanInfo({
   module: "a-user"
-}), _dec$9(_class$9 = _dec2$9(_class$9 = class BeanUserInner extends BeanBase {
+}), _dec$8(_class$8 = _dec2$8(_class$8 = class BeanUserInner extends BeanBase {
   constructor(...args) {
     super(...args);
     this._userInnerAdapter = void 0;
@@ -315,40 +315,22 @@ let BeanUserInner = (_dec$9 = Bean(), _dec2$9 = BeanInfo({
   remove(user) {
     return this.userInnerAdapter.remove(user);
   }
-}) || _class$9) || _class$9);
-
-var _dec$8, _dec2$8, _class$8;
-let EventCreateUserAnonymous = (_dec$8 = Event(), _dec2$8 = BeanInfo({
-  module: "a-user"
-}), _dec$8(_class$8 = _dec2$8(_class$8 = class EventCreateUserAnonymous extends BeanEventBase {}) || _class$8) || _class$8);
+}) || _class$8) || _class$8);
 
 var _dec$7, _dec2$7, _class$7;
-let EventSignin = (_dec$7 = Event(), _dec2$7 = BeanInfo({
+let EventCreateUserAnonymous = (_dec$7 = Event(), _dec2$7 = BeanInfo({
   module: "a-user"
-}), _dec$7(_class$7 = _dec2$7(_class$7 = class EventSignin extends BeanEventBase {}) || _class$7) || _class$7);
+}), _dec$7(_class$7 = _dec2$7(_class$7 = class EventCreateUserAnonymous extends BeanEventBase {}) || _class$7) || _class$7);
 
 var _dec$6, _dec2$6, _class$6;
-let EventSignout = (_dec$6 = Event(), _dec2$6 = BeanInfo({
+let EventSignin = (_dec$6 = Event(), _dec2$6 = BeanInfo({
   module: "a-user"
-}), _dec$6(_class$6 = _dec2$6(_class$6 = class EventSignout extends BeanEventBase {}) || _class$6) || _class$6);
+}), _dec$6(_class$6 = _dec2$6(_class$6 = class EventSignin extends BeanEventBase {}) || _class$6) || _class$6);
 
 var _dec$5, _dec2$5, _class$5;
-let GuardAdmin = (_dec$5 = Guard({
-  admin: true,
-  passWhenMatched: true
-}), _dec2$5 = BeanInfo({
+let EventSignout = (_dec$5 = Event(), _dec2$5 = BeanInfo({
   module: "a-user"
-}), _dec$5(_class$5 = _dec2$5(_class$5 = 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$5) || _class$5);
+}), _dec$5(_class$5 = _dec2$5(_class$5 = class EventSignout extends BeanEventBase {}) || _class$5) || _class$5);
 
 var _dec$4, _dec2$4, _class$4;
 let GuardPassport = (_dec$4 = Guard({
@@ -484,20 +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,
-  roleName: RoleName
+  roleName: RoleName,
+  admin: Admin
 };
 
-export { $getAuthId, $getAuthIdSystem, $getRoleId, $getRoleName, $getUserAnonymous, $getUserAvatar, $getUserId, $getUserIdSystem, $getUserLocale, $getUserName, BeanAuthInner, BeanPassport, BeanRoleInner, BeanUserInner, EventCreateUserAnonymous, EventSignin, EventSignout, GuardAdmin, GuardPassport, GuardRoleName, GuardUserName, MetaPrintTip, Passport, ScopeModuleAUser, config, setAuthAdapter, setRoleAdapter, 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/passport.d.ts

@@ -1,17 +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/types/passport.d.ts

@@ -8,7 +8,7 @@ export interface IPassportBase {
     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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-a-user",
   "type": "module",
-  "version": "5.0.14",
+  "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>;
-}