Skip to content

Commit 0d6b30f

Browse files
committed
fix bug when build casbit adaptor
1 parent 021c5fe commit 0d6b30f

File tree

2 files changed

+23
-17
lines changed

2 files changed

+23
-17
lines changed

src/admin/misc/misc.controller.ts

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,29 +18,31 @@ export class MiscController {
1818
) {
1919
console.log(req.user);
2020

21+
// await this.miscService.getUserPermission(req.user.id);
2122
return await this.miscService.getUserPermission(req.user.id);
2223

23-
return `
24-
p, admin, posts, (list)|(create)
25-
p, admin, posts/*, (edit)|(show)|(delete)
26-
p, admin, posts/*, field
24+
// return `
25+
// p, admin, posts, (list)|(create)
26+
// p, admin, posts/*, (edit)|(show)|(delete)
27+
// p, admin, posts/*, field
2728

28-
p, admin, users, (list)|(create)
29-
p, admin, users/*, (edit)|(show)|(delete)
29+
// p, admin, users, (list)|(create)
30+
// p, admin, users/*, (edit)|(show)|(delete)
3031

31-
p, admin, roles, (list)|(create)
32-
p, admin, roles/*, (edit)|(show)|(delete)
32+
// p, admin, roles, (list)|(create)
33+
// p, admin, roles/*, (edit)|(show)|(delete)
3334

34-
p, admin, access_control
35+
// p, admin, access_control
3536

36-
p, admin, permissions, (list)|(create)
37-
p, admin, permissions/*, (edit)|(show)|(delete)
37+
// p, admin, permissions, (list)|(create)
38+
// p, admin, permissions/*, (edit)|(show)|(delete)
3839

39-
p, editor, posts, (list)|(create)
40-
p, editor, posts/*, (edit)|(show)
41-
p, editor, posts/hit, field, deny
40+
// p, editor, posts, (list)|(create)
41+
// p, editor, posts/*, (edit)|(show)
42+
// p, editor, posts/hit, field, deny
4243

43-
p, editor, categories, list
44-
`;
44+
// p, editor, categories, list
45+
// `;
4546
}
47+
4648
}

src/admin/misc/misc.service.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,11 @@ export class MiscService {
3232
permissions.forEach((item: RoleToPermission) => {
3333
console.log(item.permission);
3434
let actions = item.permission.actions.map((x: string) => `(${x})`).join('|');
35-
buildPermissionCasbin += `p, ${user.role.key}, ${item.permission.path}, ${actions}${"\n"}`
35+
if(actions == '') {
36+
buildPermissionCasbin += `p, ${user.role.key}, ${item.permission.path}${"\n"}`
37+
} else {
38+
buildPermissionCasbin += `p, ${user.role.key}, ${item.permission.path}, ${actions}${"\n"}`
39+
}
3640
})
3741

3842
console.log(buildPermissionCasbin.trim());

0 commit comments

Comments
 (0)