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

package/dist/server/index.mjs

@@ -1,11 +1,12 @@
 import { merge, map, uniq, difference, isNil, castArray, pick, curry, pipe, prop, includes, isArray, set, omit, isEmpty, has, defaults, remove, eq, get, differenceWith, differenceBy, isEqual, toLower, isFunction, some, flatMap, isObject, cloneDeep, getOr, intersection, isPlainObject, matchesProperty, propEq, xor, startsWith, isString, isNumber, values, sumBy, trim, isUndefined, mapKeys } from "lodash/fp";
 import utils$1, { async, errors, yup, validateYupSchema, policy, arrays, hooks as hooks$1, dates, validateYupSchemaSync, providerFactory, sanitize, contentTypes, traverse, traverseEntity, validate, env, validateZod, strings } from "@strapi/utils";
-import "@strapi/types";
 import path, { resolve, basename, join, extname } from "path";
 import fse, { exists as exists$4 } from "fs-extra";
 import koaStatic from "koa-static";
 import { differenceInHours, parseISO } from "date-fns";
-import _$1, { pick as pick$1 } from "lodash";
+import "@strapi/types";
+import * as _ from "lodash";
+import ___default, { pick as pick$1 } from "lodash";
 import bcrypt from "bcryptjs";
 import passport$1 from "koa-passport";
 import { Strategy } from "passport-local";
