From 6ea17eea672b1e39c8712ae2fcc62620753734b5 Mon Sep 17 00:00:00 2001
From: Ben Irvin <ben@innerdvations.com>
Date: Fri, 11 Aug 2023 16:21:16 +0200
Subject: [PATCH] organize imports

---
 .../permission/permissions-manager/sanitize.js     |  5 ++---
 .../permission/permissions-manager/validate.js     | 14 ++++++++++----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/packages/core/admin/server/services/permission/permissions-manager/sanitize.js b/packages/core/admin/server/services/permission/permissions-manager/sanitize.js
index af7a586e9d..f1751beed8 100644
--- a/packages/core/admin/server/services/permission/permissions-manager/sanitize.js
+++ b/packages/core/admin/server/services/permission/permissions-manager/sanitize.js
@@ -19,7 +19,7 @@ const {
   cloneDeep,
 } = 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 { ADMIN_USER_ALLOWED_FIELDS } = require('../../../domain/user');
 
@@ -45,7 +45,6 @@ const STATIC_FIELDS = [ID_ATTRIBUTE];
 module.exports = ({ action, ability, model }) => {
   const schema = strapi.getModel(model);
 
-  const { sanitizePasswords } = sanitize.sanitizers;
   const { allowedFields } = sanitize.visitors;
   const { traverseQueryFilters, traverseQuerySort, traverseQueryPopulate, traverseQueryFields } =
     traverse.traversals;
@@ -131,7 +130,7 @@ module.exports = ({ action, ability, model }) => {
       // Remove not allowed fields (RBAC)
       traverseEntity(allowedFields(permittedFields), { schema }),
       // Remove all fields of type 'password'
-      sanitizePasswords(schema)
+      sanitize.sanitizers.sanitizePasswords(schema)
     );
   };
 
diff --git a/packages/core/admin/server/services/permission/permissions-manager/validate.js b/packages/core/admin/server/services/permission/permissions-manager/validate.js
index a9fe386428..0bfcb03ca0 100644
--- a/packages/core/admin/server/services/permission/permissions-manager/validate.js
+++ b/packages/core/admin/server/services/permission/permissions-manager/validate.js
@@ -17,9 +17,16 @@ const {
   isObject,
 } = require('lodash/fp');
 
-const { contentTypes, traverseEntity, traverse, validate, pipeAsync } = require('@strapi/utils');
-const { throwPassword } = require('@strapi/utils').validate.visitors;
-const { ValidationError } = require('@strapi/utils');
+const {
+  contentTypes,
+  traverseEntity,
+  traverse,
+  validate,
+  pipeAsync,
+  ValidationError,
+} = require('@strapi/utils');
+
+const { throwPassword, throwDisallowedFields } = validate.visitors;
 const { ADMIN_USER_ALLOWED_FIELDS } = require('../../../domain/user');
 
 const { constants, isScalarAttribute, getNonVisibleAttributes, getWritableAttributes } =
@@ -39,7 +46,6 @@ const STATIC_FIELDS = [ID_ATTRIBUTE];
 module.exports = ({ action, ability, model }) => {
   const schema = strapi.getModel(model);
 
-  const { throwDisallowedFields } = validate.visitors;
   const { traverseQueryFilters, traverseQuerySort, traverseQueryFields } = traverse.traversals;
 
   const createValidateQuery = (options = {}) => {