vona-module-a-user 5.0.25 → 5.0.26

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

@@ -5,7 +5,9 @@ import { BeanBase } from 'vona';
 export interface IGuardOptionsRoleName extends IDecoratorGuardOptions {
     name?: keyof IRoleNameRecord | (keyof IRoleNameRecord)[];
     passWhenMatched: boolean;
+    rejectWhenDismatched: boolean;
 }
 export declare class GuardRoleName extends BeanBase implements IGuardExecute {
     execute(options: IGuardOptionsRoleName, next: Next): Promise<boolean>;
+    private _check;
 }

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

@@ -5,7 +5,9 @@ import { BeanBase } from 'vona';
 export interface IGuardOptionsUserName extends IDecoratorGuardOptions {
     name?: keyof IUserNameRecord | (keyof IUserNameRecord)[];
     passWhenMatched: boolean;
+    rejectWhenDismatched: boolean;
 }
 export declare class GuardUserName extends BeanBase implements IGuardExecute {
     execute(options: IGuardOptionsUserName, next: Next): Promise<boolean>;
+    private _check;
 }

package/dist/index.js

@@ -52,41 +52,59 @@ let GuardPassport = (_dec$f = Guard({
 
 var _dec$e, _dec2$e, _class$e;
 let GuardRoleName = (_dec$e = Guard({
-  passWhenMatched: true
+  passWhenMatched: true,
+  rejectWhenDismatched: true
 }), _dec2$e = BeanInfo({
   module: "a-user"
 }), _dec$e(_class$e = _dec2$e(_class$e = class GuardRoleName extends BeanBase {
   async execute(options, next) {
-    if (!options.name) return this.app.throw(403);
+    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();
+  }
+  async _check(options) {
+    if (!options.name) return false;
     const user = this.bean.passport.getCurrentUser();
-    if (!user || user.anonymous) return this.app.throw(403);
+    if (!user || user.anonymous) return false;
     const roles = this.bean.passport.getCurrentRoles();
-    if (!roles) return this.app.throw(403);
+    if (!roles) return false;
     const roleNames = roles?.map(item => item.name);
     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();
+    if (!roleNames.some(roleName => optionsName.includes(roleName))) return false;
+    return true;
   }
 }) || _class$e) || _class$e);
 
 var _dec$d, _dec2$d, _class$d;
 let GuardUserName = (_dec$d = Guard({
-  passWhenMatched: true
+  passWhenMatched: true,
+  rejectWhenDismatched: true
 }), _dec2$d = BeanInfo({
   module: "a-user"
 }), _dec$d(_class$d = _dec2$d(_class$d = class GuardUserName extends BeanBase {
   async execute(options, next) {
-    if (!options.name) return this.app.throw(403);
+    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();
+  }
+  async _check(options) {
+    if (!options.name) return false;
     const user = this.bean.passport.getCurrentUser();
-    if (!user || user.anonymous) return this.app.throw(403);
+    if (!user || user.anonymous) return false;
     const userName = user.name;
     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();
+    if (!optionsName.includes(userName)) return false;
+    return true;
   }
 }) || _class$d) || _class$d);
 

package/package.json

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