@strapi/admin 4.20.4 → 5.0.0-alpha.0

package/dist/ee/server/index.mjs

@@ -1,18 +1,16 @@
-import EE from "@strapi/strapi/dist/utils/ee";
 import { resolve, basename, join, extname } from "path";
 import fse from "fs-extra";
 import koaStatic from "koa-static";
 import "@strapi/types";
 import { isNil, castArray, pipe, pickBy, get, keys, differenceWith, isEqual, getOr, has, clamp, difference, set, merge, map, uniq, isEmpty, toLower, isFunction, toString, toNumber, assign, reverse, take, prop, drop, pick, isString, defaultsDeep, forEach, filter, cond, stubTrue, flow, size, mean, max, sum, defaultTo, mapValues, curry, includes, isArray, omit, isUndefined, update, property } from "lodash/fp";
 import { differenceInHours, parseISO, add } from "date-fns";
-import { errors, mapAsync, pipeAsync, getAbsoluteAdminUrl, stringIncludes, reduceAsync, yup, validateYupSchema, env } from "@strapi/utils";
+import { errors, async, arrays, convertQueryParams, yup, validateYupSchema, env } from "@strapi/utils";
 import semver from "semver";
 import localProvider from "@strapi/provider-audit-logs-local";
 import { scheduleJob } from "node-schedule";
 import _ from "lodash";
 import { Strategy } from "passport-local";
 import passport$2 from "koa-passport";
