fix: add groupPolicy for GetPermissionForUser in frontend.ts (#415)

* test: add test for getPolicy for group * fix: add groupPolicy for GetPermissionForUser
casbin · Jan 20, 2023 · 5d1a679 · 5d1a679
1 parent a704ebb
commit 5d1a679
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/src/frontend.ts b/src/frontend.ts
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import { concat } from 'lodash';
 import { Enforcer } from './enforcer';
 import { deepCopy } from './util';
 
@@ -40,10 +41,19 @@ export async function casbinJsGetPermissionForUser(e: Enforcer, user?: string):
   s += '[matchers]\n';
   s += `m = ${m.get('m')?.get('m')?.value.replace(/_/g, '.')}`;
   obj['m'] = s;
-  obj['p'] = deepCopy(await e.getPolicy());
-  for (const arr of obj['p']) {
-    arr.splice(0, 0, 'p');
-  }
+
+  const policy = deepCopy(await e.getPolicy());
+  const groupPolicy = deepCopy(await e.getGroupingPolicy());
+
+  policy.forEach((item: string[]) => {
+    item.unshift('p');
+  });
+
+  groupPolicy.forEach((item: string[]) => {
+    item.unshift('g');
+  });
+
+  obj['p'] = concat(policy, groupPolicy);
 
   return JSON.stringify(obj);
 }
diff --git a/test/frontend.test.ts b/test/frontend.test.ts
@@ -28,7 +28,10 @@ test('TestCasbinJsGetPermissionForUser', async () => {
   // If you enable CR_LF auto transfer on Windows platform, this can lead to some unexpected behavior.
   expect(received['m']).toBe(expectedModelStr.replace(/\n\n/g, '\n'));
   const expectedPoliciesStr = readFileSync('examples/rbac_with_hierarchy_policy.csv').toString();
-  const expectedPolicyItem = expectedPoliciesStr.split(RegExp(',|\n'));
+
+  let expectedPolicyItem = expectedPoliciesStr.split(RegExp(',|\n'));
+  expectedPolicyItem = expectedPolicyItem.filter((item) => item !== null && item.trim() !== '');
+
   let i = 0;
   for (const sArr of received['p']) {
     for (const s of sArr) {