yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-15 01:28:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix pr comments

Browse Source 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
This commit is contained in:
Convly 2020-06-16 11:13:01 +02:00 committed by Alexandre Bodin
parent 9f1fa33e29
commit e745903112
6 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/strapi-admin/config/functions/bootstrap.js vendored
View File

@ -26,7 +26,16 @@ const cleanPermissionInDatabase = async () => {
await strapi.admin.services.permission.deleteByIds(permissionsToRemoveIds); await strapi.admin.services.permission.deleteByIds(permissionsToRemoveIds);
}; };
const registerAdminConditions = () => {
const { conditionProvider } = strapi.admin.services.permission;
conditionProvider.registerMany({
'strapi-admin::isOwner': user => ({ 'strapi_created_by.id': user.id }),
});
};
module.exports = async () => { module.exports = async () => {
registerAdminConditions();
registerPermissionActions(); registerPermissionActions();
await cleanPermissionInDatabase(); await cleanPermissionInDatabase();
}; };

2
packages/strapi-admin/controllers/permission.js
View File

@ -32,7 +32,7 @@ module.exports = {
*/ */
async getAll(ctx) { async getAll(ctx) {
const allActions = strapi.admin.services.permission.actionProvider.getAll(); const allActions = strapi.admin.services.permission.actionProvider.getAll();
const conditions = strapi.admin.services.permission.conditionProvider.conditions(); const conditions = strapi.admin.services.permission.conditionProvider.getAll();
ctx.body = { ctx.body = {
data: { data: {

8
packages/strapi-admin/services/__tests__/permissions.conditions-provider.test.js
View File

@ -91,7 +91,7 @@ describe('Condition Provider', () => {
provider.registerMany(conditions); provider.registerMany(conditions);
expect(provider.conditions().sort()).toMatchObject(expected); expect(provider.getAll().sort()).toMatchObject(expected);
}); });
}); });
@ -116,12 +116,12 @@ describe('Condition Provider', () => {
provider.register(key); provider.register(key);
expect(provider.conditions()).toHaveLength(1); expect(provider.getAll()).toHaveLength(1);
provider.delete(key); provider.delete(key);
expect(provider.has).toHaveBeenCalledWith(key); expect(provider.has).toHaveBeenCalledWith(key);
expect(provider.conditions()).toHaveLength(0); expect(provider.getAll()).toHaveLength(0);
}); });
test('Do nothing when the key does not exists', () => { test('Do nothing when the key does not exists', () => {
@ -130,7 +130,7 @@ describe('Condition Provider', () => {
provider.delete(key); provider.delete(key);
expect(provider.has).toHaveBeenCalledWith(key); expect(provider.has).toHaveBeenCalledWith(key);
expect(provider.conditions()).toHaveLength(0); expect(provider.getAll()).toHaveLength(0);
}); });
}); });
}); });

3
packages/strapi-admin/services/permission.js
View File

@ -4,11 +4,10 @@ const _ = require('lodash');
const { createPermission } = require('../domain/permission'); const { createPermission } = require('../domain/permission');
const actionProvider = require('./action-provider'); const actionProvider = require('./action-provider');
const { validatePermissionsExist } = require('../validation/permission'); const { validatePermissionsExist } = require('../validation/permission');
const defaultConditions = require('./permission/default-conditions');
const createConditionProvider = require('./permission/condition-provider'); const createConditionProvider = require('./permission/condition-provider');
const createPermissionEngine = require('./permission/engine'); const createPermissionEngine = require('./permission/engine');
const conditionProvider = createConditionProvider(defaultConditions); const conditionProvider = createConditionProvider();
const engine = createPermissionEngine(conditionProvider); const engine = createPermissionEngine(conditionProvider);
/** /**

6
packages/strapi-admin/services/permission/condition-provider.js
View File

@ -2,8 +2,8 @@
const _ = require('lodash'); const _ = require('lodash');
module.exports = (defaultConditions = {}) => { module.exports = () => {
const _registry = new Map(Object.entries(defaultConditions)); const _registry = new Map();
return { return {
/** /**
@ -66,7 +66,5 @@ module.exports = (defaultConditions = {}) => {
has(name) { has(name) {
return _registry.has(name); return _registry.has(name);
}, },
defaultConditions,
}; };
}; };

5
packages/strapi-admin/services/permission/default-conditions.js
View File

@ -1,5 +0,0 @@
'use strict';
module.exports = {
'strapi-admin::isOwner': user => ({ 'strapi_created_by.id': user.id }),
};