feat: add named addMatchingFunc

Zxilly · Zxilly · commit 65d3a2655c63 · 2021-03-18T22:01:07.000+08:00
Signed-off-by: Zxilly &lt;zhouxinyu1001@gmail.com&gt;
diff --git a/.prettierrc b/.prettierrc
@@ -1,5 +1,6 @@
 {
   "semi": true,
   "singleQuote": true,
-  "printWidth": 140
+  "printWidth": 140,
+  "endOfLine": "auto"
 }
diff --git a/src/coreEnforcer.ts b/src/coreEnforcer.ts
@@ -20,6 +20,7 @@ import { Adapter, FilteredAdapter, Watcher, BatchAdapter, UpdatableAdapter } fro
 import { DefaultRoleManager, RoleManager } from './rbac';
 import { escapeAssertion, generateGFunction, getEvalValue, hasEval, replaceEval, generatorRunSync, generatorRunAsync } from './util';
 import { getLogger, logPrint } from './log';
+import { MatchingFunc } from './rbac';
 
 type Matcher = ((context: any) => Promise<any>) | ((context: any) => any);
 
@@ -262,6 +263,32 @@ export class CoreEnforcer {
     this.autoBuildRoleLinks = autoBuildRoleLinks;
   }
 
+  /**
+   * add matching function to RoleManager by ptype
+   * @param ptype g
+   * @param fn the function will be added
+   */
+  public async addNamedMatchingFunc(ptype: string, fn: MatchingFunc): Promise<void> {
+    const rm = this.rmMap.get(ptype);
+    if (rm) {
+      return await (<DefaultRoleManager>rm).addMatchingFunc(fn);
+    }
+
+    throw Error('Target ptype not found.');
+  }
+
+  /**
+   * add domain matching function to RoleManager by ptype
+   * @param ptype g
+   * @param fn the function will be added
+   */
+  public async addNamedDomainMatchingFunc(ptype: string, fn: MatchingFunc): Promise<void> {
+    const rm = this.rmMap.get(ptype);
+    if (rm) {
+      return await (<DefaultRoleManager>rm).addDomainMatchingFunc(fn);
+    }
+  }
+
   /**
    * buildRoleLinks manually rebuild the role inheritance relations.
    */
diff --git a/src/rbac/defaultRoleManager.ts b/src/rbac/defaultRoleManager.ts
@@ -15,7 +15,7 @@
 import { RoleManager } from './roleManager';
 import { getLogger, logPrint } from '../log';
 
-type MatchingFunc = (arg1: string, arg2: string) => boolean;
+export type MatchingFunc = (arg1: string, arg2: string) => boolean;
 
 // DEFAULT_DOMAIN defines the default domain space.
 const DEFAULT_DOMAIN = 'casbin::default';

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"semi": true,`
`3`	`3`	`"singleQuote": true,`
`4`		`- "printWidth": 140`
	`4`	`+ "printWidth": 140,`
	`5`	`+ "endOfLine": "auto"`
`5`	`6`	`}`