vona-module-a-user 5.0.11 → 5.0.13

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

@@ -19,6 +19,7 @@ import type { TypeEventSignoutData, TypeEventSignoutResult } from '../bean/event
 /** bean: begin */
 import type { IGuardOptionsAdmin } from '../bean/guard.admin.ts';
 import type { IGuardOptionsPassport } from '../bean/guard.passport.ts';
+import type { IGuardOptionsUserName } from '../bean/guard.userName.ts';
 import type { config } from '../config/config.ts';
 /** config: end */
 /** scope: begin */
@@ -31,12 +32,14 @@ import 'vona';
 import 'vona';
 export * from '../bean/bean.authInner.ts';
 export * from '../bean/bean.passport.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:userName': IGuardOptionsUserName;
     }
 }
 declare module 'vona-module-a-user' {
@@ -44,12 +47,14 @@ declare module 'vona-module-a-user' {
     }
     interface GuardPassport {
     }
+    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';
 declare module 'vona' {
 }
 declare module 'vona-module-a-user' {
@@ -67,10 +72,10 @@ declare module 'vona' {
         userInner: BeanUserInner;
     }
 }
-export * from '../bean/event.signout.ts';
 /** guard: begin */
 export * from '../bean/guard.admin.ts';
 export * from '../bean/guard.passport.ts';
+export * from '../bean/guard.userName.ts';
 declare module 'vona' {
 }
 declare module 'vona-module-a-user' {

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

@@ -1,7 +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 { IUserBase } from '../types/user.ts';
+import type { IUserBase, IUserNameRecord } from '../types/user.ts';
 import { BeanBase } from 'vona';
 export declare class BeanPassport extends BeanBase {
     private _authTokenAdapter;
@@ -18,7 +18,7 @@ export declare class BeanPassport extends BeanBase {
     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>;
-    signinMock(name?: string, options?: ISigninOptions): Promise<IJwtToken>;
+    signinMock(name?: keyof IUserNameRecord, options?: ISigninOptions): Promise<IJwtToken>;
     signinWithAnonymous(): Promise<void>;
     createUserAnonymous(): Promise<IUserBase>;
     kickOut(user: IUserBase): Promise<void>;

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

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

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

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

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$9, _dec2$9, _class$9;
-let BeanAuthInner = (_dec$9 = Bean(), _dec2$9 = BeanInfo({
+var _dec$a, _dec2$a, _class$a;
+let BeanAuthInner = (_dec$a = Bean(), _dec2$a = BeanInfo({
   module: "a-user"
-}), _dec$9(_class$9 = _dec2$9(_class$9 = class BeanAuthInner extends BeanBase {
+}), _dec$a(_class$a = _dec2$a(_class$a = class BeanAuthInner extends BeanBase {
   constructor(...args) {
     super(...args);
     this._authInnerAdapter = void 0;
@@ -24,7 +24,7 @@ let BeanAuthInner = (_dec$9 = Bean(), _dec2$9 = BeanInfo({
     if (String(auth.id).charAt(0) === '-') return auth;
     return await this.authInnerAdapter.get(auth);
   }
-}) || _class$9) || _class$9);
+}) || _class$a) || _class$a);
 
 let __authAdapter;
 function setAuthAdapter(authAdapter) {
@@ -60,10 +60,10 @@ function $getUserIdSystem(_userName, userId) {
   return userId;
 }
 
-var _dec$8, _dec2$8, _class$8;
-let BeanPassport = (_dec$8 = Bean(), _dec2$8 = BeanInfo({
+var _dec$9, _dec2$9, _class$9;
+let BeanPassport = (_dec$9 = Bean(), _dec2$9 = BeanInfo({
   module: "a-user"
-}), _dec$8(_class$8 = _dec2$8(_class$8 = class BeanPassport extends BeanBase {
+}), _dec$9(_class$9 = _dec2$9(_class$9 = class BeanPassport extends BeanBase {
   constructor(...args) {
     super(...args);
     this._authTokenAdapter = void 0;
@@ -251,12 +251,12 @@ let BeanPassport = (_dec$8 = Bean(), _dec2$8 = BeanInfo({
       return payloadData2;
     }
   }
-}) || _class$8) || _class$8);
+}) || _class$9) || _class$9);
 
-var _dec$7, _dec2$7, _class$7;
-let BeanUserInner = (_dec$7 = Bean(), _dec2$7 = BeanInfo({
+var _dec$8, _dec2$8, _class$8;
+let BeanUserInner = (_dec$8 = Bean(), _dec2$8 = BeanInfo({
   module: "a-user"
-}), _dec$7(_class$7 = _dec2$7(_class$7 = class BeanUserInner extends BeanBase {
+}), _dec$8(_class$8 = _dec2$8(_class$8 = class BeanUserInner extends BeanBase {
   constructor(...args) {
     super(...args);
     this._userInnerAdapter = void 0;
@@ -286,49 +286,49 @@ let BeanUserInner = (_dec$7 = Bean(), _dec2$7 = BeanInfo({
   delete(user) {
     return this.userInnerAdapter.delete(user);
   }
-}) || _class$7) || _class$7);
+}) || _class$8) || _class$8);
+
+var _dec$7, _dec2$7, _class$7;
+let EventCreateUserAnonymous = (_dec$7 = Event(), _dec2$7 = BeanInfo({
+  module: "a-user"
+}), _dec$7(_class$7 = _dec2$7(_class$7 = class EventCreateUserAnonymous extends BeanEventBase {}) || _class$7) || _class$7);
 
 var _dec$6, _dec2$6, _class$6;
-let EventCreateUserAnonymous = (_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 EventCreateUserAnonymous 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 EventSignin = (_dec$5 = Event(), _dec2$5 = BeanInfo({
+let EventSignout = (_dec$5 = Event(), _dec2$5 = BeanInfo({
   module: "a-user"
-}), _dec$5(_class$5 = _dec2$5(_class$5 = class EventSignin extends BeanEventBase {}) || _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 EventSignout = (_dec$4 = Event(), _dec2$4 = BeanInfo({
-  module: "a-user"
-}), _dec$4(_class$4 = _dec2$4(_class$4 = class EventSignout extends BeanEventBase {}) || _class$4) || _class$4);
-
-var _dec$3, _dec2$3, _class$3;
-let GuardAdmin = (_dec$3 = Guard({
+let GuardAdmin = (_dec$4 = Guard({
   admin: true,
-  passWhenAdmin: true
-}), _dec2$3 = BeanInfo({
+  passWhenMatched: true
+}), _dec2$4 = BeanInfo({
   module: "a-user"
-}), _dec$3(_class$3 = _dec2$3(_class$3 = class GuardAdmin extends BeanBase {
+}), _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.passWhenAdmin) return true;
+      if (options.passWhenMatched) return true;
     }
     // next
     return next();
   }
-}) || _class$3) || _class$3);
+}) || _class$4) || _class$4);
 
-var _dec$2, _dec2$2, _class$2;
-let GuardPassport = (_dec$2 = Guard({
+var _dec$3, _dec2$3, _class$3;
+let GuardPassport = (_dec$3 = Guard({
   global: true,
   public: false,
   checkAuthToken: true
-}), _dec2$2 = BeanInfo({
+}), _dec2$3 = BeanInfo({
   module: "a-user"
-}), _dec$2(_class$2 = _dec2$2(_class$2 = class GuardPassport extends BeanBase {
+}), _dec$3(_class$3 = _dec2$3(_class$3 = class GuardPassport extends BeanBase {
   async execute(options, next) {
     // auth token
     if (!this.bean.passport.getCurrent()) {
@@ -354,6 +354,25 @@ let GuardPassport = (_dec$2 = Guard({
     // next
     return next();
   }
+}) || _class$3) || _class$3);
+
+var _dec$2, _dec2$2, _class$2;
+let GuardUserName = (_dec$2 = Guard({
+  passWhenMatched: true
+}), _dec2$2 = BeanInfo({
+  module: "a-user"
+}), _dec$2(_class$2 = _dec2$2(_class$2 = class GuardUserName 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 userName = $getUserName(user);
+    const optionsName = Array.isArray(options.name) ? options.name : [options.name];
+    if (!optionsName.includes(userName)) return this.app.throw(403);
+    if (options.passWhenMatched) return true;
+    // next
+    return next();
+  }
 }) || _class$2) || _class$2);
 
 var _dec$1, _dec2$1, _class$1;
@@ -406,9 +425,13 @@ function Public(options) {
 function Admin(options) {
   return Aspect.guard('a-user:admin', options);
 }
+function UserName(options) {
+  return Aspect.guard('a-user:userName', options);
+}
 const Passport = {
   admin: Admin,
-  public: Public
+  public: Public,
+  userName: UserName
 };
 
-export { $getAuthId, $getAuthIdSystem, $getUserAnonymous, $getUserAvatar, $getUserId, $getUserIdSystem, $getUserLocale, $getUserName, BeanAuthInner, BeanPassport, BeanUserInner, EventCreateUserAnonymous, EventSignin, EventSignout, GuardAdmin, GuardPassport, MetaPrintTip, Passport, ScopeModuleAUser, config, setAuthAdapter, setUserAdapter };
+export { $getAuthId, $getAuthIdSystem, $getUserAnonymous, $getUserAvatar, $getUserId, $getUserIdSystem, $getUserLocale, $getUserName, BeanAuthInner, BeanPassport, BeanUserInner, EventCreateUserAnonymous, EventSignin, EventSignout, GuardAdmin, GuardPassport, GuardUserName, MetaPrintTip, Passport, ScopeModuleAUser, config, setAuthAdapter, setUserAdapter };

package/dist/lib/passport.d.ts

@@ -1,10 +1,14 @@
 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 { IGuardOptionsUserName } from '../bean/guard.userName.ts';
 declare function Public(options?: Partial<TypeUseOnionOmitOptionsGlobal<IGuardOptionsPassport>>): ClassDecorator & MethodDecorator;
 declare function Admin(options?: Partial<IGuardOptionsAdmin>): ClassDecorator & MethodDecorator;
-export declare const Passport: {
+declare function UserName(options?: Partial<IGuardOptionsUserName>): ClassDecorator & MethodDecorator;
+export interface IDecoratorGroupPassport {
     admin: typeof Admin;
     public: typeof Public;
-};
+    userName: typeof UserName;
+}
+export declare const Passport: IDecoratorGroupPassport;
 export {};

package/dist/types/user.d.ts

@@ -1,6 +1,9 @@
 import type { ILocaleInfos } from 'vona';
 import type { TableIdentity } from 'vona-module-a-database';
 import type { IAuthUserProfile } from './authProfile.ts';
+export interface IUserNameRecord {
+    admin: never;
+}
 export interface IUserIdRecord {
     '-1': 'anonymous';
 }

package/package.json

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