@strapi/admin 5.0.0-beta.2 → 5.0.0-beta.4

package/dist/package.json.d.ts

@@ -1,6 +1,6 @@
 declare const _default: {
   "name": "@strapi/admin",
-  "version": "5.0.0-beta.1",
+  "version": "5.0.0-beta.3",
   "description": "Strapi Admin",
   "repository": {
     "type": "git",
@@ -78,13 +78,13 @@ declare const _default: {
     "@radix-ui/react-context": "1.0.1",
     "@radix-ui/react-toolbar": "1.0.4",
     "@reduxjs/toolkit": "1.9.7",
-    "@strapi/design-system": "1.16.0",
+    "@strapi/design-system": "1.17.0",
     "@strapi/icons": "1.16.0",
-    "@strapi/permissions": "5.0.0-beta.1",
-    "@strapi/provider-audit-logs-local": "5.0.0-beta.1",
-    "@strapi/types": "5.0.0-beta.1",
-    "@strapi/typescript-utils": "5.0.0-beta.1",
-    "@strapi/utils": "5.0.0-beta.1",
+    "@strapi/permissions": "5.0.0-beta.3",
+    "@strapi/provider-audit-logs-local": "5.0.0-beta.3",
+    "@strapi/types": "5.0.0-beta.3",
+    "@strapi/typescript-utils": "5.0.0-beta.3",
+    "@strapi/utils": "5.0.0-beta.3",
     "@testing-library/dom": "9.2.0",
     "@testing-library/react": "14.0.0",
     "@testing-library/user-event": "14.4.3",
@@ -106,11 +106,11 @@ declare const _default: {
     "invariant": "^2.2.4",
     "js-cookie": "2.2.1",
     "jsonwebtoken": "9.0.0",
-    "koa": "2.13.4",
+    "koa": "2.15.2",
     "koa-compose": "4.1.0",
-    "koa-passport": "5.0.0",
+    "koa-passport": "6.0.0",
     "koa-static": "5.0.0",
-    "koa2-ratelimit": "^1.1.2",
+    "koa2-ratelimit": "^1.1.3",
     "lodash": "4.17.21",
     "msw": "1.3.0",
     "node-schedule": "2.1.0",
@@ -140,9 +140,9 @@ declare const _default: {
     "zod": "^3.22.4"
   },
   "devDependencies": {
-    "@strapi/admin-test-utils": "5.0.0-beta.1",
-    "@strapi/data-transfer": "5.0.0-beta.1",
-    "@strapi/pack-up": "5.0.0-beta.1",
+    "@strapi/admin-test-utils": "5.0.0-beta.3",
+    "@strapi/data-transfer": "5.0.0-beta.3",
+    "@strapi/pack-up": "5.0.0",
     "@types/codemirror5": "npm:@types/codemirror@^5.60.15",
     "@types/invariant": "2.2.36",
     "@types/js-cookie": "3.0.6",
@@ -158,7 +158,7 @@ declare const _default: {
     "@types/react-window": "1.8.8",
     "@types/sanitize-html": "2.11.0",
     "@vitejs/plugin-react-swc": "3.6.0",
-    "koa-body": "4.2.0",
+    "koa-body": "6.0.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-router-dom": "6.22.3",

package/dist/server/index.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const fp = require("lodash/fp");
 const utils$1 = require("@strapi/utils");
-require("@strapi/types");
 const path = require("path");
 const fse = require("fs-extra");
 const koaStatic = require("koa-static");
 const dateFns = require("date-fns");
-const _$1 = require("lodash");
+require("@strapi/types");
+const _ = require("lodash");
 const bcrypt = require("bcryptjs");
 const passport$1 = require("koa-passport");
 const passportLocal = require("passport-local");
@@ -24,11 +24,29 @@ const zod = require("zod");
 const compose = require("koa-compose");
 const dataTransfer$1 = require("@strapi/data-transfer");
 const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
+function _interopNamespace(e) {
+  if (e && e.__esModule)
+    return e;
+  const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
+  if (e) {
+    for (const k in e) {
+      if (k !== "default") {
+        const d = Object.getOwnPropertyDescriptor(e, k);
+        Object.defineProperty(n, k, d.get ? d : {
+          enumerable: true,
+          get: () => e[k]
+        });
+      }
+    }
+  }
+  n.default = e;
+  return Object.freeze(n);
+}
 const utils__default = /* @__PURE__ */ _interopDefault(utils$1);
 const path__default = /* @__PURE__ */ _interopDefault(path);
 const fse__default = /* @__PURE__ */ _interopDefault(fse);
 const koaStatic__default = /* @__PURE__ */ _interopDefault(koaStatic);
-const ___default = /* @__PURE__ */ _interopDefault(_$1);
+const ___namespace = /* @__PURE__ */ _interopNamespace(_);
 const bcrypt__default = /* @__PURE__ */ _interopDefault(bcrypt);
 const passport__default = /* @__PURE__ */ _interopDefault(passport$1);
 const crypto__default = /* @__PURE__ */ _interopDefault(crypto);
@@ -560,7 +578,7 @@ const apiTokenAuthStrategy = {
   verify: verify$2
 };
 const register$1 = ({ strapi: strapi2 }) => {
-  const passportMiddleware = strapi2.admin?.services.passport.init();
+  const passportMiddleware = strapi2.service("admin::passport").init();
   strapi2.server.api("admin").use(passportMiddleware);
   strapi2.get("auth").register("admin", adminAuthStrategy);
   strapi2.get("auth").register("content-api", apiTokenAuthStrategy);
@@ -602,10 +620,10 @@ const hasPermissionsSchema = utils$1.yup.object({
   actions: utils$1.yup.array().of(
     // @ts-expect-error yup types
     utils$1.yup.lazy((val) => {
-      if (___default.default.isArray(val)) {
+      if (___namespace.default.isArray(val)) {
         return utils$1.yup.array().of(utils$1.yup.string()).min(1).max(2);
       }
-      if (___default.default.isString(val)) {
+      if (___namespace.default.isString(val)) {
         return utils$1.yup.string().required();
       }
       return utils$1.yup.object().shape({
@@ -619,16 +637,16 @@ const validateHasPermissionsInput = utils$1.validateYupSchema(hasPermissionsSche
 const { createPolicy: createPolicy$1 } = utils$1.policy;
 const inputModifiers = [
   {
-    check: ___default.default.isString,
+    check: ___namespace.default.isString,
     transform: (action2) => ({ action: action2 })
   },
   {
-    check: ___default.default.isArray,
+    check: ___namespace.default.isArray,
     transform: (arr) => ({ action: arr[0], subject: arr[1] })
   },
   {
     // Has to be after the isArray check since _.isObject also matches arrays
-    check: ___default.default.isObject,
+    check: ___namespace.default.isObject,
     transform: (perm) => perm
   }
 ];
@@ -1372,7 +1390,7 @@ const forgotPassword = async ({ email: email2 } = {}) => {
     strapi.config.get("admin.forgotPassword.emailTemplate"),
     {
       url,
-      user: ___default.default.pick(user2, ["email", "firstname", "lastname", "username"])
+      user: ___namespace.default.pick(user2, ["email", "firstname", "lastname", "username"])
     }
   ).catch((err) => {
     strapi.log.error(err);
@@ -1462,7 +1480,7 @@ const actionDomain = {
   sanitizeActionAttributes
 };
 const checkFieldsAreCorrectlyNested = (fields) => {
-  if (___default.default.isNil(fields)) {
+  if (___namespace.default.isNil(fields)) {
     return true;
   }
   if (!Array.isArray(fields)) {
@@ -1479,13 +1497,13 @@ const checkFieldsAreCorrectlyNested = (fields) => {
   return !failed;
 };
 const checkFieldsDontHaveDuplicates = (fields) => {
-  if (___default.default.isNil(fields)) {
+  if (___namespace.default.isNil(fields)) {
     return true;
   }
   if (!Array.isArray(fields)) {
     return false;
   }
-  return ___default.default.uniq(fields).length === fields.length;
+  return ___namespace.default.uniq(fields).length === fields.length;
 };
 const getActionFromProvider = (actionId) => {
   return getService("permission").actionProvider.get(actionId);
@@ -1500,10 +1518,10 @@ const isAPluginName = utils$1.yup.string().test("is-a-plugin-name", "is not a pl
   return [void 0, "admin", ...Object.keys(strapi.plugins)].includes(value) ? true : this.createError({ path: this.path, message: `${this.path} is not an existing plugin` });
 });
 const arrayOfConditionNames = utils$1.yup.array().of(utils$1.yup.string()).test("is-an-array-of-conditions", "is not a plugin name", function(value) {
-  const ids = strapi.admin.services.permission.conditionProvider.keys();
-  return ___default.default.isUndefined(value) || ___default.default.difference(value, ids).length === 0 ? true : this.createError({ path: this.path, message: `contains conditions that don't exist` });
+  const ids = strapi.service("admin::permission").conditionProvider.keys();
+  return ___namespace.default.isUndefined(value) || ___namespace.default.difference(value, ids).length === 0 ? true : this.createError({ path: this.path, message: `contains conditions that don't exist` });
 });
-const permissionsAreEquals = (a, b) => a.action === b.action && (a.subject === b.subject || ___default.default.isNil(a.subject) && ___default.default.isNil(b.subject));
+const permissionsAreEquals = (a, b) => a.action === b.action && (a.subject === b.subject || ___namespace.default.isNil(a.subject) && ___namespace.default.isNil(b.subject));
 const checkNoDuplicatedPermissions = (permissions2) => !Array.isArray(permissions2) || permissions2.every(
   (permA, i) => permissions2.slice(i + 1).every((permB) => !permissionsAreEquals(permA, permB))
 );
@@ -1610,10 +1628,10 @@ const validators = {
 };
 const { SUPER_ADMIN_CODE: SUPER_ADMIN_CODE$2 } = constants$3;
 const { ValidationError: ValidationError$4 } = utils$1.errors;
-const sanitizeUserRoles = (role2) => ___default.default.pick(role2, ["id", "name", "description", "code"]);
+const sanitizeUserRoles = (role2) => ___namespace.default.pick(role2, ["id", "name", "description", "code"]);
 const sanitizeUser = (user2) => {
   return {
-    ...___default.default.omit(user2, ["password", "resetPasswordToken", "registrationToken", "roles"]),
+    ...___namespace.default.omit(user2, ["password", "resetPasswordToken", "registrationToken", "roles"]),
     roles: user2.roles && user2.roles.map(sanitizeUserRoles)
   };
 };
@@ -1622,7 +1640,7 @@ const create$5 = async (attributes) => {
     registrationToken: getService("token").createToken(),
     ...attributes
   };
-  if (___default.default.has(attributes, "password")) {
+  if (___namespace.default.has(attributes, "password")) {
     userInfo.password = await getService("auth").hashPassword(attributes.password);
   }
   const user2 = createUser(userInfo);
@@ -1632,7 +1650,7 @@ const create$5 = async (attributes) => {
   return createdUser;
 };
 const updateById = async (id, attributes) => {
-  if (___default.default.has(attributes, "roles")) {
+  if (___namespace.default.has(attributes, "roles")) {
     const lastAdminUser = await isLastSuperAdminUser(id);
     const superAdminRole = await getService("role").getSuperAdminWithUsersCount();
     const willRemoveSuperAdminRole = !utils$1.arrays.includesString(attributes.roles, superAdminRole.id);
@@ -1646,7 +1664,7 @@ const updateById = async (id, attributes) => {
       throw new ValidationError$4("You must have at least one user with super admin role.");
     }
   }
-  if (___default.default.has(attributes, "password")) {
+  if (___namespace.default.has(attributes, "password")) {
     const hashedPassword = await getService("auth").hashPassword(attributes.password);
     const updatedUser2 = await strapi.db.query("admin::user").update({
       where: { id },
@@ -1698,7 +1716,7 @@ const findRegistrationInfo = async (registrationToken) => {
   if (!user2) {
     return void 0;
   }
-  return ___default.default.pick(user2, ["email", "firstname", "lastname"]);
+  return ___namespace.default.pick(user2, ["email", "firstname", "lastname"]);
 };
 const register = async ({
   registrationToken,
@@ -1963,7 +1981,7 @@ const create$3 = async (attributes) => {
       `The name must be unique and a role with name \`${attributes.name}\` already exists.`
     );
   }
-  const autoGeneratedCode = `${___default.default.kebabCase(attributes.name)}-${utils$1.dates.timestampCode()}`;
+  const autoGeneratedCode = `${___namespace.default.kebabCase(attributes.name)}-${utils$1.dates.timestampCode()}`;
   const rolesWithCode = {
     ...attributes,
     code: attributes.code || autoGeneratedCode
@@ -1993,8 +2011,8 @@ const findAllWithUsersCount = async (params) => {
   return roles2;
 };
 const update$3 = async (params, attributes) => {
-  const sanitizedAttributes = ___default.default.omit(attributes, ["code"]);
-  if (___default.default.has(params, "id") && ___default.default.has(sanitizedAttributes, "name")) {
+  const sanitizedAttributes = ___namespace.default.omit(attributes, ["code"]);
+  if (___namespace.default.has(params, "id") && ___namespace.default.has(sanitizedAttributes, "name")) {
     const alreadyExists = await exists$2({
       name: sanitizedAttributes.name,
       id: { $ne: params.id }
@@ -2176,7 +2194,7 @@ const resetSuperAdminPermissions = async () => {
   await assignPermissions(superAdminRole.id, transformedPermissions);
 };
 const hasSuperAdminRole = (user2) => {
-  const roles2 = ___default.default.get(user2, "roles", []);
+  const roles2 = ___namespace.default.get(user2, "roles", []);
   return roles2.map(fp.prop("code")).includes(SUPER_ADMIN_CODE$1);
 };
 const constants$2 = {
@@ -2229,19 +2247,19 @@ const authEventsMapper = {
 };
 const valueIsFunctionType = ([, value]) => fp.isFunction(value);
 const keyIsValidEventName = ([key]) => {
-  return Object.keys(strapi.admin.services.passport.authEventsMapper).includes(key);
+  return Object.keys(strapi.service("admin::passport").authEventsMapper).includes(key);
 };
 const getPassportStrategies = () => [createLocalStrategy(strapi)];
 const registerAuthEvents = () => {
   const { events = {} } = strapi.config.get("admin.auth", {});
-  const { authEventsMapper: authEventsMapper2 } = strapi.admin.services.passport;
+  const { authEventsMapper: authEventsMapper2 } = strapi.service("admin::passport");
   const eventList = Object.entries(events).filter(keyIsValidEventName).filter(valueIsFunctionType);
   for (const [eventName, handler] of eventList) {
     strapi.eventHub.on(authEventsMapper2[eventName], handler);
   }
 };
 const init = () => {
-  strapi.admin.services.passport.getPassportStrategies().forEach((strategy) => passport__default.default.use(strategy));
+  strapi.service("admin::passport").getPassportStrategies().forEach((strategy) => passport__default.default.use(strategy));
   registerAuthEvents();
   return passport__default.default.initialize();
 };
@@ -2254,7 +2272,7 @@ const getTokenOptions = () => {
   );
   return {
     secret,
-    options: ___default.default.merge(defaultJwtOptions, options)
+    options: ___namespace.default.merge(defaultJwtOptions, options)
   };
 };
 const createToken = () => {
@@ -2805,7 +2823,7 @@ const operatorsMap = {
   $not: "$not"
 };
 const mapKey = (key) => {
-  if (___default.default.isString(key) && key.startsWith("$") && key in operatorsMap) {
+  if (___namespace.default.isString(key) && key.startsWith("$") && key in operatorsMap) {
     return operatorsMap[key];
   }
   return key;
@@ -2817,26 +2835,26 @@ const buildStrapiQuery = (caslQuery) => {
   return unwrapDeep(caslQuery);
 };
 const unwrapDeep = (obj) => {
-  if (!___default.default.isPlainObject(obj) && !___default.default.isArray(obj)) {
+  if (!___namespace.default.isPlainObject(obj) && !___namespace.default.isArray(obj)) {
     return obj;
   }
-  if (___default.default.isArray(obj)) {
+  if (___namespace.default.isArray(obj)) {
     return obj.map((v) => unwrapDeep(v));
   }
-  return ___default.default.reduce(
+  return ___namespace.default.reduce(
     obj,
     (acc, v, k) => {
       const key = mapKey(k);
-      if (___default.default.isPlainObject(v)) {
+      if (___namespace.default.isPlainObject(v)) {
         if ("$elemMatch" in v) {
-          ___default.default.setWith(acc, key, unwrapDeep(v.$elemMatch));
+          ___namespace.default.setWith(acc, key, unwrapDeep(v.$elemMatch));
         } else {
-          ___default.default.setWith(acc, key, unwrapDeep(v));
+          ___namespace.default.setWith(acc, key, unwrapDeep(v));
         }
-      } else if (___default.default.isArray(v)) {
-        ___default.default.setWith(acc, key, v.map((v2) => unwrapDeep(v2)));
+      } else if (___namespace.default.isArray(v)) {
+        ___namespace.default.setWith(acc, key, v.map((v2) => unwrapDeep(v2)));
       } else {
-        ___default.default.setWith(acc, key, v);
+        ___namespace.default.setWith(acc, key, v);
       }
       return acc;
     },
@@ -2857,7 +2875,7 @@ const index$4 = ({ ability: ability$1, action: action2, model }) => ({
     return this.sanitizeInput(data, options);
   },
   getQuery(queryAction = action2) {
-    if (___default.default.isUndefined(queryAction)) {
+    if (___namespace.default.isUndefined(queryAction)) {
       throw new Error("Action must be defined to build a permission query");
     }
     return buildStrapiQuery(buildCaslQuery(ability$1, queryAction, model));
@@ -3307,7 +3325,7 @@ const getNestedFields = (model, {
     return prefix ? [prefix] : [];
   }
   const nonAuthorizableFields = utils$1.contentTypes.getNonVisibleAttributes(model);
-  return ___default.default.reduce(
+  return ___namespace.default.reduce(
     model.attributes,
     (fields, attr, key) => {
       if (nonAuthorizableFields.includes(key))
@@ -3344,7 +3362,7 @@ const getNestedFieldsWithIntermediate = (model, { prefix = "", nestingLevel = 15
     return [];
   }
   const nonAuthorizableFields = utils$1.contentTypes.getNonVisibleAttributes(model);
-  return ___default.default.reduce(
+  return ___namespace.default.reduce(
     model.attributes,
     (fields, attr, key) => {
       if (nonAuthorizableFields.includes(key))
@@ -3876,7 +3894,7 @@ const flattenTokenPermissions = (token2) => {
   };
 };
 const assertTokenPermissionsValidity = (attributes) => {
-  const permissionService = strapi.admin.services.transfer.permission;
+  const permissionService = strapi.service("admin::transfer").permission;
   const validPermissions = permissionService.providers.action.keys();
   const invalidPermissions = fp.difference(attributes.permissions, validPermissions);
   if (!fp.isEmpty(invalidPermissions)) {
@@ -3948,10 +3966,10 @@ const parseFilesData = async (files) => {
       if (!file) {
         return;
       }
-      const getStream = () => fs__default.default.createReadStream(file.path);
+      const getStream = () => fs__default.default.createReadStream(file.filepath);
       formatedFilesData[inputName] = await strapi.plugin("upload").service("upload").formatFileInfo({
-        filename: file.name,
-        type: file.type,
+        filename: file.originalFilename,
+        type: file.mimetype,
         size: file.size
       });
       Object.assign(
@@ -3960,7 +3978,7 @@ const parseFilesData = async (files) => {
       );
       Object.assign(formatedFilesData[inputName], {
         stream: getStream(),
-        tmpPath: file.path,
+        tmpPath: file.filepath,
         // TODO
         // @ts-expect-error define the correct return type
         provider: strapi.config.get("plugin::upload").provider
@@ -3984,7 +4002,7 @@ const getProjectSettings = async () => {
     if (!projectSettings2[inputName]) {
       return;
     }
-    projectSettings2[inputName] = _$1.pick(projectSettings2[inputName], [
+    projectSettings2[inputName] = _.pick(projectSettings2[inputName], [
       "name",
       "url",
       "width",
@@ -4022,7 +4040,7 @@ const deleteOldFiles = async ({ previousSettings, newSettings }) => {
 const updateProjectSettings$1 = async (newSettings) => {
   const store = strapi.store({ type: "core", name: "admin" });
   const previousSettings = await store.get({ key: "project-settings" });
-  const files = _$1.pick(newSettings, PROJECT_SETTINGS_FILE_INPUTS);
+  const files = _.pick(newSettings, PROJECT_SETTINGS_FILE_INPUTS);
   await uploadFiles(files);
   PROJECT_SETTINGS_FILE_INPUTS.forEach((inputName) => {
     if (newSettings[inputName] !== void 0 && !(typeof newSettings[inputName] === "object")) {
@@ -4033,7 +4051,7 @@ const updateProjectSettings$1 = async (newSettings) => {
       newSettings[inputName] = previousSettings[inputName];
       return;
     }
-    newSettings[inputName] = _$1.pick(newSettings[inputName], [
+    newSettings[inputName] = _.pick(newSettings[inputName], [
       "name",
       "hash",
       "url",
@@ -4082,8 +4100,8 @@ const updateProjectSettings = zod.z.object({
   authLogo: zod.z.string().nullish()
 }).strict();
 const updateProjectSettingsLogo = zod.z.object({
-  name: zod.z.string().nullish(),
-  type: zod.z.enum(["image/jpeg", "image/png", "image/svg+xml"]),
+  originalFilename: zod.z.string().nullish(),
+  mimetype: zod.z.enum(["image/jpeg", "image/png", "image/svg+xml"]),
   size: zod.z.number().max(MAX_IMAGE_FILE_SIZE).nullish()
 });
 const updateProjectSettingsFiles = zod.z.object({
@@ -4163,8 +4181,8 @@ const admin = {
       path__default.default.join(strapi.dirs.app.root, "src", "admin")
     );
     const isHostedOnStrapiCloud = utils$1.env("STRAPI_HOSTING", null) === "strapi.cloud";
-    const numberOfAllContentTypes = ___default.default.size(strapi.contentTypes);
-    const numberOfComponents = ___default.default.size(strapi.components);
+    const numberOfAllContentTypes = ___namespace.default.size(strapi.contentTypes);
+    const numberOfComponents = ___namespace.default.size(strapi.components);
     const getNumberOfDynamicZones = () => {
       return fp.pipe(
         fp.map("attributes"),
@@ -4580,7 +4598,7 @@ const roleCreateSchema = utils$1.yup.object().shape({
 const rolesDeleteSchema = utils$1.yup.object().shape({
   ids: utils$1.yup.array().of(utils$1.yup.strapiID()).min(1).required().test("roles-deletion-checks", "Roles deletion checks have failed", async function(ids) {
     try {
-      await strapi.admin.services.role.checkRolesIdForDeletion(ids);
+      await strapi.service("admin::role").checkRolesIdForDeletion(ids);
     } catch (e) {
       return this.createError({ path: "ids", message: e.message });
     }
@@ -4589,7 +4607,7 @@ const rolesDeleteSchema = utils$1.yup.object().shape({
 }).noUnknown();
 const roleDeleteSchema = utils$1.yup.strapiID().required().test("no-admin-single-delete", "Role deletion checks have failed", async function(id) {
   try {
-    await strapi.admin.services.role.checkRolesIdForDeletion([id]);
+    await strapi.service("admin::role").checkRolesIdForDeletion([id]);
   } catch (e) {
     return this.createError({ path: "id", message: e.message });
   }
@@ -4864,14 +4882,13 @@ const transfer = {
   ...prefixActionsName("runner", runner),
   ...prefixActionsName("token", token)
 };
-const _ = require("lodash");
 const { ApplicationError } = utils$1.errors;
 const user = {
   async create(ctx) {
     const { body } = ctx.request;
-    const cleanData = { ...body, email: _.get(body, `email`, ``).toLowerCase() };
+    const cleanData = { ...body, email: ___namespace.get(body, `email`, ``).toLowerCase() };
     await validateUserCreationInput(cleanData);
-    const attributes = _.pick(cleanData, [
+    const attributes = ___namespace.pick(cleanData, [
       "firstname",
       "lastname",
       "email",
@@ -4891,7 +4908,7 @@ const user = {
   },
   async find(ctx) {
     const userService = getService("user");
-    const permissionsManager = strapi.admin.services.permission.createPermissionsManager({
+    const permissionsManager = strapi.service("admin::permission").createPermissionsManager({
       ability: ctx.state.userAbility,
       model: "admin::user"
     });
@@ -4919,7 +4936,7 @@ const user = {
     const { id } = ctx.params;
     const { body: input } = ctx.request;
     await validateUserUpdateInput(input);
-    if (_.has(input, "email")) {
+    if (___namespace.has(input, "email")) {
       const uniqueEmailCheck = await getService("user").exists({
         id: { $ne: id },
         email: input.email
@@ -4970,7 +4987,7 @@ const webhookValidator = utils$1.yup.object({
     }
     return utils$1.yup.object(
       // @ts-expect-error lodash types
-      ___default.default.mapValues(data, () => {
+      ___namespace.default.mapValues(data, () => {
         utils$1.yup.string().min(1).required();
       })
     ).required();
@@ -4982,12 +4999,12 @@ const updateWebhookValidator = webhookValidator.shape({
 });
 const webhooks = {
   async listWebhooks(ctx) {
-    const webhooks2 = await strapi.webhookStore.findWebhooks();
+    const webhooks2 = await strapi.get("webhookStore").findWebhooks();
     ctx.send({ data: webhooks2 });
   },
   async getWebhook(ctx) {
     const { id } = ctx.params;
-    const webhook = await strapi.webhookStore.findWebhook(id);
+    const webhook = await strapi.get("webhookStore").findWebhook(id);
     if (!webhook) {
       return ctx.notFound("webhook.notFound");
     }
@@ -4996,36 +5013,36 @@ const webhooks = {
   async createWebhook(ctx) {
     const { body } = ctx.request;
     await utils$1.validateYupSchema(webhookValidator)(body);
-    const webhook = await strapi.webhookStore.createWebhook(body);
-    strapi.webhookRunner.add(webhook);
+    const webhook = await strapi.get("webhookStore").createWebhook(body);
+    strapi.get("webhookRunner").add(webhook);
     ctx.created({ data: webhook });
   },
   async updateWebhook(ctx) {
     const { id } = ctx.params;
     const { body } = ctx.request;
     await utils$1.validateYupSchema(updateWebhookValidator)(body);
-    const webhook = await strapi.webhookStore.findWebhook(id);
+    const webhook = await strapi.get("webhookStore").findWebhook(id);
     if (!webhook) {
       return ctx.notFound("webhook.notFound");
     }
-    const updatedWebhook = await strapi.webhookStore.updateWebhook(id, {
+    const updatedWebhook = await strapi.get("webhookStore").updateWebhook(id, {
       ...webhook,
       ...body
     });
     if (!updatedWebhook) {
       return ctx.notFound("webhook.notFound");
     }
-    strapi.webhookRunner.update(updatedWebhook);
+    strapi.get("webhookRunner").update(updatedWebhook);
     ctx.send({ data: updatedWebhook });
   },
   async deleteWebhook(ctx) {
     const { id } = ctx.params;
-    const webhook = await strapi.webhookStore.findWebhook(id);
+    const webhook = await strapi.get("webhookStore").findWebhook(id);
     if (!webhook) {
       return ctx.notFound("webhook.notFound");
     }
-    await strapi.webhookStore.deleteWebhook(id);
-    strapi.webhookRunner.remove(webhook);
+    await strapi.get("webhookStore").deleteWebhook(id);
+    strapi.get("webhookRunner").remove(webhook);
     ctx.body = { data: webhook };
   },
   async deleteWebhooks(ctx) {
@@ -5034,22 +5051,18 @@ const webhooks = {
       return ctx.badRequest("ids must be an array of id");
     }
     for (const id of ids) {
-      const webhook = await strapi.webhookStore.findWebhook(id);
+      const webhook = await strapi.get("webhookStore").findWebhook(id);
       if (webhook) {
-        await strapi.webhookStore.deleteWebhook(id);
-        strapi.webhookRunner.remove(webhook);
+        await strapi.get("webhookStore").deleteWebhook(id);
+        strapi.get("webhookRunner").remove(webhook);
       }
     }
     ctx.send({ data: ids });
   },
   async triggerWebhook(ctx) {
     const { id } = ctx.params;
-    const webhook = await strapi.webhookStore.findWebhook(id);
-    const response = await strapi.webhookRunner.run(
-      webhook,
-      "trigger-test",
-      {}
-    );
+    const webhook = await strapi.get("webhookStore").findWebhook(id);
+    const response = await strapi.get("webhookRunner").run(webhook, "trigger-test", {});
     ctx.body = { data: response };
   }
 };