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

Removes the plugins::users-permissions.user subject from editor & author's content-manager permissions

Browse Source 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
This commit is contained in:
Convly 2020-07-06 16:21:31 +02:00 committed by Alexandre Bodin
parent 91bd4281c3
commit a300e356c7
2 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
packages/strapi-admin/services/content-type.js
View File

@ -13,6 +13,7 @@ const fp = require('lodash/fp');
* @param {object} options.requiredOnly only returns required nestedFields
* @param {object} options.existingFields fields that are already selected, meaning that some sub-fields may be required
* @returns {array<string>}
* @param model
*/
const getNestedFields = (
model,
@ -104,24 +105,30 @@ const getNestedFieldsWithIntermediate = (
* @param {object} options
* @param {number} options.nestingLevel level of nesting
* @param {array} options.fieldsNullFor actionIds where the fields should be null
* @param {array} options.restrictedSubjects subjectsId to ignore
* @returns {array<permissions>}
*/
const getPermissionsWithNestedFields = (actions, { nestingLevel, fieldsNullFor = [] } = {}) =>
const getPermissionsWithNestedFields = (
actions,
{ nestingLevel, fieldsNullFor = [], restrictedSubjects = [] } = {}
) =>
actions.reduce((perms, action) => {
action.subjects.forEach(contentTypeUid => {
const fields = fieldsNullFor.includes(action.actionId)
? null
: getNestedFields(strapi.contentTypes[contentTypeUid], {
components: strapi.components,
nestingLevel,
});
perms.push({
action: action.actionId,
subject: contentTypeUid,
fields,
conditions: [],
action.subjects
.filter(subject => !restrictedSubjects.includes(subject))
.forEach(contentTypeUid => {
const fields = fieldsNullFor.includes(action.actionId)
? null
: getNestedFields(strapi.contentTypes[contentTypeUid], {
components: strapi.components,
nestingLevel,
});
perms.push({
action: action.actionId,
subject: contentTypeUid,
fields,
conditions: [],
});
});
});
return perms;
}, []);

12
packages/strapi-admin/services/role.js
View File

@ -36,6 +36,7 @@ const create = async attributes => {
/**
* Find a role in database
* @param params query params to find the role
* @param populate
* @returns {Promise<role>}
*/
const findOne = (params = {}, populate = []) => {
@ -45,14 +46,14 @@ const findOne = (params = {}, populate = []) => {
/**
* Find a role in database with usersCounts
* @param params query params to find the role
* @param populate
* @returns {Promise<role>}
*/
const findOneWithUsersCount = async (params = {}, populate = []) => {
const role = await strapi.query('role', 'admin').findOne(params, populate);
if (role) {
const usersCounts = await getUsersCount(role.id);
role.usersCount = usersCounts;
role.usersCount = await getUsersCount(role.id);
}
return role;
@ -61,6 +62,7 @@ const findOneWithUsersCount = async (params = {}, populate = []) => {
/**
* Find roles in database
* @param params query params to find the roles
* @param populate
* @returns {Promise<array>}
*/
const find = (params = {}, populate = []) => {
@ -74,8 +76,7 @@ const find = (params = {}, populate = []) => {
const findAllWithUsersCount = async (populate = []) => {
const roles = await strapi.query('role', 'admin').find({ _limit: -1 }, populate);
for (let role of roles) {
const usersCount = await getUsersCount(role.id);
role.usersCount = usersCount;
role.usersCount = await getUsersCount(role.id);
}
return roles;
@ -152,8 +153,8 @@ const deleteByIds = async (ids = []) => {
};
/** Count the number of users for some roles
* @param rolesIds
* @returns {Promise<integer>}
* @param roleId
*/
const getUsersCount = async roleId => {
return strapi.query('user', 'admin').count({ roles: [roleId] });
@ -207,6 +208,7 @@ const createRolesIfNoneExist = async ({ createPermissionsForAdmin = false } = {}
contentTypesActions,
{
fieldsNullFor: ['plugins::content-manager.explorer.delete'],
restrictedSubjects: ['plugins::users-permissions.user'],
}
);