yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-31 18:08:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update wording

Browse Source
This commit is contained in:
Convly 2022-08-01 10:48:01 +02:00
parent 43e360a641
commit 31ef51e245
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/admin/server/services/permission/engine.js
View File

@ -51,7 +51,7 @@ module.exports = params => {
/**
* Ignore the permission if the fields property is an empty array (access to no field)
*/
.on('post-format::validate.permission', ({ permission }) => {
.on('after-format::validate.permission', ({ permission }) => {
const { fields } = permission.properties;
if (isArray(fields) && isEmpty(fields)) {

2
packages/core/permissions/README.md
View File

@ -59,7 +59,7 @@ const ability = await engine.generateAbility([
},
]);
ability.can('read'); // false since we didn't register the read permission because of the validation hook
ability.can('read'); // false since the validation hook prevents the engine from registering the permission
ability.can('publish'); // false
ability.can('update', 'foo'); // false
ability.can('update', 'bar'); // true

2
packages/core/permissions/lib/engine/hooks.js
View File

@ -11,7 +11,7 @@ const domain = require('../domain');
const createEngineHooks = () => ({
'before-format::validate.permission': hooks.createAsyncBailHook(),
'format.permission': hooks.createAsyncSeriesWaterfallHook(),
'post-format::validate.permission': hooks.createAsyncBailHook(),
'after-format::validate.permission': hooks.createAsyncBailHook(),
'before-evaluate.permission': hooks.createAsyncSeriesHook(),
'before-register.permission': hooks.createAsyncSeriesHook(),
});

6
packages/core/permissions/lib/engine/index.js
View File

@ -68,12 +68,12 @@ module.exports = {
const permission = await state.hooks['format.permission'].call(params.permission);
const postFormatValidation = await runValidationHook(
'post-format::validate.permission',
const afterFormatValidation = await runValidationHook(
'after-format::validate.permission',
createValidateContext(permission)
);
if (postFormatValidation === false) {
if (afterFormatValidation === false) {
return;
}