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

package/dist/server/index.mjs

@@ -1,5 +1,5 @@
 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, convertQueryParams, hooks as hooks$1, dates, validateYupSchemaSync, providerFactory, sanitize, contentTypes, traverse, traverseEntity, validate, env, strings } from "@strapi/utils";
+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";
@@ -18,6 +18,7 @@ import pmap from "p-map";
 import assert from "assert";
 import fs from "fs";
 import tsUtils from "@strapi/typescript-utils";
+import { z } from "zod";
 import compose from "koa-compose";
 import { strapi as strapi$1 } from "@strapi/data-transfer";
 const getService = (name2) => {
@@ -1707,10 +1708,7 @@ const findOneByEmail = async (email2, populate = []) => {
   });
 };
 const findPage = async (params = {}) => {
-  const query = convertQueryParams.transformParamsToQuery(
-    "admin::user",
-    defaults({ populate: ["roles"] }, params)
-  );
+  const query = strapi.get("query-params").transform("admin::user", defaults({ populate: ["roles"] }, params));
   return strapi.db.query("admin::user").findPage(query);
 };
 const deleteById = async (id) => {
@@ -1970,7 +1968,7 @@ const find = (params = {}, populate) => {
   return strapi.db.query("admin::role").findMany({ where: params, populate });
 };
 const findAllWithUsersCount = async (params) => {
-  const roles2 = await strapi.db.query("admin::role").findMany(convertQueryParams.transformParamsToQuery("admin::role", params));
+  const roles2 = await strapi.db.query("admin::role").findMany(strapi.get("query-params").transform("admin::role", params));
   for (const role2 of roles2) {
     role2.usersCount = await getUsersCount(role2.id);
   }
@@ -2444,48 +2442,46 @@ const STATIC_FIELDS$1 = [ID_ATTRIBUTE$1, DOC_ID_ATTRIBUTE$1];
 const createSanitizeHelpers = ({ action: action2, ability, model }) => {
   const schema = strapi.getModel(model);
   const { removeDisallowedFields } = sanitize.visitors;
+  const ctx = {
+    schema,
+    getModel: strapi.getModel.bind(strapi)
+  };
   const createSanitizeQuery = (options = {}) => {
     const { fields } = options;
     const permittedFields = fields.shouldIncludeAll ? null : getQueryFields(fields.permitted);
     const sanitizeFilters = async.pipe(
-      traverse.traverseQueryFilters(removeDisallowedFields(permittedFields), { schema }),
-      traverse.traverseQueryFilters(omitDisallowedAdminUserFields, { schema }),
-      traverse.traverseQueryFilters(omitHiddenFields, { schema }),
-      traverse.traverseQueryFilters(removePassword, { schema }),
-      traverse.traverseQueryFilters(
-        ({ key, value }, { remove: remove2 }) => {
-          if (isObject(value) && isEmpty(value)) {
-            remove2(key);
-          }
-        },
-        { schema }
-      )
+      traverse.traverseQueryFilters(removeDisallowedFields(permittedFields), ctx),
+      traverse.traverseQueryFilters(omitDisallowedAdminUserFields, ctx),
+      traverse.traverseQueryFilters(omitHiddenFields, ctx),
+      traverse.traverseQueryFilters(removePassword, ctx),
+      traverse.traverseQueryFilters(({ key, value }, { remove: remove2 }) => {
+        if (isObject(value) && isEmpty(value)) {
+          remove2(key);
+        }
+      }, ctx)
     );
     const sanitizeSort = async.pipe(
-      traverse.traverseQuerySort(removeDisallowedFields(permittedFields), { schema }),
-      traverse.traverseQuerySort(omitDisallowedAdminUserFields, { schema }),
-      traverse.traverseQuerySort(omitHiddenFields, { schema }),
-      traverse.traverseQuerySort(removePassword, { schema }),
-      traverse.traverseQuerySort(
-        ({ key, attribute, value }, { remove: remove2 }) => {
-          if (!isScalarAttribute$1(attribute) && isEmpty(value)) {
-            remove2(key);
-          }
-        },
-        { schema }
-      )
+      traverse.traverseQuerySort(removeDisallowedFields(permittedFields), ctx),
+      traverse.traverseQuerySort(omitDisallowedAdminUserFields, ctx),
+      traverse.traverseQuerySort(omitHiddenFields, ctx),
+      traverse.traverseQuerySort(removePassword, ctx),
+      traverse.traverseQuerySort(({ key, attribute, value }, { remove: remove2 }) => {
+        if (!isScalarAttribute$1(attribute) && isEmpty(value)) {
+          remove2(key);
+        }
+      }, ctx)
     );
     const sanitizePopulate = async.pipe(
-      traverse.traverseQueryPopulate(expandWildcardPopulate, { schema }),
-      traverse.traverseQueryPopulate(removeDisallowedFields(permittedFields), { schema }),
-      traverse.traverseQueryPopulate(omitDisallowedAdminUserFields, { schema }),
-      traverse.traverseQueryPopulate(omitHiddenFields, { schema }),
-      traverse.traverseQueryPopulate(removePassword, { schema })
+      traverse.traverseQueryPopulate(expandWildcardPopulate, ctx),
+      traverse.traverseQueryPopulate(removeDisallowedFields(permittedFields), ctx),
+      traverse.traverseQueryPopulate(omitDisallowedAdminUserFields, ctx),
+      traverse.traverseQueryPopulate(omitHiddenFields, ctx),
+      traverse.traverseQueryPopulate(removePassword, ctx)
     );
     const sanitizeFields = async.pipe(
-      traverse.traverseQueryFields(removeDisallowedFields(permittedFields), { schema }),
-      traverse.traverseQueryFields(omitHiddenFields, { schema }),
-      traverse.traverseQueryFields(removePassword, { schema })
+      traverse.traverseQueryFields(removeDisallowedFields(permittedFields), ctx),
+      traverse.traverseQueryFields(omitHiddenFields, ctx),
+      traverse.traverseQueryFields(removePassword, ctx)
     );
     return async (query) => {
       const sanitizedQuery = cloneDeep(query);
@@ -2509,13 +2505,18 @@ const createSanitizeHelpers = ({ action: action2, ability, model }) => {
     const permittedFields = fields.shouldIncludeAll ? null : getOutputFields(fields.permitted);
     return async.pipe(
       // Remove fields hidden from the admin
-      traverseEntity(omitHiddenFields, { schema }),
+      traverseEntity(omitHiddenFields, ctx),
       // Remove unallowed fields from admin::user relations
-      traverseEntity(pickAllowedAdminUserFields, { schema }),
+      traverseEntity(pickAllowedAdminUserFields, ctx),
       // Remove not allowed fields (RBAC)
-      traverseEntity(removeDisallowedFields(permittedFields), { schema }),
+      traverseEntity(removeDisallowedFields(permittedFields), ctx),
       // Remove all fields of type 'password'
-      sanitize.sanitizers.sanitizePasswords(schema)
+      sanitize.sanitizers.sanitizePasswords({
+        schema,
+        getModel(uid) {
+          return strapi.getModel(uid);
+        }
+      })
     );
   };
   const createSanitizeInput = (options = {}) => {
@@ -2523,9 +2524,9 @@ const createSanitizeHelpers = ({ action: action2, ability, model }) => {
     const permittedFields = fields.shouldIncludeAll ? null : getInputFields(fields.permitted);
     return async.pipe(
       // Remove fields hidden from the admin
-      traverseEntity(omitHiddenFields, { schema }),
+      traverseEntity(omitHiddenFields, ctx),
       // Remove not allowed fields (RBAC)
-      traverseEntity(removeDisallowedFields(permittedFields), { schema }),
+      traverseEntity(removeDisallowedFields(permittedFields), ctx),
       // Remove roles from createdBy & updateBy fields
       omitCreatorRoles
     );
@@ -2643,44 +2644,42 @@ const throwInvalidParam = ({ key, path: path2 }) => {
 };
 const createValidateHelpers = ({ action: action2, ability, model }) => {
   const schema = strapi.getModel(model);
+  const ctx = {
+    schema,
+    getModel: strapi.getModel.bind(strapi)
+  };
   const createValidateQuery = (options = {}) => {
     const { fields } = options;
     const permittedFields = fields.shouldIncludeAll ? null : getQueryFields(fields.permitted);
     const validateFilters = async.pipe(
-      traverse.traverseQueryFilters(throwDisallowedFields(permittedFields), { schema }),
-      traverse.traverseQueryFilters(throwDisallowedAdminUserFields, { schema }),
-      traverse.traverseQueryFilters(throwPassword, { schema }),
-      traverse.traverseQueryFilters(
-        ({ key, value, path: path2 }) => {
-          if (isObject(value) && isEmpty(value)) {
-            throwInvalidParam({ key, path: path2.attribute });
-          }
-        },
-        { schema }
-      )
+      traverse.traverseQueryFilters(throwDisallowedFields(permittedFields), ctx),
+      traverse.traverseQueryFilters(throwDisallowedAdminUserFields, ctx),
+      traverse.traverseQueryFilters(throwPassword, ctx),
+      traverse.traverseQueryFilters(({ key, value, path: path2 }) => {
+        if (isObject(value) && isEmpty(value)) {
+          throwInvalidParam({ key, path: path2.attribute });
+        }
+      }, ctx)
     );
     const validateSort = async.pipe(
-      traverse.traverseQuerySort(throwDisallowedFields(permittedFields), { schema }),
-      traverse.traverseQuerySort(throwDisallowedAdminUserFields, { schema }),
-      traverse.traverseQuerySort(throwPassword, { schema }),
-      traverse.traverseQuerySort(
-        ({ key, attribute, value, path: path2 }) => {
-          if (!isScalarAttribute(attribute) && isEmpty(value)) {
-            throwInvalidParam({ key, path: path2.attribute });
-          }
-        },
-        { schema }
-      )
+      traverse.traverseQuerySort(throwDisallowedFields(permittedFields), ctx),
+      traverse.traverseQuerySort(throwDisallowedAdminUserFields, ctx),
+      traverse.traverseQuerySort(throwPassword, ctx),
+      traverse.traverseQuerySort(({ key, attribute, value, path: path2 }) => {
+        if (!isScalarAttribute(attribute) && isEmpty(value)) {
+          throwInvalidParam({ key, path: path2.attribute });
+        }
+      }, ctx)
     );
     const validateFields = async.pipe(
-      traverse.traverseQueryFields(throwDisallowedFields(permittedFields), { schema }),
-      traverse.traverseQueryFields(throwPassword, { schema })
+      traverse.traverseQueryFields(throwDisallowedFields(permittedFields), ctx),
+      traverse.traverseQueryFields(throwPassword, ctx)
     );
     const validatePopulate = async.pipe(
-      traverse.traverseQueryPopulate(throwDisallowedFields(permittedFields), { schema }),
-      traverse.traverseQueryPopulate(throwDisallowedAdminUserFields, { schema }),
-      traverse.traverseQueryPopulate(throwHiddenFields, { schema }),
-      traverse.traverseQueryPopulate(throwPassword, { schema })
+      traverse.traverseQueryPopulate(throwDisallowedFields(permittedFields), ctx),
+      traverse.traverseQueryPopulate(throwDisallowedAdminUserFields, ctx),
+      traverse.traverseQueryPopulate(throwHiddenFields, ctx),
+      traverse.traverseQueryPopulate(throwPassword, ctx)
     );
     return async (query) => {
       if (query.filters) {
@@ -2703,9 +2702,9 @@ const createValidateHelpers = ({ action: action2, ability, model }) => {
     const permittedFields = fields.shouldIncludeAll ? null : getInputFields(fields.permitted);
     return async.pipe(
       // Remove fields hidden from the admin
-      traverseEntity(throwHiddenFields, { schema }),
+      traverseEntity(throwHiddenFields, ctx),
       // Remove not allowed fields (RBAC)
-      traverseEntity(throwDisallowedFields(permittedFields), { schema }),
+      traverseEntity(throwDisallowedFields(permittedFields), ctx),
       // Remove roles from createdBy & updatedBy fields
       omitCreatorRoles
     );
@@ -3006,7 +3005,9 @@ const createSectionBuilder = () => {
   };
 };
 const isOfKind = (kind) => matchesProperty("kind", kind);
-const resolveContentType = (uid) => strapi.contentTypes[uid];
+const resolveContentType = (uid) => {
+  return strapi.contentTypes[uid];
+};
 const isNotInSubjects = (subjects) => (uid) => !subjects.find((subject2) => subject2.uid === uid);
 const hasProperty = curry((property, subject2) => {
   return !!subject2.properties.find((prop2) => prop2.value === property);
@@ -3053,7 +3054,7 @@ const contentTypesBase = ({
   });
 };
 const subjectsHandlerFor = (kind) => ({ action: action2, section: contentTypesSection }) => {
-  const { subjects } = action2;
+  const subjects = action2.subjects;
   if (!subjects?.length) {
     return;
   }
@@ -4058,31 +4059,30 @@ const index$3 = {
 const MAX_IMAGE_WIDTH = 750;
 const MAX_IMAGE_HEIGHT = MAX_IMAGE_WIDTH;
 const MAX_IMAGE_FILE_SIZE = 1024 * 1024;
-const ALLOWED_IMAGE_FILE_TYPES = ["image/jpeg", "image/png", "image/svg+xml"];
-const updateProjectSettings = yup.object({
-  menuLogo: yup.string(),
-  authLogo: yup.string()
-}).noUnknown();
-const updateProjectSettingsLogo = yup.object({
-  name: yup.string(),
-  type: yup.string().oneOf(ALLOWED_IMAGE_FILE_TYPES),
-  size: yup.number().max(MAX_IMAGE_FILE_SIZE)
+const updateProjectSettings = z.object({
+  menuLogo: z.string().nullish(),
+  authLogo: z.string().nullish()
+}).strict();
+const updateProjectSettingsLogo = z.object({
+  name: z.string().nullish(),
+  type: z.enum(["image/jpeg", "image/png", "image/svg+xml"]),
+  size: z.number().max(MAX_IMAGE_FILE_SIZE).nullish()
 });
-const updateProjectSettingsFiles = yup.object({
-  menuLogo: updateProjectSettingsLogo,
-  authLogo: updateProjectSettingsLogo
-}).noUnknown();
-const logoDimensions = yup.object({
-  width: yup.number().max(MAX_IMAGE_WIDTH),
-  height: yup.number().max(MAX_IMAGE_HEIGHT)
+const updateProjectSettingsFiles = z.object({
+  menuLogo: updateProjectSettingsLogo.nullish(),
+  authLogo: updateProjectSettingsLogo.nullish()
+}).strict();
+const logoDimensions = z.object({
+  width: z.number().max(MAX_IMAGE_WIDTH).nullish(),
+  height: z.number().max(MAX_IMAGE_HEIGHT).nullish()
 });
-const updateProjectSettingsImagesDimensions = yup.object({
-  menuLogo: logoDimensions,
-  authLogo: logoDimensions
-}).noUnknown();
-const validateUpdateProjectSettings = validateYupSchemaSync(updateProjectSettings);
-const validateUpdateProjectSettingsFiles = validateYupSchemaSync(updateProjectSettingsFiles);
-const validateUpdateProjectSettingsImagesDimensions = validateYupSchemaSync(
+const updateProjectSettingsImagesDimensions = z.object({
+  menuLogo: logoDimensions.nullish(),
+  authLogo: logoDimensions.nullish()
+}).strict();
+const validateUpdateProjectSettings = validateZod(updateProjectSettings);
+const validateUpdateProjectSettingsFiles = validateZod(updateProjectSettingsFiles);
+const validateUpdateProjectSettingsImagesDimensions = validateZod(
   updateProjectSettingsImagesDimensions
 );
 const { isUsingTypeScript } = tsUtils;
@@ -5027,7 +5027,11 @@ const webhooks = {
   async triggerWebhook(ctx) {
     const { id } = ctx.params;
     const webhook = await strapi.webhookStore.findWebhook(id);
-    const response = await strapi.webhookRunner.run(webhook, "trigger-test", {});
+    const response = await strapi.webhookRunner.run(
+      webhook,
+      "trigger-test",
+      {}
+    );
     ctx.body = { data: response };
   }
 };