-import "koa-bodyparser";
 import compose from "koa-compose";
 const registerAdminPanelRoute = ({ strapi: strapi2 }) => {
   let buildDir = resolve(strapi2.dirs.dist.root, "build");
@@ -83,7 +81,7 @@ const authenticate$2 = async (ctx) => {
   if (!isValid) {
     return { authenticated: false };
   }
-  const user2 = await strapi.query("admin::user").findOne({ where: { id: payload.id }, populate: ["roles"] });
+  const user2 = await strapi.db.query("admin::user").findOne({ where: { id: payload.id }, populate: ["roles"] });
   if (!user2 || !(user2.isActive === true)) {
     return { authenticated: false };
   }
@@ -168,7 +166,7 @@ const authenticate$1 = async (ctx) => {
   }
   const hoursSinceLastUsed = differenceInHours(currentDate, parseISO(apiToken.lastUsedAt));
   if (hoursSinceLastUsed >= 1) {
-    await strapi.query("admin::api-token").update({
+    await strapi.db.query("admin::api-token").update({
       where: { id: apiToken.id },
       data: { lastUsedAt: currentDate }
     });
@@ -221,9 +219,9 @@ const apiTokenAuthStrategy = {
 const executeCERegister = ({ strapi: strapi2 }) => {
   const passportMiddleware = strapi2.admin?.services.passport.init();
   strapi2.server.api("admin").use(passportMiddleware);
-  strapi2.container.get("auth").register("admin", adminAuthStrategy);
-  strapi2.container.get("auth").register("content-api", apiTokenAuthStrategy);
-  if (strapi2.config.serveAdminPanel) {
+  strapi2.get("auth").register("admin", adminAuthStrategy);
+  strapi2.get("auth").register("content-api", apiTokenAuthStrategy);
+  if (strapi2.config.get("admin.serveAdminPanel")) {
     registerAdminPanelRoute({ strapi: strapi2 });
   }
 };
@@ -277,7 +275,7 @@ async function migrateReviewWorkflowStagesColor({ oldContentTypes, contentTypes
   const hadColor = !!oldContentTypes?.["admin::workflow-stage"]?.attributes?.color;
   const hasColor = !!contentTypes?.["admin::workflow-stage"]?.attributes?.color;
   if (!hadColor && hasColor) {
-    await strapi.query("admin::workflow-stage").updateMany({
+    await strapi.db.query("admin::workflow-stage").updateMany({
       data: {
         color: STAGE_DEFAULT_COLOR
       }
@@ -297,8 +295,8 @@ async function migrateReviewWorkflowStagesRoles({ oldContentTypes, contentTypes
       `Migrating all existing review workflow stages to have RBAC permissions for all ${roleUID}.`
     );
     const stagePermissionsService = getService("stage-permissions");
-    const stages2 = await strapi.query(stageUID).findMany();
-    const roles2 = await strapi.query(roleUID).findMany();
+    const stages2 = await strapi.db.query(stageUID).findMany();
+    const roles2 = await strapi.db.query(roleUID).findMany();
     const groupedPermissions = {};
     roles2.map((role2) => role2.id).forEach((roleId) => {
       stages2.map((stage) => stage.id).forEach((stageId) => {
@@ -321,7 +319,8 @@ async function migrateReviewWorkflowStagesRoles({ oldContentTypes, contentTypes
         continue;
       }
       const stagePermissions2 = await stagePermissionsService.registerMany(permissions);
-      await strapi.entityService.update(STAGE_MODEL_UID, numericalStageId, {
+      await strapi.db.query(STAGE_MODEL_UID).update({
+        where: { id: numericalStageId },
         data: {
           permissions: stagePermissions2.flat().map((permission2) => permission2.id)
         }
@@ -337,7 +336,7 @@ async function migrateReviewWorkflowName({ oldContentTypes, contentTypes }) {
   const hadName = !!oldContentTypes?.[WORKFLOW_MODEL_UID]?.attributes?.name;
   const hasName = !!contentTypes?.[WORKFLOW_MODEL_UID]?.attributes?.name;
   if (!hadName && hasName) {
-    await strapi.query(WORKFLOW_MODEL_UID).updateMany({
+    await strapi.db.query(WORKFLOW_MODEL_UID).updateMany({
       where: {
         name: { $null: true }
       },
@@ -351,10 +350,10 @@ async function migrateWorkflowsContentTypes({ oldContentTypes, contentTypes }) {
   const hadContentTypes = !!oldContentTypes?.[WORKFLOW_MODEL_UID]?.attributes?.contentTypes;
   const hasContentTypes = !!contentTypes?.[WORKFLOW_MODEL_UID]?.attributes?.contentTypes;
   if (!hadContentTypes && hasContentTypes) {
-    await strapi.query(WORKFLOW_MODEL_UID).updateMany({ data: { contentTypes: [] } });
+    await strapi.db.query(WORKFLOW_MODEL_UID).updateMany({ data: { contentTypes: [] } });
     const contentTypes2 = pipe([pickBy(get("options.reviewWorkflows")), keys])(oldContentTypes);
     if (contentTypes2.length) {
-      await strapi.query(WORKFLOW_MODEL_UID).update({ where: { id: { $notNull: true } }, data: { contentTypes: contentTypes2 } });
+      await strapi.db.query(WORKFLOW_MODEL_UID).update({ where: { id: { $notNull: true } }, data: { contentTypes: contentTypes2 } });
     }
   }
 }
@@ -432,7 +431,7 @@ async function migrateStageAttribute({ oldContentTypes, contentTypes }) {
     const oldAttributeTableName = "strapi_review_workflows_stage";
     const newAttributeTableName = "strapi_stage";
     const tables = await findTables({ strapi }, new RegExp(oldAttributeTableName));
-    await mapAsync(tables, async (tableName) => {
+    await async.map(tables, async (tableName) => {
       const newTableName = tableName.replace(oldAttributeTableName, newAttributeTableName);
       const alreadyHasNextTable = await strapi.db.connection.schema.hasTable(newTableName);
       if (alreadyHasNextTable) {
@@ -473,15 +472,15 @@ const clampMaxStagesPerWorkflow = clamp(1, MAX_STAGES_PER_WORKFLOW);
 async function migrateDeletedCTInWorkflows({ oldContentTypes, contentTypes }) {
   const deletedContentTypes = difference(keys(oldContentTypes), keys(contentTypes)) ?? [];
   if (deletedContentTypes.length) {
-    await mapAsync(deletedContentTypes, async (deletedContentTypeUID) => {
-      const workflow2 = await strapi.query(WORKFLOW_MODEL_UID).findOne({
+    await async.map(deletedContentTypes, async (deletedContentTypeUID) => {
+      const workflow2 = await strapi.db.query(WORKFLOW_MODEL_UID).findOne({
         select: ["id", "contentTypes"],
         where: {
           contentTypes: getWorkflowContentTypeFilter({ strapi }, deletedContentTypeUID)
         }
       });
       if (workflow2) {
-        await strapi.query(WORKFLOW_MODEL_UID).update({
+        await strapi.db.query(WORKFLOW_MODEL_UID).update({
           where: { id: workflow2.id },
           data: {
             contentTypes: workflow2.contentTypes.filter(
@@ -545,7 +544,7 @@ const getEventMap = (defaultEvents2) => {
   }, {});
 };
 const getRetentionDays = (strapi2) => {
-  const licenseRetentionDays = EE.features.get("audit-logs")?.options.retentionDays;
+  const licenseRetentionDays = strapi2.ee.features.get("audit-logs")?.options.retentionDays;
   const userRetentionDays = strapi2.config.get("admin.auditLogs.retentionDays");
   if (licenseRetentionDays == null) {
     return userRetentionDays ?? DEFAULT_RETENTION_DAYS;
@@ -606,7 +605,7 @@ const createAuditLogsService = (strapi2) => {
         this.destroy();
       });
       state.provider = await localProvider.register({ strapi: strapi2 });
-      if (!EE.features.isEnabled("audit-logs")) {
+      if (!strapi2.ee.features.isEnabled("audit-logs")) {
         return this;
       }
       state.eventHubUnsubscribe = strapi2.eventHub.subscribe(handleEvent.bind(this));
@@ -681,15 +680,15 @@ const register = async ({ strapi: strapi2 }) => {
   if (auditLogsIsEnabled) {
     strapi2.hook("strapi::content-types.beforeSync").register(migrateAuditLogsTable);
     const auditLogsService = createAuditLogsService(strapi2);
-    strapi2.container.register("audit-logs", auditLogsService);
+    strapi2.add("audit-logs", auditLogsService);
     await auditLogsService.register();
   }
-  if (EE.features.isEnabled("review-workflows")) {
+  if (strapi2.ee.features.isEnabled("review-workflows")) {
     strapi2.hook("strapi::content-types.beforeSync").register(migrateStageAttribute);
     strapi2.hook("strapi::content-types.afterSync").register(migrateReviewWorkflowStagesColor).register(migrateReviewWorkflowStagesRoles).register(migrateReviewWorkflowName).register(migrateWorkflowsContentTypes).register(migrateDeletedCTInWorkflows);
     const reviewWorkflowService = getService("review-workflows");
     reviewWorkflowsMiddlewares.contentTypeMiddleware(strapi2);
-    await reviewWorkflowService.register(EE.features.get("review-workflows"));
+    await reviewWorkflowService.register(strapi2.ee.features.get("review-workflows"));
   }
   await executeCERegister({ strapi: strapi2 });
 };
@@ -1063,14 +1062,13 @@ const syncAuthSettings = async () => {
 };
 const syncAPITokensPermissions = async () => {
   const validPermissions = strapi.contentAPI.permissions.providers.action.keys();
-  const permissionsInDB = await pipeAsync(
-    strapi.query("admin::api-token-permission").findMany,
-    // @ts-expect-error lodash types
+  const permissionsInDB = await async.pipe(
+    strapi.db.query("admin::api-token-permission").findMany,
     map("action")
   )();
   const unknownPermissions = uniq(difference(permissionsInDB, validPermissions));
   if (unknownPermissions.length > 0) {
-    await strapi.query("admin::api-token-permission").deleteMany({ where: { action: { $in: unknownPermissions } } });
+    await strapi.db.query("admin::api-token-permission").deleteMany({ where: { action: { $in: unknownPermissions } } });
   }
 };
 const executeCEBootstrap = async ({ strapi: strapi2 }) => {
@@ -1090,7 +1088,7 @@ const executeCEBootstrap = async ({ strapi: strapi2 }) => {
   await userService.displayWarningIfUsersDontHaveRole();
   await syncAuthSettings();
   await syncAPITokensPermissions();
-  getService$1("metrics").sendUpdateProjectInformation();
+  getService$1("metrics").sendUpdateProjectInformation(strapi2);
   getService$1("metrics").startCron(strapi2);
   apiTokenService.checkSaltIsDefined();
   transferService.token.checkSaltIsDefined();
@@ -1168,20 +1166,19 @@ const actions = {
 };
 const bootstrap = async (args) => {
   const { actionProvider } = getService("permission");
-  if (EE.features.isEnabled("sso")) {
+  if (strapi.ee.features.isEnabled("sso")) {
     await actionProvider.registerMany(actions.sso);
   }
-  if (EE.features.isEnabled("audit-logs")) {
+  if (strapi.ee.features.isEnabled("audit-logs")) {
     await persistTablesWithPrefix("strapi_audit_logs");
     await actionProvider.registerMany(actions.auditLogs);
   }
-  if (EE.features.isEnabled("review-workflows")) {
+  if (strapi.ee.features.isEnabled("review-workflows")) {
     await persistTablesWithPrefix("strapi_workflows");
     const { bootstrap: rwBootstrap } = getService("review-workflows");
     await rwBootstrap();
     await actionProvider.registerMany(actions.reviewWorkflows);
-    const { decorator: decorator2 } = getService("review-workflows-decorator");
-    strapi.entityService.decorate(decorator2);
+    getService("review-workflows-decorator");
     await getService("review-workflows-weekly-metrics").registerCron();
   }
   await getService("seat-enforcement").seatEnforcementWorkflow();
@@ -1193,13 +1190,13 @@ const executeCEDestroy = async () => {
   await actionProvider.clear();
 };
 const destroy = async ({ strapi: strapi2 }) => {
-  if (EE.features.isEnabled("audit-logs")) {
-    strapi2.container.get("audit-logs").destroy();
+  if (strapi2.ee.features.isEnabled("audit-logs")) {
+    strapi2.get("audit-logs").destroy();
   }
   await executeCEDestroy();
 };
 const enableFeatureMiddleware = (featureName) => (ctx, next) => {
-  if (EE.features.isEnabled(featureName)) {
+  if (strapi.ee.features.isEnabled(featureName)) {
     return next();
   }
   ctx.status = 404;
@@ -1502,7 +1499,7 @@ const index$2 = {
   "review-workflows": reviewWorkflows$1
 };
 const isSsoLocked = async (user2) => {
-  if (!EE.features.isEnabled("sso")) {
+  if (!strapi.ee.features.isEnabled("sso")) {
     return false;
   }
   if (!user2) {
@@ -1517,7 +1514,7 @@ const isSsoLocked = async (user2) => {
   const roles2 = (
     // If the roles are pre-loaded for the given user, then use them
     user2.roles ?? // Otherwise, try to load the role based on the given user ID
-    await strapi.query("admin::user").load(user2, "roles", { roles: { fields: ["id"] } }) ?? // If the query fails somehow, default to an empty array
+    await strapi.db.query("admin::user").load(user2, "roles", { roles: { fields: ["id"] } }) ?? // If the query fails somehow, default to an empty array
     []
   );
   const isLocked = lockedRoles.some(
@@ -1530,14 +1527,14 @@ const isSsoLocked = async (user2) => {
 };
 const { ApplicationError: ApplicationError$6 } = errors;
 const forgotPassword = async ({ email: email2 } = {}) => {
-  const user2 = await strapi.query("admin::user").findOne({ where: { email: email2, isActive: true } });
+  const user2 = await strapi.db.query("admin::user").findOne({ where: { email: email2, isActive: true } });
   if (!user2 || await isSsoLocked(user2)) {
     return;
   }
   const resetPasswordToken = getService("token").createToken();
   await getService("user").updateById(user2.id, { resetPasswordToken });
-  const url = `${getAbsoluteAdminUrl(
-    strapi.config
+  const url = `${strapi.config.get(
+    "admin.absoluteUrl"
   )}/auth/reset-password?code=${resetPasswordToken}`;
   return strapi.plugin("email").service("email").sendTemplatedEmail(
     {
@@ -1555,7 +1552,7 @@ const forgotPassword = async ({ email: email2 } = {}) => {
   });
 };
 const resetPassword = async ({ resetPasswordToken, password: password2 } = {}) => {
-  const matchingUser = await strapi.query("admin::user").findOne({ where: { resetPasswordToken, isActive: true } });
+  const matchingUser = await strapi.db.query("admin::user").findOne({ where: { resetPasswordToken, isActive: true } });
   if (!matchingUser || await isSsoLocked(matchingUser)) {
     throw new ApplicationError$6();
   }
@@ -1631,13 +1628,13 @@ const createProviderRegistry = () => {
 const providerRegistry = createProviderRegistry();
 const errorMessage = "SSO is disabled. Its functionnalities cannot be accessed.";
 const getStrategyCallbackURL = (providerName) => {
-  if (!EE.features.isEnabled("sso")) {
+  if (!strapi.ee.features.isEnabled("sso")) {
     throw new Error(errorMessage);
   }
   return `/admin/connect/${providerName}`;
 };
 const syncProviderRegistryWithConfig = () => {
-  if (!EE.features.isEnabled("sso")) {
+  if (!strapi.ee.features.isEnabled("sso")) {
     throw new Error(errorMessage);
   }
   const { providers = [] } = strapi.config.get("admin.auth", {});
@@ -1666,7 +1663,7 @@ const localStrategyMiddleware = async ([error, user2, message], done) => {
   return done(error, user2, message);
 };
 const getPassportStrategies = () => {
-  if (!EE.features.isEnabled("sso")) {
+  if (!strapi.ee.features.isEnabled("sso")) {
     return [createLocalStrategy(strapi)];
   }
   const localStrategy = createLocalStrategy(strapi, localStrategyMiddleware);
@@ -1745,7 +1742,7 @@ const updateById = async (id, attributes) => {
   if (_.has(attributes, "roles")) {
     const lastAdminUser = await isLastSuperAdminUser(id);
     const superAdminRole = await getService("role").getSuperAdminWithUsersCount();
-    const willRemoveSuperAdminRole = !stringIncludes(attributes.roles, superAdminRole.id);
+    const willRemoveSuperAdminRole = !arrays.includesString(attributes.roles, superAdminRole.id);
     if (lastAdminUser && willRemoveSuperAdminRole) {
       throw new ValidationError$3("You must have at least one user with super admin role.");
     }
@@ -1758,7 +1755,7 @@ const updateById = async (id, attributes) => {
   }
   if (_.has(attributes, "password")) {
     const hashedPassword = await getService("auth").hashPassword(attributes.password);
-    const updatedUser2 = await strapi.query("admin::user").update({
+    const updatedUser2 = await strapi.db.query("admin::user").update({
       where: { id },
       data: {
         ...attributes,
@@ -1769,7 +1766,7 @@ const updateById = async (id, attributes) => {
     strapi.eventHub.emit("user.update", { user: sanitizeUser(updatedUser2) });
     return updatedUser2;
   }
-  const updatedUser = await strapi.query("admin::user").update({
+  const updatedUser = await strapi.db.query("admin::user").update({
     where: { id },
     data: attributes,
     populate: ["roles"]
@@ -1781,7 +1778,7 @@ const updateById = async (id, attributes) => {
   return updatedUser;
 };
 const deleteById = async (id) => {
-  const userToDelete = await strapi.query("admin::user").findOne({
+  const userToDelete = await strapi.db.query("admin::user").findOne({
     where: { id },
     populate: ["roles"]
   });
@@ -1796,14 +1793,14 @@ const deleteById = async (id) => {
       }
     }
   }
-  const deletedUser = await strapi.query("admin::user").delete({ where: { id }, populate: ["roles"] });
+  const deletedUser = await strapi.db.query("admin::user").delete({ where: { id }, populate: ["roles"] });
   await removeFromEEDisabledUsersList(id);
   strapi.eventHub.emit("user.delete", { user: sanitizeUser(deletedUser) });
   return deletedUser;
 };
 const deleteByIds = async (ids) => {
   const superAdminRole = await getService("role").getSuperAdminWithUsersCount();
-  const nbOfSuperAdminToDelete = await strapi.query("admin::user").count({
+  const nbOfSuperAdminToDelete = await strapi.db.query("admin::user").count({
     where: {
       id: ids,
       roles: { id: superAdminRole.id }
@@ -1814,7 +1811,7 @@ const deleteByIds = async (ids) => {
   }
   const deletedUsers = [];
   for (const id of ids) {
-    const deletedUser = await strapi.query("admin::user").delete({
+    const deletedUser = await strapi.db.query("admin::user").delete({
       where: { id },
       populate: ["roles"]
     });
@@ -1839,7 +1836,7 @@ const sanitizeUser = (user2) => {
   };
 };
 const findOne = async (id, populate = ["roles"]) => {
-  return strapi.entityService.findOne("admin::user", id, { populate });
+  return strapi.db.query("admin::user").findOne({ where: { id }, populate });
 };
 const getCurrentActiveUserCount = async () => {
   return strapi.db.query("admin::user").count({ where: { isActive: true } });
@@ -1856,40 +1853,35 @@ const getSSOProvidersList = async () => {
   const { providerRegistry: providerRegistry2 } = strapi.admin.services.passport;
   return providerRegistry2.getAll().map(({ uid }) => uid);
 };
-const sendUpdateProjectInformation = async () => {
+const sendUpdateProjectInformation = async (strapi2) => {
   let groupProperties = {};
   const numberOfActiveAdminUsers = await getService("user").count({ isActive: true });
   const numberOfAdminUsers = await getService("user").count();
-  if (EE.features.isEnabled("sso")) {
+  if (strapi2.ee.features.isEnabled("sso")) {
     const SSOProviders = await getSSOProvidersList();
     groupProperties = assign(groupProperties, {
       SSOProviders,
       isSSOConfigured: SSOProviders.length !== 0
     });
   }
-  if (EE.features.isEnabled("cms-content-releases")) {
-    const numberOfContentReleases = await strapi.entityService.count(
-      "plugin::content-releases.release"
-    );
-    const numberOfPublishedContentReleases = await strapi.entityService.count(
-      "plugin::content-releases.release",
-      {
-        filters: { $not: { releasedAt: null } }
-      }
-    );
+  if (strapi2.ee.features.isEnabled("cms-content-releases")) {
+    const numberOfContentReleases = await strapi2.db.query("plugin::content-releases.release").count();
+    const numberOfPublishedContentReleases = await strapi2.db.query("plugin::content-releases.release").count({
+      where: { $not: { releasedAt: null } }
+    });
     groupProperties = assign(groupProperties, {
       numberOfContentReleases,
       numberOfPublishedContentReleases
     });
   }
   groupProperties = assign(groupProperties, { numberOfActiveAdminUsers, numberOfAdminUsers });
-  strapi.telemetry.send("didUpdateProjectInformation", {
+  strapi2.telemetry.send("didUpdateProjectInformation", {
     groupProperties
   });
 };
 const startCron = (strapi2) => {
   strapi2.cron.add({
-    "0 0 0 * * *": () => sendUpdateProjectInformation()
+    "0 0 0 * * *": () => sendUpdateProjectInformation(strapi2)
   });
 };
 const metrics = { startCron, getSSOProvidersList, sendUpdateProjectInformation };
@@ -1958,7 +1950,7 @@ const syncDisabledUserRecords = async () => {
   });
 };
 const seatEnforcementWorkflow = async () => {
-  const adminSeats = EE.seats;
+  const adminSeats = strapi.ee.seats;
   if (isNil(adminSeats)) {
     return;
   }
@@ -1996,13 +1988,13 @@ const workflowsContentTypesFactory = ({ strapi: strapi2 }) => {
     async migrate({ srcContentTypes = [], destContentTypes, stageId }) {
       const workflowsService = getService("workflows", { strapi: strapi2 });
       const { created, deleted } = diffContentTypes(srcContentTypes, destContentTypes);
-      await mapAsync(
+      await async.map(
         created,
         async (uid) => {
           const srcWorkflows = await workflowsService._getAssignedWorkflows(uid, {});
           if (srcWorkflows.length) {
             await stagesService.updateEntitiesStage(uid, { toStageId: stageId });
-            await mapAsync(
+            await async.map(
               srcWorkflows,
               (srcWorkflow) => this.transferContentTypes(srcWorkflow, uid)
             );
@@ -2016,7 +2008,7 @@ const workflowsContentTypesFactory = ({ strapi: strapi2 }) => {
         // transferContentTypes can cause race conditions if called in parallel when updating the same workflow
         { concurrency: 1 }
       );
-      await mapAsync(deleted, async (uid) => {
+      await async.map(deleted, async (uid) => {
         await updateContentTypeConfig(uid, false);
         await stagesService.deleteAllEntitiesStage(uid, {});
       });
@@ -2027,7 +2019,10 @@ const workflowsContentTypesFactory = ({ strapi: strapi2 }) => {
      * @param {string} uid - The content type uid
      */
     async transferContentTypes(srcWorkflow, uid) {
-      await strapi2.entityService.update(WORKFLOW_MODEL_UID, srcWorkflow.id, {
+      await strapi2.db.query(WORKFLOW_MODEL_UID).update({
+        where: {
+          id: srcWorkflow.id
+        },
         data: {
           contentTypes: srcWorkflow.contentTypes.filter((contentType) => contentType !== uid)
         }
@@ -2068,7 +2063,12 @@ const workflows$1 = ({ strapi: strapi2 }) => {
     async find(opts = {}) {
       const filters = processFilters({ strapi: strapi2 }, opts.filters);
       const populate = processPopulate(opts.populate);
-      return strapi2.entityService.findMany(WORKFLOW_MODEL_UID, { ...opts, filters, populate });
+      const query = convertQueryParams.transformParamsToQuery(WORKFLOW_MODEL_UID, {
+        ...opts,
+        filters,
+        populate
+      });
+      return strapi2.db.query(WORKFLOW_MODEL_UID).findMany(query);
     },
     /**
      * Returns the workflow with the specified ID.
@@ -2076,9 +2076,13 @@ const workflows$1 = ({ strapi: strapi2 }) => {
      * @param {object} opts - Options for the query.
      * @returns {Promise<object>} - Workflow object matching the requested ID.
      */
-    findById(id, opts) {
+    findById(id, opts = {}) {
       const populate = processPopulate(opts.populate);
-      return strapi2.entityService.findOne(WORKFLOW_MODEL_UID, id, { ...opts, populate });
+      const query = convertQueryParams.transformParamsToQuery(WORKFLOW_MODEL_UID, { populate });
+      return strapi2.db.query(WORKFLOW_MODEL_UID).findOne({
+        ...query,
+        where: { id }
+      });
     },
     /**
      * Creates a new workflow.
@@ -2101,7 +2105,7 @@ const workflows$1 = ({ strapi: strapi2 }) => {
           });
         }
         metrics2.sendDidCreateWorkflow();
-        return strapi2.entityService.create(WORKFLOW_MODEL_UID, createOpts);
+        return strapi2.db.query(WORKFLOW_MODEL_UID).create(convertQueryParams.transformParamsToQuery(WORKFLOW_MODEL_UID, createOpts));
       });
     },
     /**
@@ -2133,7 +2137,11 @@ const workflows$1 = ({ strapi: strapi2 }) => {
           });
         }
         metrics2.sendDidEditWorkflow();
-        return strapi2.entityService.update(WORKFLOW_MODEL_UID, workflow2.id, updateOpts);
+        const query = convertQueryParams.transformParamsToQuery(WORKFLOW_MODEL_UID, updateOpts);
+        return strapi2.db.query(WORKFLOW_MODEL_UID).update({
+          ...query,
+          where: { id: workflow2.id }
+        });
       });
     },
     /**
@@ -2155,7 +2163,11 @@ const workflows$1 = ({ strapi: strapi2 }) => {
           srcContentTypes: workflow2.contentTypes,
           destContentTypes: []
         });
-        return strapi2.entityService.delete(WORKFLOW_MODEL_UID, workflow2.id, opts);
+        const query = convertQueryParams.transformParamsToQuery(WORKFLOW_MODEL_UID, opts);
+        return strapi2.db.query(WORKFLOW_MODEL_UID).delete({
+          ...query,
+          where: { id: workflow2.id }
+        });
       });
     },
     /**
@@ -2163,7 +2175,7 @@ const workflows$1 = ({ strapi: strapi2 }) => {
      * @returns {Promise<number>} - Total count of workflows.
      */
     count() {
-      return strapi2.entityService.count(WORKFLOW_MODEL_UID);
+      return strapi2.db.query(WORKFLOW_MODEL_UID).count();
     },
     /**
      * Finds the assigned workflow for a given content type ID.
@@ -2231,35 +2243,34 @@ const stages$1 = ({ strapi: strapi2 }) => {
   const workflowsValidationService = getService("review-workflows-validation", { strapi: strapi2 });
   return {
     find({ workflowId, populate }) {
-      const params = {
-        filters: { workflow: workflowId },
+      return strapi2.db.query(STAGE_MODEL_UID).findMany({
+        where: { workflow: workflowId },
         populate
-      };
-      return strapi2.entityService.findMany(STAGE_MODEL_UID, params);
+      });
     },
     findById(id, { populate } = {}) {
-      const params = {
+      return strapi2.db.query(STAGE_MODEL_UID).findOne({
+        where: { id },
         populate
-      };
-      return strapi2.entityService.findOne(STAGE_MODEL_UID, id, params);
+      });
     },
     async createMany(stagesList, { fields } = {}) {
       const params = { select: fields ?? "*" };
       const stages2 = await Promise.all(
         stagesList.map(
-          (stage) => strapi2.entityService.create(STAGE_MODEL_UID, {
+          (stage) => strapi2.db.query(STAGE_MODEL_UID).create({
             data: sanitizeStageFields(stage),
             ...params
           })
         )
       );
-      await reduceAsync(stagesList)(async (_2, stage, idx) => {
+      await async.reduce(stagesList)(async (_2, stage, idx) => {
         if (!stage.permissions || stage.permissions.length === 0) {
           return;
         }
         const stagePermissions2 = stage.permissions;
         const stageId = stages2[idx].id;
-        const permissions = await mapAsync(
+        const permissions = await async.map(
           stagePermissions2,
           // Register each stage permission
           (permission2) => stagePermissionsService.register({
@@ -2268,7 +2279,8 @@ const stages$1 = ({ strapi: strapi2 }) => {
             fromStage: stageId
           })
         );
-        await strapi2.entityService.update(STAGE_MODEL_UID, stageId, {
+        await strapi2.db.query(STAGE_MODEL_UID).update({
+          where: { id: stageId },
           data: {
             permissions: permissions.flat().map((p) => p.id)
           }
@@ -2282,7 +2294,7 @@ const stages$1 = ({ strapi: strapi2 }) => {
       const stageId = destStage.id;
       if (destStage.permissions) {
         await this.deleteStagePermissions([srcStage]);
-        const permissions = await mapAsync(
+        const permissions = await async.map(
           destStage.permissions,
           (permission2) => stagePermissionsService.register({
             roleId: permission2.role,
@@ -2292,7 +2304,8 @@ const stages$1 = ({ strapi: strapi2 }) => {
         );
         stagePermissions2 = permissions.flat().map((p) => p.id);
       }
-      const stage = await strapi2.entityService.update(STAGE_MODEL_UID, stageId, {
+      const stage = await strapi2.db.query(STAGE_MODEL_UID).update({
+        where: { id: stageId },
         data: {
           ...destStage,
           permissions: stagePermissions2
@@ -2303,14 +2316,16 @@ const stages$1 = ({ strapi: strapi2 }) => {
     },
     async delete(stage) {
       await this.deleteStagePermissions([stage]);
-      const deletedStage = await strapi2.entityService.delete(STAGE_MODEL_UID, stage.id);
+      const deletedStage = await strapi2.db.query(STAGE_MODEL_UID).delete({
+        where: { id: stage.id }
+      });
       metrics2.sendDidDeleteStage();
       return deletedStage;
     },
     async deleteMany(stages2) {
       await this.deleteStagePermissions(stages2);
-      return strapi2.entityService.deleteMany(STAGE_MODEL_UID, {
-        filters: { id: { $in: stages2.map((s) => s.id) } }
+      return strapi2.db.query(STAGE_MODEL_UID).deleteMany({
+        where: { id: { $in: stages2.map((s) => s.id) } }
       });
     },
     async deleteStagePermissions(stages2) {
@@ -2324,7 +2339,7 @@ const stages$1 = ({ strapi: strapi2 }) => {
           workflow: workflowId
         };
       }
-      return strapi2.entityService.count(STAGE_MODEL_UID, opts);
+      return strapi2.db.query(STAGE_MODEL_UID).count(opts);
     },
     async replaceStages(srcStages, destStages, contentTypesToMigrate = []) {
       const { created, updated, deleted } = getDiffBetweenStages(srcStages, destStages);
@@ -2332,11 +2347,11 @@ const stages$1 = ({ strapi: strapi2 }) => {
       return strapi2.db.transaction(async ({ trx }) => {
         const createdStages = await this.createMany(created, { fields: ["id"] });
         const createdStagesIds = map("id", createdStages);
-        await mapAsync(updated, (destStage) => {
+        await async.map(updated, (destStage) => {
           const srcStage = srcStages.find((s) => s.id === destStage.id);
           return this.update(srcStage, destStage);
         });
-        await mapAsync(deleted, async (stage) => {
+        await async.map(deleted, async (stage) => {
           const nearestStage = findNearestMatchingStage(
             [...srcStages, ...createdStages],
             srcStages.findIndex((s) => s.id === stage.id),
@@ -2344,7 +2359,7 @@ const stages$1 = ({ strapi: strapi2 }) => {
               return !deleted.find((s) => s.id === targetStage.id);
             }
           );
-          await mapAsync(contentTypesToMigrate, (contentTypeUID) => {
+          await async.map(contentTypesToMigrate, (contentTypeUID) => {
             this.updateEntitiesStage(contentTypeUID, {
               fromStageId: stage.id,
               toStageId: nearestStage.id,
@@ -2373,8 +2388,10 @@ const stages$1 = ({ strapi: strapi2 }) => {
       if (!stage) {
         throw new ApplicationError$3(`Selected stage does not exist`);
       }
-      const entity = await strapi2.entityService.update(entityInfo.modelUID, entityInfo.id, {
-        // @ts-expect-error - entity service can not receive any type of attribute
+      const entity = await strapi2.db.query(entityInfo.modelUID).update({
+        where: {
+          id: entityInfo.id
+        },
         data: { [ENTITY_STAGE_ATTRIBUTE]: stageId },
         populate: [ENTITY_STAGE_ATTRIBUTE]
       });
@@ -2487,7 +2504,7 @@ const stagePermissions = ({ strapi: strapi2 }) => {
       return permissions;
     },
     async registerMany(permissions) {
-      return mapAsync(permissions, this.register);
+      return async.map(permissions, this.register);
     },
     async unregister(permissions) {
       const permissionIds = permissions.map(prop("id"));
@@ -2514,9 +2531,10 @@ const assignees$1 = ({ strapi: strapi2 }) => {
   const metrics2 = getService("review-workflows-metrics", { strapi: strapi2 });
   return {
     async findEntityAssigneeId(id, model) {
-      const entity = await strapi2.entityService.findOne(model, id, {
+      const entity = await strapi2.db.query(model).findOne({
+        where: { id },
         populate: [ENTITY_ASSIGNEE_ATTRIBUTE],
-        fields: []
+        select: []
       });
       return entity?.[ENTITY_ASSIGNEE_ATTRIBUTE]?.id ?? null;
     },
@@ -2532,20 +2550,20 @@ const assignees$1 = ({ strapi: strapi2 }) => {
         throw new ApplicationError$1(`Selected user does not exist`);
       }
       metrics2.sendDidEditAssignee(await this.findEntityAssigneeId(id, model), assigneeId);
-      return strapi2.entityService.update(model, id, {
-        // @ts-expect-error check entity service types
+      return strapi2.db.query(model).update({
+        where: { id },
         data: { [ENTITY_ASSIGNEE_ATTRIBUTE]: assigneeId },
         populate: [ENTITY_ASSIGNEE_ATTRIBUTE],
-        fields: []
+        select: []
       });
     },
     async deleteEntityAssignee(id, model) {
       metrics2.sendDidEditAssignee(await this.findEntityAssigneeId(id, model), null);
-      return strapi2.entityService.update(model, id, {
-        // @ts-expect-error check entity service types
+      return strapi2.db.query(model).update({
+        where: { id },
         data: { [ENTITY_ASSIGNEE_ATTRIBUTE]: null },
         populate: [ENTITY_ASSIGNEE_ATTRIBUTE],
-        fields: []
+        select: []
       });
     }
   };
@@ -2585,21 +2603,15 @@ async function initDefaultWorkflow({ workflowsService, stagesService }) {
   if (wfCount === 0 && stagesCount === 0) {
     const workflow2 = {
       ...defaultWorkflow,
+      contentTypes: [],
       stages: defaultStages
     };
     await workflowsService.create({ data: workflow2 });
   }
 }
-function extendReviewWorkflowContentTypes({ strapi: strapi2 }) {
-  const extendContentType = (contentTypeUID) => {
-    const assertContentTypeCompatibility = (contentType) => contentType.collectionName.length <= MAX_CONTENT_TYPE_NAME_LEN;
-    const incompatibleContentTypeAlert = (contentType) => {
-      strapi2.log.warn(
-        `Review Workflow cannot be activated for the content type with the name '${contentType.info.displayName}' because the name exceeds the maximum length of ${MAX_CONTENT_TYPE_NAME_LEN} characters.`
-      );
-      return contentType;
-    };
-    const setRelation = (path, target) => set(path, {
+const setRelation = (attributeName, target) => (contentType) => {
+  Object.assign(contentType.attributes, {
+    [attributeName]: {
       writable: true,
       private: false,
       configurable: false,
@@ -2609,16 +2621,30 @@ function extendReviewWorkflowContentTypes({ strapi: strapi2 }) {
       type: "relation",
       relation: "oneToOne",
       target
-    });
-    const setReviewWorkflowAttributes = pipe([
-      setRelation(`attributes.${ENTITY_STAGE_ATTRIBUTE}`, STAGE_MODEL_UID),
-      setRelation(`attributes.${ENTITY_ASSIGNEE_ATTRIBUTE}`, "admin::user")
-    ]);
+    }
+  });
+  return contentType;
+};
+const setStageAttribute = setRelation(ENTITY_STAGE_ATTRIBUTE, STAGE_MODEL_UID);
+const setAssigneeAttribute = setRelation(ENTITY_ASSIGNEE_ATTRIBUTE, "admin::user");
+const setReviewWorkflowAttributes = (contentType) => {
+  setStageAttribute(contentType);
+  setAssigneeAttribute(contentType);
+};
+function extendReviewWorkflowContentTypes({ strapi: strapi2 }) {
+  const extendContentType = (contentTypeUID) => {
+    const assertContentTypeCompatibility = (contentType) => contentType.collectionName.length <= MAX_CONTENT_TYPE_NAME_LEN;
+    const incompatibleContentTypeAlert = (contentType) => {
+      strapi2.log.warn(
+        `Review Workflow cannot be activated for the content type with the name '${contentType.info.displayName}' because the name exceeds the maximum length of ${MAX_CONTENT_TYPE_NAME_LEN} characters.`
+      );
+      return contentType;
+    };
     const extendContentTypeIfCompatible = cond([
       [assertContentTypeCompatibility, setReviewWorkflowAttributes],
       [stubTrue, incompatibleContentTypeAlert]
     ]);
-    strapi2.container.get("content-types").extend(contentTypeUID, extendContentTypeIfCompatible);
+    strapi2.get("content-types").extend(contentTypeUID, extendContentTypeIfCompatible);
   };
   pipe([
     getVisibleContentTypesUID,
@@ -2726,7 +2752,8 @@ const getDataWithStage = async (workflow2, data) => {
   return data;
 };
 const getEntityStage = async (uid, id) => {
-  const entity = await strapi.entityService.findOne(uid, id, {
+  const entity = await strapi.db.query(uid).findOne({
+    where: { id },
     populate: {
       [ENTITY_STAGE_ATTRIBUTE]: {
         populate: {
@@ -3073,7 +3100,7 @@ const rolesDeleteSchema = yup.object().shape({
     async function rolesDeletionChecks(ids) {
       try {
         await strapi.admin.services.role.checkRolesIdForDeletion(ids);
-        if (EE.features.isEnabled("sso")) {
+        if (strapi.ee.features.isEnabled("sso")) {
           await strapi.admin.services.role.ssoCheckRolesIdForDeletion(ids);
         }
       } catch (e) {
@@ -3089,7 +3116,7 @@ const roleDeleteSchema = yup.strapiID().required().test(
   async function noAdminSingleDelete(id) {
     try {
       await strapi.admin.services.role.checkRolesIdForDeletion([id]);
-      if (EE.features.isEnabled("sso")) {
+      if (strapi.ee.features.isEnabled("sso")) {
         await strapi.admin.services.role.ssoCheckRolesIdForDeletion([id]);
       }
     } catch (e) {
@@ -3393,7 +3420,7 @@ const ssoUserCreationInputExtension = yup.object().shape({
 }).noUnknown();
 const validateUserCreationInput = (data) => {
   let schema = schemas.userCreationSchema;
-  if (EE.features.isEnabled("sso")) {
+  if (strapi.ee.features.isEnabled("sso")) {
     schema = schema.concat(ssoUserCreationInputExtension);
   }
   return validateYupSchema(schema)(data);
@@ -3404,7 +3431,7 @@ const hasAdminSeatsAvaialble = async () => {
   if (!strapi.EE) {
     return true;
   }
-  const permittedSeats = EE.seats;
+  const permittedSeats = strapi.ee.seats;
   if (isNil(permittedSeats)) {
     return true;
   }
@@ -3481,13 +3508,13 @@ const auditLogs = {
   async findMany(ctx) {
     const { query } = ctx.request;
     await validateFindMany(query);
-    const auditLogs2 = strapi.container.get("audit-logs");
+    const auditLogs2 = strapi.get("audit-logs");
     const body = await auditLogs2.findMany(query);
     ctx.body = body;
   },
   async findOne(ctx) {
     const { id } = ctx.params;
-    const auditLogs2 = strapi.container.get("audit-logs");
+    const auditLogs2 = strapi.get("audit-logs");
     const body = await auditLogs2.findOne(id);
     ctx.body = body;
     strapi.telemetry.send("didWatchAnAuditLog");
@@ -3498,13 +3525,13 @@ const admin = {
   async getProjectType() {
     const flags = strapi.config.get("admin.flags", {});
     try {
-      return { data: { isEE: strapi.EE, features: EE.features.list(), flags } };
+      return { data: { isEE: strapi.EE, features: strapi.ee.features.list(), flags } };
     } catch (err) {
       return { data: { isEE: false, features: [], flags } };
     }
   },
   async licenseLimitInformation() {
-    const permittedSeats = EE.seats;
+    const permittedSeats = strapi.ee.seats;
     let shouldNotify = false;
     let licenseLimitStatus = null;
     let enforcementUserCount;
@@ -3531,7 +3558,7 @@ const admin = {
       shouldStopCreate: isNil(permittedSeats) ? false : currentActiveUserCount >= permittedSeats,
       licenseLimitStatus,
       isHostedOnStrapiCloud: env("STRAPI_HOSTING", null) === "strapi.cloud",
-      features: EE.features.list() ?? []
+      features: strapi.ee.features.list() ?? []
     };
     return { data };
   }
@@ -3692,7 +3719,7 @@ const workflows = {
       workflowService.count()
     ]);
     ctx.body = {
-      data: await mapAsync(workflows2, sanitizeOutput),
+      data: await async.map(workflows2, sanitizeOutput),
       meta: {
         workflowCount
       }
@@ -3742,7 +3769,7 @@ const stages = {
       populate
     });
     ctx.body = {
-      data: await mapAsync(stages2, sanitizer)
+      data: await async.map(stages2, sanitizer)
     };
   },
   /**
@@ -3782,7 +3809,8 @@ const stages = {
     const { model_uid: modelUID, id } = ctx.params;
     const { body } = ctx.request;
     const { sanitizeOutput } = strapi.plugin("content-manager").service("permission-checker").create({ userAbility: ctx.state.userAbility, model: modelUID });
-    const entity = await strapi.entityService.findOne(modelUID, Number(id), {
+    const entity = await strapi.db.query(modelUID).findOne({
+      where: { id },
       populate: [ENTITY_STAGE_ATTRIBUTE]
     });
     if (!entity) {
@@ -3820,7 +3848,8 @@ const stages = {
     if (strapi.plugin("content-manager").service("permission-checker").create({ userAbility: ctx.state.userAbility, model: modelUID }).cannot.read()) {
       return ctx.forbidden();
     }
-    const entity = await strapi.entityService.findOne(modelUID, Number(id), {
+    const entity = await strapi.db.query(modelUID).findOne({
+      where: { id },
       populate: [ENTITY_STAGE_ATTRIBUTE]
     });
     if (!entity) {