fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-05-05 05:29:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: merge acl action params appends bug

Browse Source
This commit is contained in:
aaaaaajie 2025-03-13 17:16:33 +08:00
parent 4d10946a2e
commit 516de92ee2
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
packages/core/acl/src/__tests__/acl-role.test.ts
View File

@ -397,6 +397,34 @@ describe('multiple roles merge', () => {
},
});
});
test('should union appends(params={ appends: [a,b]}) when appends = [a,b], appends =[]', () => {
acl.setAvailableAction('update');
acl.define({
role: 'role1',
actions: {
'posts:update': {
appends: ['a', 'b'],
},
},
});
acl.define({
role: 'role2',
actions: {
'posts:update': {
appends: [],
},
},
});
const canResult = acl.can({ resource: 'posts', action: 'update', roles: ['role1', 'role2'] });
expect(canResult).toStrictEqual({
role: 'role1',
resource: 'posts',
action: 'update',
params: {
appends: expect.arrayContaining(['a', 'b']),
},
});
});
});
describe('filter & fields merge', () => {

2
packages/core/acl/src/utils/acl-role.ts
View File

@ -184,7 +184,7 @@ export function mergeAclActionParams(sourceParams, targetParams) {
},
fields: andMerge,
whitelist: andMerge,
appends: andMerge,
appends: 'union',
});
removeEmptyParams(mergedParams);
return mergedParams;