@@ -542,7 +543,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);
@@ -584,10 +585,10 @@ const hasPermissionsSchema = yup.object({
   actions: yup.array().of(
     // @ts-expect-error yup types
     yup.lazy((val) => {
-      if (_$1.isArray(val)) {
+      if (___default.isArray(val)) {
         return yup.array().of(yup.string()).min(1).max(2);
       }
-      if (_$1.isString(val)) {
+      if (___default.isString(val)) {
         return yup.string().required();
       }
       return yup.object().shape({
@@ -601,16 +602,16 @@ const validateHasPermissionsInput = validateYupSchema(hasPermissionsSchema);
 const { createPolicy: createPolicy$1 } = policy;
 const inputModifiers = [
   {
-    check: _$1.isString,
+    check: ___default.isString,
     transform: (action2) => ({ action: action2 })
   },
   {
-    check: _$1.isArray,
+    check: ___default.isArray,
     transform: (arr) => ({ action: arr[0], subject: arr[1] })
   },
   {
     // Has to be after the isArray check since _.isObject also matches arrays
-    check: _$1.isObject,
+    check: ___default.isObject,
     transform: (perm) => perm
   }
 ];
@@ -1354,7 +1355,7 @@ const forgotPassword = async ({ email: email2 } = {}) => {
     strapi.config.get("admin.forgotPassword.emailTemplate"),
     {
       url,
-      user: _$1.pick(user2, ["email", "firstname", "lastname", "username"])
+      user: ___default.pick(user2, ["email", "firstname", "lastname", "username"])
     }
   ).catch((err) => {
     strapi.log.error(err);
@@ -1444,7 +1445,7 @@ const actionDomain = {
   sanitizeActionAttributes
 };
 const checkFieldsAreCorrectlyNested = (fields) => {
-  if (_$1.isNil(fields)) {
+  if (___default.isNil(fields)) {
     return true;
   }
   if (!Array.isArray(fields)) {
@@ -1461,13 +1462,13 @@ const checkFieldsAreCorrectlyNested = (fields) => {
   return !failed;
 };
 const checkFieldsDontHaveDuplicates = (fields) => {
-  if (_$1.isNil(fields)) {
+  if (___default.isNil(fields)) {
     return true;
   }
   if (!Array.isArray(fields)) {
     return false;
   }
-  return _$1.uniq(fields).length === fields.length;
+  return ___default.uniq(fields).length === fields.length;
 };
 const getActionFromProvider = (actionId) => {
   return getService("permission").actionProvider.get(actionId);
@@ -1482,10 +1483,10 @@ const isAPluginName = yup.string().test("is-a-plugin-name", "is not a plugin nam
   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 = yup.array().of(yup.string()).test("is-an-array-of-conditions", "is not a plugin name", function(value) {
-  const ids = strapi.admin.services.permission.conditionProvider.keys();
-  return _$1.isUndefined(value) || _$1.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 ___default.isUndefined(value) || ___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 || _$1.isNil(a.subject) && _$1.isNil(b.subject));
+const permissionsAreEquals = (a, b) => a.action === b.action && (a.subject === b.subject || ___default.isNil(a.subject) && ___default.isNil(b.subject));
 const checkNoDuplicatedPermissions = (permissions2) => !Array.isArray(permissions2) || permissions2.every(
   (permA, i) => permissions2.slice(i + 1).every((permB) => !permissionsAreEquals(permA, permB))
 );
@@ -1592,10 +1593,10 @@ const validators = {
 };
 const { SUPER_ADMIN_CODE: SUPER_ADMIN_CODE$2 } = constants$3;
 const { ValidationError: ValidationError$4 } = errors;
-const sanitizeUserRoles = (role2) => _$1.pick(role2, ["id", "name", "description", "code"]);
+const sanitizeUserRoles = (role2) => ___default.pick(role2, ["id", "name", "description", "code"]);
 const sanitizeUser = (user2) => {
   return {
-    ..._$1.omit(user2, ["password", "resetPasswordToken", "registrationToken", "roles"]),
+    ...___default.omit(user2, ["password", "resetPasswordToken", "registrationToken", "roles"]),
     roles: user2.roles && user2.roles.map(sanitizeUserRoles)
   };
 };
@@ -1604,7 +1605,7 @@ const create$5 = async (attributes) => {
     registrationToken: getService("token").createToken(),
     ...attributes
   };
-  if (_$1.has(attributes, "password")) {
+  if (___default.has(attributes, "password")) {
     userInfo.password = await getService("auth").hashPassword(attributes.password);
   }
   const user2 = createUser(userInfo);
@@ -1614,7 +1615,7 @@ const create$5 = async (attributes) => {
   return createdUser;
 };
 const updateById = async (id, attributes) => {
-  if (_$1.has(attributes, "roles")) {
+  if (___default.has(attributes, "roles")) {
     const lastAdminUser = await isLastSuperAdminUser(id);
     const superAdminRole = await getService("role").getSuperAdminWithUsersCount();
     const willRemoveSuperAdminRole = !arrays.includesString(attributes.roles, superAdminRole.id);
@@ -1628,7 +1629,7 @@ const updateById = async (id, attributes) => {
       throw new ValidationError$4("You must have at least one user with super admin role.");
     }
   }
-  if (_$1.has(attributes, "password")) {
+  if (___default.has(attributes, "password")) {
     const hashedPassword = await getService("auth").hashPassword(attributes.password);
     const updatedUser2 = await strapi.db.query("admin::user").update({
       where: { id },
@@ -1680,7 +1681,7 @@ const findRegistrationInfo = async (registrationToken) => {
   if (!user2) {
     return void 0;
   }
-  return _$1.pick(user2, ["email", "firstname", "lastname"]);
+  return ___default.pick(user2, ["email", "firstname", "lastname"]);
 };
 const register = async ({
   registrationToken,
@@ -1945,7 +1946,7 @@ const create$3 = async (attributes) => {
       `The name must be unique and a role with name \`${attributes.name}\` already exists.`
     );
   }
-  const autoGeneratedCode = `${_$1.kebabCase(attributes.name)}-${dates.timestampCode()}`;
+  const autoGeneratedCode = `${___default.kebabCase(attributes.name)}-${dates.timestampCode()}`;
   const rolesWithCode = {
     ...attributes,
     code: attributes.code || autoGeneratedCode
@@ -1975,8 +1976,8 @@ const findAllWithUsersCount = async (params) => {
   return roles2;
 };
 const update$3 = async (params, attributes) => {
-  const sanitizedAttributes = _$1.omit(attributes, ["code"]);
-  if (_$1.has(params, "id") && _$1.has(sanitizedAttributes, "name")) {
+  const sanitizedAttributes = ___default.omit(attributes, ["code"]);
+  if (___default.has(params, "id") && ___default.has(sanitizedAttributes, "name")) {
     const alreadyExists = await exists$2({
       name: sanitizedAttributes.name,
       id: { $ne: params.id }
@@ -2158,7 +2159,7 @@ const resetSuperAdminPermissions = async () => {
   await assignPermissions(superAdminRole.id, transformedPermissions);
 };
 const hasSuperAdminRole = (user2) => {
-  const roles2 = _$1.get(user2, "roles", []);
+  const roles2 = ___default.get(user2, "roles", []);
   return roles2.map(prop("code")).includes(SUPER_ADMIN_CODE$1);
 };
 const constants$2 = {
@@ -2211,19 +2212,19 @@ const authEventsMapper = {
 };
 const valueIsFunctionType = ([, value]) => 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$1.use(strategy));
+  strapi.service("admin::passport").getPassportStrategies().forEach((strategy) => passport$1.use(strategy));
   registerAuthEvents();
   return passport$1.initialize();
 };
@@ -2236,7 +2237,7 @@ const getTokenOptions = () => {
   );
   return {
     secret,
-    options: _$1.merge(defaultJwtOptions, options)
+    options: ___default.merge(defaultJwtOptions, options)
   };
 };
 const createToken = () => {
@@ -2787,7 +2788,7 @@ const operatorsMap = {
   $not: "$not"
 };
 const mapKey = (key) => {
-  if (_$1.isString(key) && key.startsWith("$") && key in operatorsMap) {
+  if (___default.isString(key) && key.startsWith("$") && key in operatorsMap) {
     return operatorsMap[key];
   }
   return key;
@@ -2799,26 +2800,26 @@ const buildStrapiQuery = (caslQuery) => {
   return unwrapDeep(caslQuery);
 };
 const unwrapDeep = (obj) => {
-  if (!_$1.isPlainObject(obj) && !_$1.isArray(obj)) {
+  if (!___default.isPlainObject(obj) && !___default.isArray(obj)) {
     return obj;
   }
-  if (_$1.isArray(obj)) {
+  if (___default.isArray(obj)) {
     return obj.map((v) => unwrapDeep(v));
   }
-  return _$1.reduce(
+  return ___default.reduce(
     obj,
     (acc, v, k) => {
       const key = mapKey(k);
-      if (_$1.isPlainObject(v)) {
+      if (___default.isPlainObject(v)) {
         if ("$elemMatch" in v) {
-          _$1.setWith(acc, key, unwrapDeep(v.$elemMatch));
+          ___default.setWith(acc, key, unwrapDeep(v.$elemMatch));
         } else {
-          _$1.setWith(acc, key, unwrapDeep(v));
+          ___default.setWith(acc, key, unwrapDeep(v));
         }
-      } else if (_$1.isArray(v)) {
-        _$1.setWith(acc, key, v.map((v2) => unwrapDeep(v2)));
+      } else if (___default.isArray(v)) {
+        ___default.setWith(acc, key, v.map((v2) => unwrapDeep(v2)));
       } else {
-        _$1.setWith(acc, key, v);
+        ___default.setWith(acc, key, v);
       }
       return acc;
     },
@@ -2839,7 +2840,7 @@ const index$4 = ({ ability, action: action2, model }) => ({
     return this.sanitizeInput(data, options);
   },
   getQuery(queryAction = action2) {
-    if (_$1.isUndefined(queryAction)) {
+    if (___default.isUndefined(queryAction)) {
       throw new Error("Action must be defined to build a permission query");
     }
     return buildStrapiQuery(buildCaslQuery(ability, queryAction, model));
@@ -3289,7 +3290,7 @@ const getNestedFields = (model, {
     return prefix ? [prefix] : [];
   }
   const nonAuthorizableFields = contentTypes.getNonVisibleAttributes(model);
-  return _$1.reduce(
+  return ___default.reduce(
     model.attributes,
     (fields, attr, key) => {
       if (nonAuthorizableFields.includes(key))
@@ -3326,7 +3327,7 @@ const getNestedFieldsWithIntermediate = (model, { prefix = "", nestingLevel = 15
     return [];
   }
   const nonAuthorizableFields = contentTypes.getNonVisibleAttributes(model);
-  return _$1.reduce(
+  return ___default.reduce(
     model.attributes,
     (fields, attr, key) => {
       if (nonAuthorizableFields.includes(key))
@@ -3858,7 +3859,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 = difference(attributes.permissions, validPermissions);
   if (!isEmpty(invalidPermissions)) {
@@ -3930,10 +3931,10 @@ const parseFilesData = async (files) => {
       if (!file) {
         return;
       }
-      const getStream = () => fs.createReadStream(file.path);
+      const getStream = () => fs.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(
@@ -3942,7 +3943,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
@@ -4064,8 +4065,8 @@ const updateProjectSettings = z.object({
   authLogo: z.string().nullish()
 }).strict();
 const updateProjectSettingsLogo = z.object({
-  name: z.string().nullish(),
-  type: z.enum(["image/jpeg", "image/png", "image/svg+xml"]),
+  originalFilename: z.string().nullish(),
+  mimetype: z.enum(["image/jpeg", "image/png", "image/svg+xml"]),
   size: z.number().max(MAX_IMAGE_FILE_SIZE).nullish()
 });
 const updateProjectSettingsFiles = z.object({
@@ -4145,8 +4146,8 @@ const admin = {
       path.join(strapi.dirs.app.root, "src", "admin")
     );
     const isHostedOnStrapiCloud = env("STRAPI_HOSTING", null) === "strapi.cloud";
-    const numberOfAllContentTypes = _$1.size(strapi.contentTypes);
-    const numberOfComponents = _$1.size(strapi.components);
+    const numberOfAllContentTypes = ___default.size(strapi.contentTypes);
+    const numberOfComponents = ___default.size(strapi.components);
     const getNumberOfDynamicZones = () => {
       return pipe(
         map("attributes"),
@@ -4562,7 +4563,7 @@ const roleCreateSchema = yup.object().shape({
 const rolesDeleteSchema = yup.object().shape({
   ids: yup.array().of(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 });
     }
@@ -4571,7 +4572,7 @@ const rolesDeleteSchema = yup.object().shape({
 }).noUnknown();
 const roleDeleteSchema = 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 });
   }
@@ -4846,7 +4847,6 @@ const transfer = {
   ...prefixActionsName("runner", runner),
   ...prefixActionsName("token", token)
 };
-const _ = require("lodash");
 const { ApplicationError } = errors;
 const user = {
   async create(ctx) {
@@ -4873,7 +4873,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"
     });
@@ -4952,7 +4952,7 @@ const webhookValidator = yup.object({
     }
     return yup.object(
       // @ts-expect-error lodash types
-      _$1.mapValues(data, () => {
+      ___default.mapValues(data, () => {
         yup.string().min(1).required();
       })
     ).required();
@@ -4964,12 +4964,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");
     }
@@ -4978,36 +4978,36 @@ const webhooks = {
   async createWebhook(ctx) {
     const { body } = ctx.request;
     await 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 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) {
@@ -5016,22 +5016,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 };
   }
 };