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

organize imports

Browse Source
This commit is contained in:
Ben Irvin 2023-08-11 16:21:16 +02:00
parent 8cb72ac52c
commit 6ea17eea67
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/core/admin/server/services/permission/permissions-manager/sanitize.js
View File

@ -19,7 +19,7 @@ const {
cloneDeep, cloneDeep,
} = require('lodash/fp'); } = require('lodash/fp');
const { contentTypes, traverseEntity, traverse, sanitize, pipeAsync } = require('@strapi/utils'); const { contentTypes, traverseEntity, sanitize, pipeAsync, traverse } = require('@strapi/utils');
const { removePassword } = require('@strapi/utils').sanitize.visitors; const { removePassword } = require('@strapi/utils').sanitize.visitors;
const { ADMIN_USER_ALLOWED_FIELDS } = require('../../../domain/user'); const { ADMIN_USER_ALLOWED_FIELDS } = require('../../../domain/user');
@ -45,7 +45,6 @@ const STATIC_FIELDS = [ID_ATTRIBUTE];
module.exports = ({ action, ability, model }) => { module.exports = ({ action, ability, model }) => {
const schema = strapi.getModel(model); const schema = strapi.getModel(model);
const { sanitizePasswords } = sanitize.sanitizers;
const { allowedFields } = sanitize.visitors; const { allowedFields } = sanitize.visitors;
const { traverseQueryFilters, traverseQuerySort, traverseQueryPopulate, traverseQueryFields } = const { traverseQueryFilters, traverseQuerySort, traverseQueryPopulate, traverseQueryFields } =
traverse.traversals; traverse.traversals;
@ -131,7 +130,7 @@ module.exports = ({ action, ability, model }) => {
// Remove not allowed fields (RBAC) // Remove not allowed fields (RBAC)
traverseEntity(allowedFields(permittedFields), { schema }), traverseEntity(allowedFields(permittedFields), { schema }),
// Remove all fields of type 'password' // Remove all fields of type 'password'
sanitizePasswords(schema) sanitize.sanitizers.sanitizePasswords(schema)
); );
}; };

14
packages/core/admin/server/services/permission/permissions-manager/validate.js
View File

@ -17,9 +17,16 @@ const {
isObject, isObject,
} = require('lodash/fp'); } = require('lodash/fp');
const { contentTypes, traverseEntity, traverse, validate, pipeAsync } = require('@strapi/utils'); const {
const { throwPassword } = require('@strapi/utils').validate.visitors; contentTypes,
const { ValidationError } = require('@strapi/utils'); traverseEntity,
traverse,
validate,
pipeAsync,
ValidationError,
} = require('@strapi/utils');
const { throwPassword, throwDisallowedFields } = validate.visitors;
const { ADMIN_USER_ALLOWED_FIELDS } = require('../../../domain/user'); const { ADMIN_USER_ALLOWED_FIELDS } = require('../../../domain/user');
const { constants, isScalarAttribute, getNonVisibleAttributes, getWritableAttributes } = const { constants, isScalarAttribute, getNonVisibleAttributes, getWritableAttributes } =
@ -39,7 +46,6 @@ const STATIC_FIELDS = [ID_ATTRIBUTE];
module.exports = ({ action, ability, model }) => { module.exports = ({ action, ability, model }) => {
const schema = strapi.getModel(model); const schema = strapi.getModel(model);
const { throwDisallowedFields } = validate.visitors;
const { traverseQueryFilters, traverseQuerySort, traverseQueryFields } = traverse.traversals; const { traverseQueryFilters, traverseQuerySort, traverseQueryFields } = traverse.traversals;
const createValidateQuery = (options = {}) => { const createValidateQuery = (options = {}) => {