From 25e62db93aad5570067839399b8d0861d9c75a8e Mon Sep 17 00:00:00 2001
From: Convly <jean-sebastien.herbaux@epitech.eu>
Date: Wed, 10 Nov 2021 17:08:54 +0100
Subject: [PATCH] use 'sanitizers' instead of 'utils'

---
 .../services/permission/permissions-manager/sanitize.js     | 2 +-
 .../core/content-manager/server/services/entity-manager.js  | 5 ++++-
 packages/core/strapi/lib/services/entity-service/index.js   | 2 +-
 packages/core/upload/server/services/upload.js              | 2 +-
 packages/core/utils/lib/sanitize/index.js                   | 6 +++---
 .../core/utils/lib/sanitize/{utils.js => sanitizers.js}     | 0
 packages/plugins/users-permissions/server/services/user.js  | 2 +-
 7 files changed, 11 insertions(+), 8 deletions(-)
 rename packages/core/utils/lib/sanitize/{utils.js => sanitizers.js} (100%)

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 3824cd327f..2fef07ee25 100644
--- a/packages/core/admin/server/services/permission/permissions-manager/sanitize.js
+++ b/packages/core/admin/server/services/permission/permissions-manager/sanitize.js
@@ -50,7 +50,7 @@ module.exports = ({ action, ability, model }) => {
       // Remove not allowed fields (RBAC)
       traverseEntity(allowedFields(permittedFields), { schema }),
       // Remove all fields of type 'password'
-      sanitize.utils.sanitizePasswords(schema)
+      sanitize.sanitizers.sanitizePasswords(schema)
     );
   };
 
diff --git a/packages/core/content-manager/server/services/entity-manager.js b/packages/core/content-manager/server/services/entity-manager.js
index 585236c729..396305177a 100644
--- a/packages/core/content-manager/server/services/entity-manager.js
+++ b/packages/core/content-manager/server/services/entity-manager.js
@@ -15,7 +15,10 @@ const wrapWithEmitEvent = (event, fn) => async (entity, model) => {
   const result = await fn(entity, model);
 
   const modelDef = strapi.getModel(model);
-  const sanitizedEntity = await strapiUtils.sanitize.utils.defaultSanitizeOutput(modelDef, entity);
+  const sanitizedEntity = await strapiUtils.sanitize.sanitizers.defaultSanitizeOutput(
+    modelDef,
+    entity
+  );
 
   strapi.eventHub.emit(event, {
     model: modelDef.modelName,
diff --git a/packages/core/strapi/lib/services/entity-service/index.js b/packages/core/strapi/lib/services/entity-service/index.js
index a08619232b..5ea56d67fb 100644
--- a/packages/core/strapi/lib/services/entity-service/index.js
+++ b/packages/core/strapi/lib/services/entity-service/index.js
@@ -94,7 +94,7 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
 
   async emitEvent(uid, event, entity) {
     const model = strapi.getModel(uid);
-    const sanitizedEntity = await sanitize.utils.defaultSanitizeOutput(model, entity);
+    const sanitizedEntity = await sanitize.sanitizers.defaultSanitizeOutput(model, entity);
 
     eventHub.emit(event, {
       model: model.modelName,
diff --git a/packages/core/upload/server/services/upload.js b/packages/core/upload/server/services/upload.js
index 286932e3b2..9da35f9109 100644
--- a/packages/core/upload/server/services/upload.js
+++ b/packages/core/upload/server/services/upload.js
@@ -47,7 +47,7 @@ const sendMediaMetrics = data => {
 module.exports = ({ strapi }) => ({
   async emitEvent(event, data) {
     const modelDef = strapi.getModel('plugin::upload.file');
-    const sanitizedData = await sanitize.utils.defaultSanitizeOutput(modelDef, data);
+    const sanitizedData = await sanitize.sanitizers.defaultSanitizeOutput(modelDef, data);
 
     strapi.eventHub.emit(event, { media: sanitizedData });
   },
diff --git a/packages/core/utils/lib/sanitize/index.js b/packages/core/utils/lib/sanitize/index.js
index 5ea6625fc9..8ae833c328 100644
--- a/packages/core/utils/lib/sanitize/index.js
+++ b/packages/core/utils/lib/sanitize/index.js
@@ -7,7 +7,7 @@ const { getNonWritableAttributes } = require('../content-types');
 const pipeAsync = require('../pipe-async');
 
 const visitors = require('./visitors');
-const utils = require('./utils');
+const sanitizers = require('./sanitizers');
 
 module.exports = {
   contentAPI: {
@@ -36,7 +36,7 @@ module.exports = {
         return Promise.all(data.map(entry => this.output(entry, schema, { auth })));
       }
 
-      const transforms = [utils.defaultSanitizeOutput(schema)];
+      const transforms = [sanitizers.defaultSanitizeOutput(schema)];
 
       if (auth) {
         transforms.push(traverseEntity(visitors.removeRestrictedRelations(auth), { schema }));
@@ -46,6 +46,6 @@ module.exports = {
     },
   },
 
-  utils,
+  sanitizers,
   visitors,
 };
diff --git a/packages/core/utils/lib/sanitize/utils.js b/packages/core/utils/lib/sanitize/sanitizers.js
similarity index 100%
rename from packages/core/utils/lib/sanitize/utils.js
rename to packages/core/utils/lib/sanitize/sanitizers.js
diff --git a/packages/plugins/users-permissions/server/services/user.js b/packages/plugins/users-permissions/server/services/user.js
index 46376ebcfa..abacda3d54 100644
--- a/packages/plugins/users-permissions/server/services/user.js
+++ b/packages/plugins/users-permissions/server/services/user.js
@@ -128,7 +128,7 @@ module.exports = ({ strapi }) => ({
       .then(storeEmail => storeEmail['email_confirmation'].options);
 
     // Sanitize the template's user information
-    const sanitizedUserInfo = await sanitize.utils.defaultSanitizeOutput(userSchema, user);
+    const sanitizedUserInfo = await sanitize.sanitizers.defaultSanitizeOutput(userSchema, user);
 
     const confirmationToken = crypto.randomBytes(20).toString('hex');