@strapi/upload 5.55.1 → 5.57.0

package/dist/server/controllers/validation/admin/folder-file.js.map

@@ -1 +1 @@
-{"version":3,"file":"folder-file.js","sources":["../../../../../server/src/controllers/validation/admin/folder-file.ts"],"sourcesContent":["import { intersection, map, isEmpty } from 'lodash/fp';\nimport { yup, validateYupSchema } from '@strapi/utils';\nimport { FOLDER_MODEL_UID } from '../../../constants';\nimport { folderExists } from './utils';\nimport { isFolderOrChild } from '../../utils/folders';\n\nimport type { Folder } from '../../../types';\n\nconst validateDeleteManyFoldersFilesSchema = yup\n  .object()\n  .shape({\n    fileIds: yup.array().of(yup.strapiID().required()),\n    folderIds: yup.array().of(yup.strapiID().required()),\n  })\n  .noUnknown()\n  .required();\n\nconst validateStructureMoveManyFoldersFilesSchema = yup\n  .object()\n  .shape({\n    destinationFolderId: yup\n      .strapiID()\n      .nullable()\n      .defined()\n      .test('folder-exists', 'destination folder does not exist', folderExists),\n    fileIds: yup.array().of(yup.strapiID().required()),\n    folderIds: yup.array().of(yup.strapiID().required()),\n  })\n  .noUnknown()\n  .required();\n\nconst validateDuplicatesMoveManyFoldersFilesSchema = yup\n  .object()\n  .test('are-folders-unique', 'some folders already exist', async function areFoldersUnique(value) {\n    const { folderIds, destinationFolderId } = value;\n    if (isEmpty(folderIds)) return true;\n\n    const folders = await strapi.db.query(FOLDER_MODEL_UID).findMany({\n      select: ['name'],\n      where: { id: { $in: folderIds } },\n    });\n\n    const existingFolders = await strapi.db.query(FOLDER_MODEL_UID).findMany({\n      select: ['name'],\n      where: { parent: { id: destinationFolderId } },\n    });\n\n    const duplicatedNames = intersection(map('name', folders), map('name', existingFolders));\n    if (duplicatedNames.length > 0) {\n      return this.createError({\n        message: `some folders already exists: ${duplicatedNames.join(', ')}`,\n      });\n    }\n\n    return true;\n  });\n\nconst validateMoveFoldersNotInsideThemselvesSchema = yup\n  .object()\n  .test(\n    'dont-move-inside-self',\n    'folders cannot be moved inside themselves or one of its children',\n    async function validateMoveFoldersNotInsideThemselves(value) {\n      const { folderIds, destinationFolderId } = value;\n      if (destinationFolderId === null || isEmpty(folderIds)) return true;\n\n      const destinationFolder = await strapi.db.query(FOLDER_MODEL_UID).findOne({\n        select: ['path'],\n        where: { id: destinationFolderId },\n      });\n\n      const folders: Folder[] = await strapi.db.query(FOLDER_MODEL_UID).findMany({\n        select: ['name', 'path'],\n        where: { id: { $in: folderIds } },\n      });\n\n      const unmovableFoldersNames = folders\n        .filter((folder) => isFolderOrChild(destinationFolder, folder))\n        .map((f) => f.name);\n\n      if (unmovableFoldersNames.length > 0) {\n        return this.createError({\n          message: `folders cannot be moved inside themselves or one of its children: ${unmovableFoldersNames.join(\n            ', '\n          )}`,\n        });\n      }\n\n      return true;\n    }\n  );\n\nexport const validateDeleteManyFoldersFiles = validateYupSchema(\n  validateDeleteManyFoldersFilesSchema\n);\n\nexport async function validateMoveManyFoldersFiles(body: unknown) {\n  await validateYupSchema(validateStructureMoveManyFoldersFilesSchema)(body);\n  await validateYupSchema(validateDuplicatesMoveManyFoldersFilesSchema)(body);\n  await validateYupSchema(validateMoveFoldersNotInsideThemselvesSchema)(body);\n}\n"],"names":["validateDeleteManyFoldersFilesSchema","yup","object","shape","fileIds","array","of","strapiID","required","folderIds","noUnknown","validateStructureMoveManyFoldersFilesSchema","destinationFolderId","nullable","defined","test","folderExists","validateDuplicatesMoveManyFoldersFilesSchema","areFoldersUnique","value","isEmpty","folders","strapi","db","query","FOLDER_MODEL_UID","findMany","select","where","id","$in","existingFolders","parent","duplicatedNames","intersection","map","length","createError","message","join","validateMoveFoldersNotInsideThemselvesSchema","validateMoveFoldersNotInsideThemselves","destinationFolder","findOne","unmovableFoldersNames","filter","folder","isFolderOrChild","f","name","validateDeleteManyFoldersFiles","validateYupSchema","validateMoveManyFoldersFiles","body"],"mappings":"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"}
+{"version":3,"file":"folder-file.js","sources":["../../../../../server/src/controllers/validation/admin/folder-file.ts"],"sourcesContent":["import { isEmpty, map, intersection } from 'lodash';\nimport { yup, validateYupSchema } from '@strapi/utils';\nimport { FOLDER_MODEL_UID } from '../../../constants';\nimport { folderExists } from './utils';\nimport { isFolderOrChild } from '../../utils/folders';\n\nimport type { Folder } from '../../../types';\n\nconst validateDeleteManyFoldersFilesSchema = yup\n  .object()\n  .shape({\n    fileIds: yup.array().of(yup.strapiID().required()),\n    folderIds: yup.array().of(yup.strapiID().required()),\n  })\n  .noUnknown()\n  .required();\n\nconst validateStructureMoveManyFoldersFilesSchema = yup\n  .object()\n  .shape({\n    destinationFolderId: yup\n      .strapiID()\n      .nullable()\n      .defined()\n      .test('folder-exists', 'destination folder does not exist', folderExists),\n    fileIds: yup.array().of(yup.strapiID().required()),\n    folderIds: yup.array().of(yup.strapiID().required()),\n  })\n  .noUnknown()\n  .required();\n\nconst validateDuplicatesMoveManyFoldersFilesSchema = yup\n  .object()\n  .test('are-folders-unique', 'some folders already exist', async function areFoldersUnique(value) {\n    const { folderIds, destinationFolderId } = value;\n    if (isEmpty(folderIds)) return true;\n\n    const folders = await strapi.db.query(FOLDER_MODEL_UID).findMany({\n      select: ['name'],\n      where: { id: { $in: folderIds } },\n    });\n\n    const existingFolders = await strapi.db.query(FOLDER_MODEL_UID).findMany({\n      select: ['name'],\n      where: { parent: { id: destinationFolderId } },\n    });\n\n    const duplicatedNames = intersection(map(existingFolders, 'name'), map(folders, 'name'));\n    if (duplicatedNames.length > 0) {\n      return this.createError({\n        message: `some folders already exists: ${duplicatedNames.join(', ')}`,\n      });\n    }\n\n    return true;\n  });\n\nconst validateMoveFoldersNotInsideThemselvesSchema = yup\n  .object()\n  .test(\n    'dont-move-inside-self',\n    'folders cannot be moved inside themselves or one of its children',\n    async function validateMoveFoldersNotInsideThemselves(value) {\n      const { folderIds, destinationFolderId } = value;\n      if (destinationFolderId === null || isEmpty(folderIds)) return true;\n\n      const destinationFolder = await strapi.db.query(FOLDER_MODEL_UID).findOne({\n        select: ['path'],\n        where: { id: destinationFolderId },\n      });\n\n      const folders: Folder[] = await strapi.db.query(FOLDER_MODEL_UID).findMany({\n        select: ['name', 'path'],\n        where: { id: { $in: folderIds } },\n      });\n\n      const unmovableFoldersNames = folders\n        .filter((folder) => isFolderOrChild(destinationFolder, folder))\n        .map((f) => f.name);\n\n      if (unmovableFoldersNames.length > 0) {\n        return this.createError({\n          message: `folders cannot be moved inside themselves or one of its children: ${unmovableFoldersNames.join(\n            ', '\n          )}`,\n        });\n      }\n\n      return true;\n    }\n  );\n\nexport const validateDeleteManyFoldersFiles = validateYupSchema(\n  validateDeleteManyFoldersFilesSchema\n);\n\nexport async function validateMoveManyFoldersFiles(body: unknown) {\n  await validateYupSchema(validateStructureMoveManyFoldersFilesSchema)(body);\n  await validateYupSchema(validateDuplicatesMoveManyFoldersFilesSchema)(body);\n  await validateYupSchema(validateMoveFoldersNotInsideThemselvesSchema)(body);\n}\n"],"names":["validateDeleteManyFoldersFilesSchema","yup","object","shape","fileIds","array","of","strapiID","required","folderIds","noUnknown","validateStructureMoveManyFoldersFilesSchema","destinationFolderId","nullable","defined","test","folderExists","validateDuplicatesMoveManyFoldersFilesSchema","areFoldersUnique","value","isEmpty","folders","strapi","db","query","FOLDER_MODEL_UID","findMany","select","where","id","$in","existingFolders","parent","duplicatedNames","intersection","map","length","createError","message","join","validateMoveFoldersNotInsideThemselvesSchema","validateMoveFoldersNotInsideThemselves","destinationFolder","findOne","unmovableFoldersNames","filter","folder","isFolderOrChild","f","name","validateDeleteManyFoldersFiles","validateYupSchema","validateMoveManyFoldersFiles","body"],"mappings":"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"}

package/dist/server/controllers/validation/admin/folder-file.mjs

@@ -1,4 +1,4 @@
-import { isEmpty, intersection, map } from 'lodash/fp';
+import { isEmpty, intersection, map } from 'lodash';
 import { yup, validateYupSchema } from '@strapi/utils';
 import { FOLDER_MODEL_UID } from '../../../constants.mjs';
 import { folderExists } from './utils.mjs';
@@ -36,7 +36,7 @@ const validateDuplicatesMoveManyFoldersFilesSchema = yup.object().test('are-fold
             }
         }
     });
-    const duplicatedNames = intersection(map('name', folders), map('name', existingFolders));
+    const duplicatedNames = intersection(map(existingFolders, 'name'), map(folders, 'name'));
     if (duplicatedNames.length > 0) {
         return this.createError({
             message: `some folders already exists: ${duplicatedNames.join(', ')}`

package/dist/server/controllers/validation/admin/folder-file.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"folder-file.mjs","sources":["../../../../../server/src/controllers/validation/admin/folder-file.ts"],"sourcesContent":["import { intersection, map, isEmpty } from 'lodash/fp';\nimport { yup, validateYupSchema } from '@strapi/utils';\nimport { FOLDER_MODEL_UID } from '../../../constants';\nimport { folderExists } from './utils';\nimport { isFolderOrChild } from '../../utils/folders';\n\nimport type { Folder } from '../../../types';\n\nconst validateDeleteManyFoldersFilesSchema = yup\n  .object()\n  .shape({\n    fileIds: yup.array().of(yup.strapiID().required()),\n    folderIds: yup.array().of(yup.strapiID().required()),\n  })\n  .noUnknown()\n  .required();\n\nconst validateStructureMoveManyFoldersFilesSchema = yup\n  .object()\n  .shape({\n    destinationFolderId: yup\n      .strapiID()\n      .nullable()\n      .defined()\n      .test('folder-exists', 'destination folder does not exist', folderExists),\n    fileIds: yup.array().of(yup.strapiID().required()),\n    folderIds: yup.array().of(yup.strapiID().required()),\n  })\n  .noUnknown()\n  .required();\n\nconst validateDuplicatesMoveManyFoldersFilesSchema = yup\n  .object()\n  .test('are-folders-unique', 'some folders already exist', async function areFoldersUnique(value) {\n    const { folderIds, destinationFolderId } = value;\n    if (isEmpty(folderIds)) return true;\n\n    const folders = await strapi.db.query(FOLDER_MODEL_UID).findMany({\n      select: ['name'],\n      where: { id: { $in: folderIds } },\n    });\n\n    const existingFolders = await strapi.db.query(FOLDER_MODEL_UID).findMany({\n      select: ['name'],\n      where: { parent: { id: destinationFolderId } },\n    });\n\n    const duplicatedNames = intersection(map('name', folders), map('name', existingFolders));\n    if (duplicatedNames.length > 0) {\n      return this.createError({\n        message: `some folders already exists: ${duplicatedNames.join(', ')}`,\n      });\n    }\n\n    return true;\n  });\n\nconst validateMoveFoldersNotInsideThemselvesSchema = yup\n  .object()\n  .test(\n    'dont-move-inside-self',\n    'folders cannot be moved inside themselves or one of its children',\n    async function validateMoveFoldersNotInsideThemselves(value) {\n      const { folderIds, destinationFolderId } = value;\n      if (destinationFolderId === null || isEmpty(folderIds)) return true;\n\n      const destinationFolder = await strapi.db.query(FOLDER_MODEL_UID).findOne({\n        select: ['path'],\n        where: { id: destinationFolderId },\n      });\n\n      const folders: Folder[] = await strapi.db.query(FOLDER_MODEL_UID).findMany({\n        select: ['name', 'path'],\n        where: { id: { $in: folderIds } },\n      });\n\n      const unmovableFoldersNames = folders\n        .filter((folder) => isFolderOrChild(destinationFolder, folder))\n        .map((f) => f.name);\n\n      if (unmovableFoldersNames.length > 0) {\n        return this.createError({\n          message: `folders cannot be moved inside themselves or one of its children: ${unmovableFoldersNames.join(\n            ', '\n          )}`,\n        });\n      }\n\n      return true;\n    }\n  );\n\nexport const validateDeleteManyFoldersFiles = validateYupSchema(\n  validateDeleteManyFoldersFilesSchema\n);\n\nexport async function validateMoveManyFoldersFiles(body: unknown) {\n  await validateYupSchema(validateStructureMoveManyFoldersFilesSchema)(body);\n  await validateYupSchema(validateDuplicatesMoveManyFoldersFilesSchema)(body);\n  await validateYupSchema(validateMoveFoldersNotInsideThemselvesSchema)(body);\n}\n"],"names":["validateDeleteManyFoldersFilesSchema","yup","object","shape","fileIds","array","of","strapiID","required","folderIds","noUnknown","validateStructureMoveManyFoldersFilesSchema","destinationFolderId","nullable","defined","test","folderExists","validateDuplicatesMoveManyFoldersFilesSchema","areFoldersUnique","value","isEmpty","folders","strapi","db","query","FOLDER_MODEL_UID","findMany","select","where","id","$in","existingFolders","parent","duplicatedNames","intersection","map","length","createError","message","join","validateMoveFoldersNotInsideThemselvesSchema","validateMoveFoldersNotInsideThemselves","destinationFolder","findOne","unmovableFoldersNames","filter","folder","isFolderOrChild","f","name","validateDeleteManyFoldersFiles","validateYupSchema","validateMoveManyFoldersFiles","body"],"mappings":"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"}
+{"version":3,"file":"folder-file.mjs","sources":["../../../../../server/src/controllers/validation/admin/folder-file.ts"],"sourcesContent":["import { isEmpty, map, intersection } from 'lodash';\nimport { yup, validateYupSchema } from '@strapi/utils';\nimport { FOLDER_MODEL_UID } from '../../../constants';\nimport { folderExists } from './utils';\nimport { isFolderOrChild } from '../../utils/folders';\n\nimport type { Folder } from '../../../types';\n\nconst validateDeleteManyFoldersFilesSchema = yup\n  .object()\n  .shape({\n    fileIds: yup.array().of(yup.strapiID().required()),\n    folderIds: yup.array().of(yup.strapiID().required()),\n  })\n  .noUnknown()\n  .required();\n\nconst validateStructureMoveManyFoldersFilesSchema = yup\n  .object()\n  .shape({\n    destinationFolderId: yup\n      .strapiID()\n      .nullable()\n      .defined()\n      .test('folder-exists', 'destination folder does not exist', folderExists),\n    fileIds: yup.array().of(yup.strapiID().required()),\n    folderIds: yup.array().of(yup.strapiID().required()),\n  })\n  .noUnknown()\n  .required();\n\nconst validateDuplicatesMoveManyFoldersFilesSchema = yup\n  .object()\n  .test('are-folders-unique', 'some folders already exist', async function areFoldersUnique(value) {\n    const { folderIds, destinationFolderId } = value;\n    if (isEmpty(folderIds)) return true;\n\n    const folders = await strapi.db.query(FOLDER_MODEL_UID).findMany({\n      select: ['name'],\n      where: { id: { $in: folderIds } },\n    });\n\n    const existingFolders = await strapi.db.query(FOLDER_MODEL_UID).findMany({\n      select: ['name'],\n      where: { parent: { id: destinationFolderId } },\n    });\n\n    const duplicatedNames = intersection(map(existingFolders, 'name'), map(folders, 'name'));\n    if (duplicatedNames.length > 0) {\n      return this.createError({\n        message: `some folders already exists: ${duplicatedNames.join(', ')}`,\n      });\n    }\n\n    return true;\n  });\n\nconst validateMoveFoldersNotInsideThemselvesSchema = yup\n  .object()\n  .test(\n    'dont-move-inside-self',\n    'folders cannot be moved inside themselves or one of its children',\n    async function validateMoveFoldersNotInsideThemselves(value) {\n      const { folderIds, destinationFolderId } = value;\n      if (destinationFolderId === null || isEmpty(folderIds)) return true;\n\n      const destinationFolder = await strapi.db.query(FOLDER_MODEL_UID).findOne({\n        select: ['path'],\n        where: { id: destinationFolderId },\n      });\n\n      const folders: Folder[] = await strapi.db.query(FOLDER_MODEL_UID).findMany({\n        select: ['name', 'path'],\n        where: { id: { $in: folderIds } },\n      });\n\n      const unmovableFoldersNames = folders\n        .filter((folder) => isFolderOrChild(destinationFolder, folder))\n        .map((f) => f.name);\n\n      if (unmovableFoldersNames.length > 0) {\n        return this.createError({\n          message: `folders cannot be moved inside themselves or one of its children: ${unmovableFoldersNames.join(\n            ', '\n          )}`,\n        });\n      }\n\n      return true;\n    }\n  );\n\nexport const validateDeleteManyFoldersFiles = validateYupSchema(\n  validateDeleteManyFoldersFilesSchema\n);\n\nexport async function validateMoveManyFoldersFiles(body: unknown) {\n  await validateYupSchema(validateStructureMoveManyFoldersFilesSchema)(body);\n  await validateYupSchema(validateDuplicatesMoveManyFoldersFilesSchema)(body);\n  await validateYupSchema(validateMoveFoldersNotInsideThemselvesSchema)(body);\n}\n"],"names":["validateDeleteManyFoldersFilesSchema","yup","object","shape","fileIds","array","of","strapiID","required","folderIds","noUnknown","validateStructureMoveManyFoldersFilesSchema","destinationFolderId","nullable","defined","test","folderExists","validateDuplicatesMoveManyFoldersFilesSchema","areFoldersUnique","value","isEmpty","folders","strapi","db","query","FOLDER_MODEL_UID","findMany","select","where","id","$in","existingFolders","parent","duplicatedNames","intersection","map","length","createError","message","join","validateMoveFoldersNotInsideThemselvesSchema","validateMoveFoldersNotInsideThemselves","destinationFolder","findOne","unmovableFoldersNames","filter","folder","isFolderOrChild","f","name","validateDeleteManyFoldersFiles","validateYupSchema","validateMoveManyFoldersFiles","body"],"mappings":"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"}

package/dist/server/controllers/validation/admin/folder.js

@@ -1,6 +1,5 @@
 'use strict';
 
-var fp = require('lodash/fp');
 var utils = require('@strapi/utils');
 var index = require('../../../utils/index.js');
 var constants = require('../../../constants.js');
@@ -20,13 +19,13 @@ const isNameUniqueInFolder = (id)=>{
             filters.id = {
                 $ne: id
             };
-            if (fp.isUndefined(name)) {
+            if (name === undefined) {
                 const existingFolder = await strapi.db.query(constants.FOLDER_MODEL_UID).findOne({
                     where: {
                         id
                     }
                 });
-                filters.name = fp.get('name', existingFolder);
+                filters.name = existingFolder?.name;
             }
         }
         const doesExist = await exists(filters);
@@ -40,7 +39,7 @@ const validateCreateFolderSchema = utils.yup.object().shape({
 const validateUpdateFolderSchema = (id)=>utils.yup.object().shape({
         name: utils.yup.string().min(1).matches(NO_SLASH_REGEX, 'name cannot contain slashes').matches(NO_SPACES_AROUND, 'name cannot start or end with a whitespace').test('is-folder-unique', 'A folder with this name already exists', isNameUniqueInFolder(id)),
         parent: utils.yup.strapiID().nullable().test('folder-exists', 'parent folder does not exist', utils$1.folderExists).test('dont-move-inside-self', 'folder cannot be moved inside itself', async function test(parent) {
-            if (fp.isNil(parent)) return true;
+            if (parent == null) return true;
             const destinationFolder = await strapi.db.query(constants.FOLDER_MODEL_UID).findOne({
                 select: [
                     'path'

package/dist/server/controllers/validation/admin/folder.js.map

@@ -1 +1 @@
-{"version":3,"file":"folder.js","sources":["../../../../../server/src/controllers/validation/admin/folder.ts"],"sourcesContent":["import { isUndefined, get, isNil } from 'lodash/fp';\nimport { yup, validateYupSchema } from '@strapi/utils';\nimport { getService } from '../../../utils';\nimport { FOLDER_MODEL_UID } from '../../../constants';\nimport { folderExists } from './utils';\nimport { isFolderOrChild } from '../../utils/folders';\n\nconst NO_SLASH_REGEX = /^[^/]+$/;\nconst NO_SPACES_AROUND = /^(?! ).+(?<! )$/;\n\nconst isNameUniqueInFolder = (id?: number): yup.TestFunction<string | undefined> => {\n  return async function test(name?: string) {\n    const { exists } = getService('folder');\n    const filters: Record<string, unknown> = { name, parent: this.parent.parent || null };\n    if (id) {\n      filters.id = { $ne: id };\n\n      if (isUndefined(name)) {\n        const existingFolder = await strapi.db.query(FOLDER_MODEL_UID).findOne({ where: { id } });\n        filters.name = get('name', existingFolder);\n      }\n    }\n\n    const doesExist = await exists(filters);\n    return !doesExist;\n  };\n};\n\nconst validateCreateFolderSchema = yup\n  .object()\n  .shape({\n    name: yup\n      .string()\n      .min(1)\n      .matches(NO_SLASH_REGEX, 'name cannot contain slashes')\n      .matches(NO_SPACES_AROUND, 'name cannot start or end with a whitespace')\n      .required()\n      .test('is-folder-unique', 'A folder with this name already exists', isNameUniqueInFolder()),\n    parent: yup\n      .strapiID()\n      .nullable()\n      .test('folder-exists', 'parent folder does not exist', folderExists),\n  })\n  .noUnknown()\n  .required();\n\nconst validateUpdateFolderSchema = (id: number) =>\n  yup\n    .object()\n    .shape({\n      name: yup\n        .string()\n        .min(1)\n        .matches(NO_SLASH_REGEX, 'name cannot contain slashes')\n        .matches(NO_SPACES_AROUND, 'name cannot start or end with a whitespace')\n        .test(\n          'is-folder-unique',\n          'A folder with this name already exists',\n          isNameUniqueInFolder(id)\n        ),\n      parent: yup\n        .strapiID()\n        .nullable()\n        .test('folder-exists', 'parent folder does not exist', folderExists)\n        .test(\n          'dont-move-inside-self',\n          'folder cannot be moved inside itself',\n          async function test(parent) {\n            if (isNil(parent)) return true;\n\n            const destinationFolder = await strapi.db.query(FOLDER_MODEL_UID).findOne({\n              select: ['path'],\n              where: { id: parent },\n            });\n\n            const currentFolder = await strapi.db.query(FOLDER_MODEL_UID).findOne({\n              select: ['path'],\n              where: { id },\n            });\n\n            if (!destinationFolder || !currentFolder) return true;\n\n            return !isFolderOrChild(destinationFolder, currentFolder);\n          }\n        ),\n    })\n    .noUnknown()\n    .required();\n\nexport const validateCreateFolder = validateYupSchema(validateCreateFolderSchema);\nexport const validateUpdateFolder = (id: number) =>\n  validateYupSchema(validateUpdateFolderSchema(id));\n"],"names":["NO_SLASH_REGEX","NO_SPACES_AROUND","isNameUniqueInFolder","id","test","name","exists","getService","filters","parent","$ne","isUndefined","existingFolder","strapi","db","query","FOLDER_MODEL_UID","findOne","where","get","doesExist","validateCreateFolderSchema","yup","object","shape","string","min","matches","required","strapiID","nullable","folderExists","noUnknown","validateUpdateFolderSchema","isNil","destinationFolder","select","currentFolder","isFolderOrChild","validateCreateFolder","validateYupSchema","validateUpdateFolder"],"mappings":"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"}
+{"version":3,"file":"folder.js","sources":["../../../../../server/src/controllers/validation/admin/folder.ts"],"sourcesContent":["import { yup, validateYupSchema } from '@strapi/utils';\nimport { getService } from '../../../utils';\nimport { FOLDER_MODEL_UID } from '../../../constants';\nimport { folderExists } from './utils';\nimport { isFolderOrChild } from '../../utils/folders';\n\nconst NO_SLASH_REGEX = /^[^/]+$/;\nconst NO_SPACES_AROUND = /^(?! ).+(?<! )$/;\n\nconst isNameUniqueInFolder = (id?: number): yup.TestFunction<string | undefined> => {\n  return async function test(name?: string) {\n    const { exists } = getService('folder');\n    const filters: Record<string, unknown> = { name, parent: this.parent.parent || null };\n    if (id) {\n      filters.id = { $ne: id };\n\n      if (name === undefined) {\n        const existingFolder = await strapi.db.query(FOLDER_MODEL_UID).findOne({ where: { id } });\n        filters.name = existingFolder?.name;\n      }\n    }\n\n    const doesExist = await exists(filters);\n    return !doesExist;\n  };\n};\n\nconst validateCreateFolderSchema = yup\n  .object()\n  .shape({\n    name: yup\n      .string()\n      .min(1)\n      .matches(NO_SLASH_REGEX, 'name cannot contain slashes')\n      .matches(NO_SPACES_AROUND, 'name cannot start or end with a whitespace')\n      .required()\n      .test('is-folder-unique', 'A folder with this name already exists', isNameUniqueInFolder()),\n    parent: yup\n      .strapiID()\n      .nullable()\n      .test('folder-exists', 'parent folder does not exist', folderExists),\n  })\n  .noUnknown()\n  .required();\n\nconst validateUpdateFolderSchema = (id: number) =>\n  yup\n    .object()\n    .shape({\n      name: yup\n        .string()\n        .min(1)\n        .matches(NO_SLASH_REGEX, 'name cannot contain slashes')\n        .matches(NO_SPACES_AROUND, 'name cannot start or end with a whitespace')\n        .test(\n          'is-folder-unique',\n          'A folder with this name already exists',\n          isNameUniqueInFolder(id)\n        ),\n      parent: yup\n        .strapiID()\n        .nullable()\n        .test('folder-exists', 'parent folder does not exist', folderExists)\n        .test(\n          'dont-move-inside-self',\n          'folder cannot be moved inside itself',\n          async function test(parent) {\n            if (parent == null) return true;\n\n            const destinationFolder = await strapi.db.query(FOLDER_MODEL_UID).findOne({\n              select: ['path'],\n              where: { id: parent },\n            });\n\n            const currentFolder = await strapi.db.query(FOLDER_MODEL_UID).findOne({\n              select: ['path'],\n              where: { id },\n            });\n\n            if (!destinationFolder || !currentFolder) return true;\n\n            return !isFolderOrChild(destinationFolder, currentFolder);\n          }\n        ),\n    })\n    .noUnknown()\n    .required();\n\nexport const validateCreateFolder = validateYupSchema(validateCreateFolderSchema);\nexport const validateUpdateFolder = (id: number) =>\n  validateYupSchema(validateUpdateFolderSchema(id));\n"],"names":["NO_SLASH_REGEX","NO_SPACES_AROUND","isNameUniqueInFolder","id","test","name","exists","getService","filters","parent","$ne","undefined","existingFolder","strapi","db","query","FOLDER_MODEL_UID","findOne","where","doesExist","validateCreateFolderSchema","yup","object","shape","string","min","matches","required","strapiID","nullable","folderExists","noUnknown","validateUpdateFolderSchema","destinationFolder","select","currentFolder","isFolderOrChild","validateCreateFolder","validateYupSchema","validateUpdateFolder"],"mappings":"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"}

package/dist/server/controllers/validation/admin/folder.mjs

@@ -1,4 +1,3 @@
-import { isNil, isUndefined, get } from 'lodash/fp';
 import { yup, validateYupSchema } from '@strapi/utils';
 import { getService } from '../../../utils/index.mjs';
 import { FOLDER_MODEL_UID } from '../../../constants.mjs';
@@ -18,13 +17,13 @@ const isNameUniqueInFolder = (id)=>{
             filters.id = {
                 $ne: id
             };
-            if (isUndefined(name)) {
+            if (name === undefined) {
                 const existingFolder = await strapi.db.query(FOLDER_MODEL_UID).findOne({
                     where: {
                         id
                     }
                 });
-                filters.name = get('name', existingFolder);
+                filters.name = existingFolder?.name;
             }
         }
         const doesExist = await exists(filters);
@@ -38,7 +37,7 @@ const validateCreateFolderSchema = yup.object().shape({
 const validateUpdateFolderSchema = (id)=>yup.object().shape({
         name: yup.string().min(1).matches(NO_SLASH_REGEX, 'name cannot contain slashes').matches(NO_SPACES_AROUND, 'name cannot start or end with a whitespace').test('is-folder-unique', 'A folder with this name already exists', isNameUniqueInFolder(id)),
         parent: yup.strapiID().nullable().test('folder-exists', 'parent folder does not exist', folderExists).test('dont-move-inside-self', 'folder cannot be moved inside itself', async function test(parent) {
-            if (isNil(parent)) return true;
+            if (parent == null) return true;
             const destinationFolder = await strapi.db.query(FOLDER_MODEL_UID).findOne({
                 select: [
                     'path'

package/dist/server/controllers/validation/admin/folder.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"folder.mjs","sources":["../../../../../server/src/controllers/validation/admin/folder.ts"],"sourcesContent":["import { isUndefined, get, isNil } from 'lodash/fp';\nimport { yup, validateYupSchema } from '@strapi/utils';\nimport { getService } from '../../../utils';\nimport { FOLDER_MODEL_UID } from '../../../constants';\nimport { folderExists } from './utils';\nimport { isFolderOrChild } from '../../utils/folders';\n\nconst NO_SLASH_REGEX = /^[^/]+$/;\nconst NO_SPACES_AROUND = /^(?! ).+(?<! )$/;\n\nconst isNameUniqueInFolder = (id?: number): yup.TestFunction<string | undefined> => {\n  return async function test(name?: string) {\n    const { exists } = getService('folder');\n    const filters: Record<string, unknown> = { name, parent: this.parent.parent || null };\n    if (id) {\n      filters.id = { $ne: id };\n\n      if (isUndefined(name)) {\n        const existingFolder = await strapi.db.query(FOLDER_MODEL_UID).findOne({ where: { id } });\n        filters.name = get('name', existingFolder);\n      }\n    }\n\n    const doesExist = await exists(filters);\n    return !doesExist;\n  };\n};\n\nconst validateCreateFolderSchema = yup\n  .object()\n  .shape({\n    name: yup\n      .string()\n      .min(1)\n      .matches(NO_SLASH_REGEX, 'name cannot contain slashes')\n      .matches(NO_SPACES_AROUND, 'name cannot start or end with a whitespace')\n      .required()\n      .test('is-folder-unique', 'A folder with this name already exists', isNameUniqueInFolder()),\n    parent: yup\n      .strapiID()\n      .nullable()\n      .test('folder-exists', 'parent folder does not exist', folderExists),\n  })\n  .noUnknown()\n  .required();\n\nconst validateUpdateFolderSchema = (id: number) =>\n  yup\n    .object()\n    .shape({\n      name: yup\n        .string()\n        .min(1)\n        .matches(NO_SLASH_REGEX, 'name cannot contain slashes')\n        .matches(NO_SPACES_AROUND, 'name cannot start or end with a whitespace')\n        .test(\n          'is-folder-unique',\n          'A folder with this name already exists',\n          isNameUniqueInFolder(id)\n        ),\n      parent: yup\n        .strapiID()\n        .nullable()\n        .test('folder-exists', 'parent folder does not exist', folderExists)\n        .test(\n          'dont-move-inside-self',\n          'folder cannot be moved inside itself',\n          async function test(parent) {\n            if (isNil(parent)) return true;\n\n            const destinationFolder = await strapi.db.query(FOLDER_MODEL_UID).findOne({\n              select: ['path'],\n              where: { id: parent },\n            });\n\n            const currentFolder = await strapi.db.query(FOLDER_MODEL_UID).findOne({\n              select: ['path'],\n              where: { id },\n            });\n\n            if (!destinationFolder || !currentFolder) return true;\n\n            return !isFolderOrChild(destinationFolder, currentFolder);\n          }\n        ),\n    })\n    .noUnknown()\n    .required();\n\nexport const validateCreateFolder = validateYupSchema(validateCreateFolderSchema);\nexport const validateUpdateFolder = (id: number) =>\n  validateYupSchema(validateUpdateFolderSchema(id));\n"],"names":["NO_SLASH_REGEX","NO_SPACES_AROUND","isNameUniqueInFolder","id","test","name","exists","getService","filters","parent","$ne","isUndefined","existingFolder","strapi","db","query","FOLDER_MODEL_UID","findOne","where","get","doesExist","validateCreateFolderSchema","yup","object","shape","string","min","matches","required","strapiID","nullable","folderExists","noUnknown","validateUpdateFolderSchema","isNil","destinationFolder","select","currentFolder","isFolderOrChild","validateCreateFolder","validateYupSchema","validateUpdateFolder"],"mappings":"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"}
+{"version":3,"file":"folder.mjs","sources":["../../../../../server/src/controllers/validation/admin/folder.ts"],"sourcesContent":["import { yup, validateYupSchema } from '@strapi/utils';\nimport { getService } from '../../../utils';\nimport { FOLDER_MODEL_UID } from '../../../constants';\nimport { folderExists } from './utils';\nimport { isFolderOrChild } from '../../utils/folders';\n\nconst NO_SLASH_REGEX = /^[^/]+$/;\nconst NO_SPACES_AROUND = /^(?! ).+(?<! )$/;\n\nconst isNameUniqueInFolder = (id?: number): yup.TestFunction<string | undefined> => {\n  return async function test(name?: string) {\n    const { exists } = getService('folder');\n    const filters: Record<string, unknown> = { name, parent: this.parent.parent || null };\n    if (id) {\n      filters.id = { $ne: id };\n\n      if (name === undefined) {\n        const existingFolder = await strapi.db.query(FOLDER_MODEL_UID).findOne({ where: { id } });\n        filters.name = existingFolder?.name;\n      }\n    }\n\n    const doesExist = await exists(filters);\n    return !doesExist;\n  };\n};\n\nconst validateCreateFolderSchema = yup\n  .object()\n  .shape({\n    name: yup\n      .string()\n      .min(1)\n      .matches(NO_SLASH_REGEX, 'name cannot contain slashes')\n      .matches(NO_SPACES_AROUND, 'name cannot start or end with a whitespace')\n      .required()\n      .test('is-folder-unique', 'A folder with this name already exists', isNameUniqueInFolder()),\n    parent: yup\n      .strapiID()\n      .nullable()\n      .test('folder-exists', 'parent folder does not exist', folderExists),\n  })\n  .noUnknown()\n  .required();\n\nconst validateUpdateFolderSchema = (id: number) =>\n  yup\n    .object()\n    .shape({\n      name: yup\n        .string()\n        .min(1)\n        .matches(NO_SLASH_REGEX, 'name cannot contain slashes')\n        .matches(NO_SPACES_AROUND, 'name cannot start or end with a whitespace')\n        .test(\n          'is-folder-unique',\n          'A folder with this name already exists',\n          isNameUniqueInFolder(id)\n        ),\n      parent: yup\n        .strapiID()\n        .nullable()\n        .test('folder-exists', 'parent folder does not exist', folderExists)\n        .test(\n          'dont-move-inside-self',\n          'folder cannot be moved inside itself',\n          async function test(parent) {\n            if (parent == null) return true;\n\n            const destinationFolder = await strapi.db.query(FOLDER_MODEL_UID).findOne({\n              select: ['path'],\n              where: { id: parent },\n            });\n\n            const currentFolder = await strapi.db.query(FOLDER_MODEL_UID).findOne({\n              select: ['path'],\n              where: { id },\n            });\n\n            if (!destinationFolder || !currentFolder) return true;\n\n            return !isFolderOrChild(destinationFolder, currentFolder);\n          }\n        ),\n    })\n    .noUnknown()\n    .required();\n\nexport const validateCreateFolder = validateYupSchema(validateCreateFolderSchema);\nexport const validateUpdateFolder = (id: number) =>\n  validateYupSchema(validateUpdateFolderSchema(id));\n"],"names":["NO_SLASH_REGEX","NO_SPACES_AROUND","isNameUniqueInFolder","id","test","name","exists","getService","filters","parent","$ne","undefined","existingFolder","strapi","db","query","FOLDER_MODEL_UID","findOne","where","doesExist","validateCreateFolderSchema","yup","object","shape","string","min","matches","required","strapiID","nullable","folderExists","noUnknown","validateUpdateFolderSchema","destinationFolder","select","currentFolder","isFolderOrChild","validateCreateFolder","validateYupSchema","validateUpdateFolder"],"mappings":"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"}

package/dist/server/controllers/validation/admin/upload.js

@@ -1,7 +1,6 @@
 'use strict';
 
 var utils = require('@strapi/utils');
-var fp = require('lodash/fp');
 var index = require('../../../utils/index.js');
 
 const focalPointSchema = utils.yup.object({
@@ -14,7 +13,7 @@ const fileInfoSchema = utils.yup.object({
     caption: utils.yup.string().nullable(),
     focalPoint: focalPointSchema,
     folder: utils.yup.strapiID().nullable().test('folder-exists', 'the folder does not exist', async (folderId)=>{
-        if (fp.isNil(folderId)) {
+        if (folderId == null) {
             return true;
         }
         const exists = await index.getService('folder').exists({

package/dist/server/controllers/validation/admin/upload.js.map

@@ -1 +1 @@
-{"version":3,"file":"upload.js","sources":["../../../../../server/src/controllers/validation/admin/upload.ts"],"sourcesContent":["import { yup, validateYupSchema } from '@strapi/utils';\nimport { isNil } from 'lodash/fp';\nimport { getService } from '../../../utils';\n\nconst focalPointSchema = yup\n  .object({\n    x: yup.number().min(0).max(100).required(),\n    y: yup.number().min(0).max(100).required(),\n  })\n  .nullable()\n  .default(null);\n\nconst fileInfoSchema = yup.object({\n  name: yup.string().nullable(),\n  alternativeText: yup.string().nullable(),\n  caption: yup.string().nullable(),\n  focalPoint: focalPointSchema,\n  folder: yup\n    .strapiID()\n    .nullable()\n    .test('folder-exists', 'the folder does not exist', async (folderId) => {\n      if (isNil(folderId)) {\n        return true;\n      }\n\n      const exists = await getService('folder').exists({ id: folderId });\n\n      return exists;\n    }),\n});\n\nconst uploadSchema = yup.object({\n  fileInfo: fileInfoSchema,\n});\n\nconst multiUploadSchema = yup.object({\n  fileInfo: yup.array().of(fileInfoSchema),\n});\n\nconst validateUploadBody = (data = {}, isMulti = false) => {\n  const schema = isMulti ? multiUploadSchema : uploadSchema;\n\n  return validateYupSchema(schema, { strict: false })(data);\n};\n\nexport { validateUploadBody };\n\nexport type UploadBody =\n  | yup.InferType<typeof uploadSchema>\n  | yup.InferType<typeof multiUploadSchema>;\n\nconst bulkUpdatesSchema = yup.object({\n  updates: yup\n    .array()\n    .of(\n      yup.object({\n        id: yup.number().required(),\n        fileInfo: fileInfoSchema.required(),\n      })\n    )\n    .min(1)\n    .required(),\n});\n\nexport const validateBulkUpdateBody = validateYupSchema(bulkUpdatesSchema);\n"],"names":["focalPointSchema","yup","object","x","number","min","max","required","y","nullable","default","fileInfoSchema","name","string","alternativeText","caption","focalPoint","folder","strapiID","test","folderId","isNil","exists","getService","id","uploadSchema","fileInfo","multiUploadSchema","array","of","validateUploadBody","data","isMulti","schema","validateYupSchema","strict","bulkUpdatesSchema","updates","validateBulkUpdateBody"],"mappings":";;;;;;AAIA,MAAMA,gBAAAA,GAAmBC,SAAAA,CACtBC,MAAM,CAAC;IACNC,CAAAA,EAAGF,SAAAA,CAAIG,MAAM,EAAA,CAAGC,GAAG,CAAC,CAAA,CAAA,CAAGC,GAAG,CAAC,GAAA,CAAA,CAAKC,QAAQ,EAAA;IACxCC,CAAAA,EAAGP,SAAAA,CAAIG,MAAM,EAAA,CAAGC,GAAG,CAAC,CAAA,CAAA,CAAGC,GAAG,CAAC,GAAA,CAAA,CAAKC,QAAQ;AAC1C,CAAA,CAAA,CACCE,QAAQ,EAAA,CACRC,OAAO,CAAC,IAAA,CAAA;AAEX,MAAMC,cAAAA,GAAiBV,SAAAA,CAAIC,MAAM,CAAC;IAChCU,IAAAA,EAAMX,SAAAA,CAAIY,MAAM,EAAA,CAAGJ,QAAQ,EAAA;IAC3BK,eAAAA,EAAiBb,SAAAA,CAAIY,MAAM,EAAA,CAAGJ,QAAQ,EAAA;IACtCM,OAAAA,EAASd,SAAAA,CAAIY,MAAM,EAAA,CAAGJ,QAAQ,EAAA;IAC9BO,UAAAA,EAAYhB,gBAAAA;IACZiB,MAAAA,EAAQhB,SAAAA,CACLiB,QAAQ,EAAA,CACRT,QAAQ,GACRU,IAAI,CAAC,eAAA,EAAiB,2BAAA,EAA6B,OAAOC,QAAAA,GAAAA;AACzD,QAAA,IAAIC,SAAMD,QAAAA,CAAAA,EAAW;YACnB,OAAO,IAAA;AACT,QAAA;AAEA,QAAA,MAAME,MAAAA,GAAS,MAAMC,gBAAAA,CAAW,QAAA,CAAA,CAAUD,MAAM,CAAC;YAAEE,EAAAA,EAAIJ;AAAS,SAAA,CAAA;QAEhE,OAAOE,MAAAA;AACT,IAAA,CAAA;AACJ,CAAA,CAAA;AAEA,MAAMG,YAAAA,GAAexB,SAAAA,CAAIC,MAAM,CAAC;IAC9BwB,QAAAA,EAAUf;AACZ,CAAA,CAAA;AAEA,MAAMgB,iBAAAA,GAAoB1B,SAAAA,CAAIC,MAAM,CAAC;AACnCwB,IAAAA,QAAAA,EAAUzB,SAAAA,CAAI2B,KAAK,EAAA,CAAGC,EAAE,CAAClB,cAAAA;AAC3B,CAAA,CAAA;AAEA,MAAMmB,qBAAqB,CAACC,IAAAA,GAAO,EAAE,EAAEC,UAAU,KAAK,GAAA;IACpD,MAAMC,MAAAA,GAASD,UAAUL,iBAAAA,GAAoBF,YAAAA;AAE7C,IAAA,OAAOS,wBAAkBD,MAAAA,EAAQ;QAAEE,MAAAA,EAAQ;KAAM,CAAA,CAAGJ,IAAAA,CAAAA;AACtD;AAQA,MAAMK,iBAAAA,GAAoBnC,SAAAA,CAAIC,MAAM,CAAC;AACnCmC,IAAAA,OAAAA,EAASpC,UACN2B,KAAK,EAAA,CACLC,EAAE,CACD5B,SAAAA,CAAIC,MAAM,CAAC;QACTsB,EAAAA,EAAIvB,SAAAA,CAAIG,MAAM,EAAA,CAAGG,QAAQ,EAAA;AACzBmB,QAAAA,QAAAA,EAAUf,eAAeJ,QAAQ;KACnC,CAAA,CAAA,CAEDF,GAAG,CAAC,CAAA,CAAA,CACJE,QAAQ;AACb,CAAA,CAAA;AAEO,MAAM+B,sBAAAA,GAAyBJ,uBAAAA,CAAkBE,iBAAAA;;;;;"}
+{"version":3,"file":"upload.js","sources":["../../../../../server/src/controllers/validation/admin/upload.ts"],"sourcesContent":["import { yup, validateYupSchema } from '@strapi/utils';\nimport { getService } from '../../../utils';\n\nconst focalPointSchema = yup\n  .object({\n    x: yup.number().min(0).max(100).required(),\n    y: yup.number().min(0).max(100).required(),\n  })\n  .nullable()\n  .default(null);\n\nconst fileInfoSchema = yup.object({\n  name: yup.string().nullable(),\n  alternativeText: yup.string().nullable(),\n  caption: yup.string().nullable(),\n  focalPoint: focalPointSchema,\n  folder: yup\n    .strapiID()\n    .nullable()\n    .test('folder-exists', 'the folder does not exist', async (folderId) => {\n      if (folderId == null) {\n        return true;\n      }\n\n      const exists = await getService('folder').exists({ id: folderId });\n\n      return exists;\n    }),\n});\n\nconst uploadSchema = yup.object({\n  fileInfo: fileInfoSchema,\n});\n\nconst multiUploadSchema = yup.object({\n  fileInfo: yup.array().of(fileInfoSchema),\n});\n\nconst validateUploadBody = (data = {}, isMulti = false) => {\n  const schema = isMulti ? multiUploadSchema : uploadSchema;\n\n  return validateYupSchema(schema, { strict: false })(data);\n};\n\nexport { validateUploadBody };\n\nexport type UploadBody =\n  | yup.InferType<typeof uploadSchema>\n  | yup.InferType<typeof multiUploadSchema>;\n\nconst bulkUpdatesSchema = yup.object({\n  updates: yup\n    .array()\n    .of(\n      yup.object({\n        id: yup.number().required(),\n        fileInfo: fileInfoSchema.required(),\n      })\n    )\n    .min(1)\n    .required(),\n});\n\nexport const validateBulkUpdateBody = validateYupSchema(bulkUpdatesSchema);\n"],"names":["focalPointSchema","yup","object","x","number","min","max","required","y","nullable","default","fileInfoSchema","name","string","alternativeText","caption","focalPoint","folder","strapiID","test","folderId","exists","getService","id","uploadSchema","fileInfo","multiUploadSchema","array","of","validateUploadBody","data","isMulti","schema","validateYupSchema","strict","bulkUpdatesSchema","updates","validateBulkUpdateBody"],"mappings":";;;;;AAGA,MAAMA,gBAAAA,GAAmBC,SAAAA,CACtBC,MAAM,CAAC;IACNC,CAAAA,EAAGF,SAAAA,CAAIG,MAAM,EAAA,CAAGC,GAAG,CAAC,CAAA,CAAA,CAAGC,GAAG,CAAC,GAAA,CAAA,CAAKC,QAAQ,EAAA;IACxCC,CAAAA,EAAGP,SAAAA,CAAIG,MAAM,EAAA,CAAGC,GAAG,CAAC,CAAA,CAAA,CAAGC,GAAG,CAAC,GAAA,CAAA,CAAKC,QAAQ;AAC1C,CAAA,CAAA,CACCE,QAAQ,EAAA,CACRC,OAAO,CAAC,IAAA,CAAA;AAEX,MAAMC,cAAAA,GAAiBV,SAAAA,CAAIC,MAAM,CAAC;IAChCU,IAAAA,EAAMX,SAAAA,CAAIY,MAAM,EAAA,CAAGJ,QAAQ,EAAA;IAC3BK,eAAAA,EAAiBb,SAAAA,CAAIY,MAAM,EAAA,CAAGJ,QAAQ,EAAA;IACtCM,OAAAA,EAASd,SAAAA,CAAIY,MAAM,EAAA,CAAGJ,QAAQ,EAAA;IAC9BO,UAAAA,EAAYhB,gBAAAA;IACZiB,MAAAA,EAAQhB,SAAAA,CACLiB,QAAQ,EAAA,CACRT,QAAQ,GACRU,IAAI,CAAC,eAAA,EAAiB,2BAAA,EAA6B,OAAOC,QAAAA,GAAAA;AACzD,QAAA,IAAIA,YAAY,IAAA,EAAM;YACpB,OAAO,IAAA;AACT,QAAA;AAEA,QAAA,MAAMC,MAAAA,GAAS,MAAMC,gBAAAA,CAAW,QAAA,CAAA,CAAUD,MAAM,CAAC;YAAEE,EAAAA,EAAIH;AAAS,SAAA,CAAA;QAEhE,OAAOC,MAAAA;AACT,IAAA,CAAA;AACJ,CAAA,CAAA;AAEA,MAAMG,YAAAA,GAAevB,SAAAA,CAAIC,MAAM,CAAC;IAC9BuB,QAAAA,EAAUd;AACZ,CAAA,CAAA;AAEA,MAAMe,iBAAAA,GAAoBzB,SAAAA,CAAIC,MAAM,CAAC;AACnCuB,IAAAA,QAAAA,EAAUxB,SAAAA,CAAI0B,KAAK,EAAA,CAAGC,EAAE,CAACjB,cAAAA;AAC3B,CAAA,CAAA;AAEA,MAAMkB,qBAAqB,CAACC,IAAAA,GAAO,EAAE,EAAEC,UAAU,KAAK,GAAA;IACpD,MAAMC,MAAAA,GAASD,UAAUL,iBAAAA,GAAoBF,YAAAA;AAE7C,IAAA,OAAOS,wBAAkBD,MAAAA,EAAQ;QAAEE,MAAAA,EAAQ;KAAM,CAAA,CAAGJ,IAAAA,CAAAA;AACtD;AAQA,MAAMK,iBAAAA,GAAoBlC,SAAAA,CAAIC,MAAM,CAAC;AACnCkC,IAAAA,OAAAA,EAASnC,UACN0B,KAAK,EAAA,CACLC,EAAE,CACD3B,SAAAA,CAAIC,MAAM,CAAC;QACTqB,EAAAA,EAAItB,SAAAA,CAAIG,MAAM,EAAA,CAAGG,QAAQ,EAAA;AACzBkB,QAAAA,QAAAA,EAAUd,eAAeJ,QAAQ;KACnC,CAAA,CAAA,CAEDF,GAAG,CAAC,CAAA,CAAA,CACJE,QAAQ;AACb,CAAA,CAAA;AAEO,MAAM8B,sBAAAA,GAAyBJ,uBAAAA,CAAkBE,iBAAAA;;;;;"}

package/dist/server/controllers/validation/admin/upload.mjs

@@ -1,5 +1,4 @@
 import { yup, validateYupSchema } from '@strapi/utils';
-import { isNil } from 'lodash/fp';
 import { getService } from '../../../utils/index.mjs';
 
 const focalPointSchema = yup.object({
@@ -12,7 +11,7 @@ const fileInfoSchema = yup.object({
     caption: yup.string().nullable(),
     focalPoint: focalPointSchema,
     folder: yup.strapiID().nullable().test('folder-exists', 'the folder does not exist', async (folderId)=>{
-        if (isNil(folderId)) {
+        if (folderId == null) {
             return true;
         }
         const exists = await getService('folder').exists({

package/dist/server/controllers/validation/admin/upload.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"upload.mjs","sources":["../../../../../server/src/controllers/validation/admin/upload.ts"],"sourcesContent":["import { yup, validateYupSchema } from '@strapi/utils';\nimport { isNil } from 'lodash/fp';\nimport { getService } from '../../../utils';\n\nconst focalPointSchema = yup\n  .object({\n    x: yup.number().min(0).max(100).required(),\n    y: yup.number().min(0).max(100).required(),\n  })\n  .nullable()\n  .default(null);\n\nconst fileInfoSchema = yup.object({\n  name: yup.string().nullable(),\n  alternativeText: yup.string().nullable(),\n  caption: yup.string().nullable(),\n  focalPoint: focalPointSchema,\n  folder: yup\n    .strapiID()\n    .nullable()\n    .test('folder-exists', 'the folder does not exist', async (folderId) => {\n      if (isNil(folderId)) {\n        return true;\n      }\n\n      const exists = await getService('folder').exists({ id: folderId });\n\n      return exists;\n    }),\n});\n\nconst uploadSchema = yup.object({\n  fileInfo: fileInfoSchema,\n});\n\nconst multiUploadSchema = yup.object({\n  fileInfo: yup.array().of(fileInfoSchema),\n});\n\nconst validateUploadBody = (data = {}, isMulti = false) => {\n  const schema = isMulti ? multiUploadSchema : uploadSchema;\n\n  return validateYupSchema(schema, { strict: false })(data);\n};\n\nexport { validateUploadBody };\n\nexport type UploadBody =\n  | yup.InferType<typeof uploadSchema>\n  | yup.InferType<typeof multiUploadSchema>;\n\nconst bulkUpdatesSchema = yup.object({\n  updates: yup\n    .array()\n    .of(\n      yup.object({\n        id: yup.number().required(),\n        fileInfo: fileInfoSchema.required(),\n      })\n    )\n    .min(1)\n    .required(),\n});\n\nexport const validateBulkUpdateBody = validateYupSchema(bulkUpdatesSchema);\n"],"names":["focalPointSchema","yup","object","x","number","min","max","required","y","nullable","default","fileInfoSchema","name","string","alternativeText","caption","focalPoint","folder","strapiID","test","folderId","isNil","exists","getService","id","uploadSchema","fileInfo","multiUploadSchema","array","of","validateUploadBody","data","isMulti","schema","validateYupSchema","strict","bulkUpdatesSchema","updates","validateBulkUpdateBody"],"mappings":";;;;AAIA,MAAMA,gBAAAA,GAAmBC,GAAAA,CACtBC,MAAM,CAAC;IACNC,CAAAA,EAAGF,GAAAA,CAAIG,MAAM,EAAA,CAAGC,GAAG,CAAC,CAAA,CAAA,CAAGC,GAAG,CAAC,GAAA,CAAA,CAAKC,QAAQ,EAAA;IACxCC,CAAAA,EAAGP,GAAAA,CAAIG,MAAM,EAAA,CAAGC,GAAG,CAAC,CAAA,CAAA,CAAGC,GAAG,CAAC,GAAA,CAAA,CAAKC,QAAQ;AAC1C,CAAA,CAAA,CACCE,QAAQ,EAAA,CACRC,OAAO,CAAC,IAAA,CAAA;AAEX,MAAMC,cAAAA,GAAiBV,GAAAA,CAAIC,MAAM,CAAC;IAChCU,IAAAA,EAAMX,GAAAA,CAAIY,MAAM,EAAA,CAAGJ,QAAQ,EAAA;IAC3BK,eAAAA,EAAiBb,GAAAA,CAAIY,MAAM,EAAA,CAAGJ,QAAQ,EAAA;IACtCM,OAAAA,EAASd,GAAAA,CAAIY,MAAM,EAAA,CAAGJ,QAAQ,EAAA;IAC9BO,UAAAA,EAAYhB,gBAAAA;IACZiB,MAAAA,EAAQhB,GAAAA,CACLiB,QAAQ,EAAA,CACRT,QAAQ,GACRU,IAAI,CAAC,eAAA,EAAiB,2BAAA,EAA6B,OAAOC,QAAAA,GAAAA;AACzD,QAAA,IAAIC,MAAMD,QAAAA,CAAAA,EAAW;YACnB,OAAO,IAAA;AACT,QAAA;AAEA,QAAA,MAAME,MAAAA,GAAS,MAAMC,UAAAA,CAAW,QAAA,CAAA,CAAUD,MAAM,CAAC;YAAEE,EAAAA,EAAIJ;AAAS,SAAA,CAAA;QAEhE,OAAOE,MAAAA;AACT,IAAA,CAAA;AACJ,CAAA,CAAA;AAEA,MAAMG,YAAAA,GAAexB,GAAAA,CAAIC,MAAM,CAAC;IAC9BwB,QAAAA,EAAUf;AACZ,CAAA,CAAA;AAEA,MAAMgB,iBAAAA,GAAoB1B,GAAAA,CAAIC,MAAM,CAAC;AACnCwB,IAAAA,QAAAA,EAAUzB,GAAAA,CAAI2B,KAAK,EAAA,CAAGC,EAAE,CAAClB,cAAAA;AAC3B,CAAA,CAAA;AAEA,MAAMmB,qBAAqB,CAACC,IAAAA,GAAO,EAAE,EAAEC,UAAU,KAAK,GAAA;IACpD,MAAMC,MAAAA,GAASD,UAAUL,iBAAAA,GAAoBF,YAAAA;AAE7C,IAAA,OAAOS,kBAAkBD,MAAAA,EAAQ;QAAEE,MAAAA,EAAQ;KAAM,CAAA,CAAGJ,IAAAA,CAAAA;AACtD;AAQA,MAAMK,iBAAAA,GAAoBnC,GAAAA,CAAIC,MAAM,CAAC;AACnCmC,IAAAA,OAAAA,EAASpC,IACN2B,KAAK,EAAA,CACLC,EAAE,CACD5B,GAAAA,CAAIC,MAAM,CAAC;QACTsB,EAAAA,EAAIvB,GAAAA,CAAIG,MAAM,EAAA,CAAGG,QAAQ,EAAA;AACzBmB,QAAAA,QAAAA,EAAUf,eAAeJ,QAAQ;KACnC,CAAA,CAAA,CAEDF,GAAG,CAAC,CAAA,CAAA,CACJE,QAAQ;AACb,CAAA,CAAA;AAEO,MAAM+B,sBAAAA,GAAyBJ,iBAAAA,CAAkBE,iBAAAA;;;;"}
+{"version":3,"file":"upload.mjs","sources":["../../../../../server/src/controllers/validation/admin/upload.ts"],"sourcesContent":["import { yup, validateYupSchema } from '@strapi/utils';\nimport { getService } from '../../../utils';\n\nconst focalPointSchema = yup\n  .object({\n    x: yup.number().min(0).max(100).required(),\n    y: yup.number().min(0).max(100).required(),\n  })\n  .nullable()\n  .default(null);\n\nconst fileInfoSchema = yup.object({\n  name: yup.string().nullable(),\n  alternativeText: yup.string().nullable(),\n  caption: yup.string().nullable(),\n  focalPoint: focalPointSchema,\n  folder: yup\n    .strapiID()\n    .nullable()\n    .test('folder-exists', 'the folder does not exist', async (folderId) => {\n      if (folderId == null) {\n        return true;\n      }\n\n      const exists = await getService('folder').exists({ id: folderId });\n\n      return exists;\n    }),\n});\n\nconst uploadSchema = yup.object({\n  fileInfo: fileInfoSchema,\n});\n\nconst multiUploadSchema = yup.object({\n  fileInfo: yup.array().of(fileInfoSchema),\n});\n\nconst validateUploadBody = (data = {}, isMulti = false) => {\n  const schema = isMulti ? multiUploadSchema : uploadSchema;\n\n  return validateYupSchema(schema, { strict: false })(data);\n};\n\nexport { validateUploadBody };\n\nexport type UploadBody =\n  | yup.InferType<typeof uploadSchema>\n  | yup.InferType<typeof multiUploadSchema>;\n\nconst bulkUpdatesSchema = yup.object({\n  updates: yup\n    .array()\n    .of(\n      yup.object({\n        id: yup.number().required(),\n        fileInfo: fileInfoSchema.required(),\n      })\n    )\n    .min(1)\n    .required(),\n});\n\nexport const validateBulkUpdateBody = validateYupSchema(bulkUpdatesSchema);\n"],"names":["focalPointSchema","yup","object","x","number","min","max","required","y","nullable","default","fileInfoSchema","name","string","alternativeText","caption","focalPoint","folder","strapiID","test","folderId","exists","getService","id","uploadSchema","fileInfo","multiUploadSchema","array","of","validateUploadBody","data","isMulti","schema","validateYupSchema","strict","bulkUpdatesSchema","updates","validateBulkUpdateBody"],"mappings":";;;AAGA,MAAMA,gBAAAA,GAAmBC,GAAAA,CACtBC,MAAM,CAAC;IACNC,CAAAA,EAAGF,GAAAA,CAAIG,MAAM,EAAA,CAAGC,GAAG,CAAC,CAAA,CAAA,CAAGC,GAAG,CAAC,GAAA,CAAA,CAAKC,QAAQ,EAAA;IACxCC,CAAAA,EAAGP,GAAAA,CAAIG,MAAM,EAAA,CAAGC,GAAG,CAAC,CAAA,CAAA,CAAGC,GAAG,CAAC,GAAA,CAAA,CAAKC,QAAQ;AAC1C,CAAA,CAAA,CACCE,QAAQ,EAAA,CACRC,OAAO,CAAC,IAAA,CAAA;AAEX,MAAMC,cAAAA,GAAiBV,GAAAA,CAAIC,MAAM,CAAC;IAChCU,IAAAA,EAAMX,GAAAA,CAAIY,MAAM,EAAA,CAAGJ,QAAQ,EAAA;IAC3BK,eAAAA,EAAiBb,GAAAA,CAAIY,MAAM,EAAA,CAAGJ,QAAQ,EAAA;IACtCM,OAAAA,EAASd,GAAAA,CAAIY,MAAM,EAAA,CAAGJ,QAAQ,EAAA;IAC9BO,UAAAA,EAAYhB,gBAAAA;IACZiB,MAAAA,EAAQhB,GAAAA,CACLiB,QAAQ,EAAA,CACRT,QAAQ,GACRU,IAAI,CAAC,eAAA,EAAiB,2BAAA,EAA6B,OAAOC,QAAAA,GAAAA;AACzD,QAAA,IAAIA,YAAY,IAAA,EAAM;YACpB,OAAO,IAAA;AACT,QAAA;AAEA,QAAA,MAAMC,MAAAA,GAAS,MAAMC,UAAAA,CAAW,QAAA,CAAA,CAAUD,MAAM,CAAC;YAAEE,EAAAA,EAAIH;AAAS,SAAA,CAAA;QAEhE,OAAOC,MAAAA;AACT,IAAA,CAAA;AACJ,CAAA,CAAA;AAEA,MAAMG,YAAAA,GAAevB,GAAAA,CAAIC,MAAM,CAAC;IAC9BuB,QAAAA,EAAUd;AACZ,CAAA,CAAA;AAEA,MAAMe,iBAAAA,GAAoBzB,GAAAA,CAAIC,MAAM,CAAC;AACnCuB,IAAAA,QAAAA,EAAUxB,GAAAA,CAAI0B,KAAK,EAAA,CAAGC,EAAE,CAACjB,cAAAA;AAC3B,CAAA,CAAA;AAEA,MAAMkB,qBAAqB,CAACC,IAAAA,GAAO,EAAE,EAAEC,UAAU,KAAK,GAAA;IACpD,MAAMC,MAAAA,GAASD,UAAUL,iBAAAA,GAAoBF,YAAAA;AAE7C,IAAA,OAAOS,kBAAkBD,MAAAA,EAAQ;QAAEE,MAAAA,EAAQ;KAAM,CAAA,CAAGJ,IAAAA,CAAAA;AACtD;AAQA,MAAMK,iBAAAA,GAAoBlC,GAAAA,CAAIC,MAAM,CAAC;AACnCkC,IAAAA,OAAAA,EAASnC,IACN0B,KAAK,EAAA,CACLC,EAAE,CACD3B,GAAAA,CAAIC,MAAM,CAAC;QACTqB,EAAAA,EAAItB,GAAAA,CAAIG,MAAM,EAAA,CAAGG,QAAQ,EAAA;AACzBkB,QAAAA,QAAAA,EAAUd,eAAeJ,QAAQ;KACnC,CAAA,CAAA,CAEDF,GAAG,CAAC,CAAA,CAAA,CACJE,QAAQ;AACb,CAAA,CAAA;AAEO,MAAM8B,sBAAAA,GAAyBJ,iBAAAA,CAAkBE,iBAAAA;;;;"}

package/dist/server/controllers/validation/admin/utils.js

@@ -1,10 +1,9 @@
 'use strict';
 
-var fp = require('lodash/fp');
 var index = require('../../../utils/index.js');
 
 const folderExists = async (folderId)=>{
-    if (fp.isNil(folderId)) {
+    if (folderId == null) {
         return true;
     }
     const exists = await index.getService('folder').exists({

package/dist/server/controllers/validation/admin/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sources":["../../../../../server/src/controllers/validation/admin/utils.ts"],"sourcesContent":["import { isNil } from 'lodash/fp';\nimport { getService } from '../../../utils';\n\nconst folderExists = async (folderId: number) => {\n  if (isNil(folderId)) {\n    return true;\n  }\n\n  const exists = await getService('folder').exists({ id: folderId });\n\n  return exists;\n};\n\nexport { folderExists };\n"],"names":["folderExists","folderId","isNil","exists","getService","id"],"mappings":";;;;;AAGA,MAAMA,eAAe,OAAOC,QAAAA,GAAAA;AAC1B,IAAA,IAAIC,SAAMD,QAAAA,CAAAA,EAAW;QACnB,OAAO,IAAA;AACT,IAAA;AAEA,IAAA,MAAME,MAAAA,GAAS,MAAMC,gBAAAA,CAAW,QAAA,CAAA,CAAUD,MAAM,CAAC;QAAEE,EAAAA,EAAIJ;AAAS,KAAA,CAAA;IAEhE,OAAOE,MAAAA;AACT;;;;"}
+{"version":3,"file":"utils.js","sources":["../../../../../server/src/controllers/validation/admin/utils.ts"],"sourcesContent":["import { getService } from '../../../utils';\n\nconst folderExists = async (folderId: number) => {\n  if (folderId == null) {\n    return true;\n  }\n\n  const exists = await getService('folder').exists({ id: folderId });\n\n  return exists;\n};\n\nexport { folderExists };\n"],"names":["folderExists","folderId","exists","getService","id"],"mappings":";;;;AAEA,MAAMA,eAAe,OAAOC,QAAAA,GAAAA;AAC1B,IAAA,IAAIA,YAAY,IAAA,EAAM;QACpB,OAAO,IAAA;AACT,IAAA;AAEA,IAAA,MAAMC,MAAAA,GAAS,MAAMC,gBAAAA,CAAW,QAAA,CAAA,CAAUD,MAAM,CAAC;QAAEE,EAAAA,EAAIH;AAAS,KAAA,CAAA;IAEhE,OAAOC,MAAAA;AACT;;;;"}

package/dist/server/controllers/validation/admin/utils.mjs

@@ -1,8 +1,7 @@
-import { isNil } from 'lodash/fp';
 import { getService } from '../../../utils/index.mjs';
 
 const folderExists = async (folderId)=>{
-    if (isNil(folderId)) {
+    if (folderId == null) {
         return true;
     }
     const exists = await getService('folder').exists({

package/dist/server/controllers/validation/admin/utils.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"utils.mjs","sources":["../../../../../server/src/controllers/validation/admin/utils.ts"],"sourcesContent":["import { isNil } from 'lodash/fp';\nimport { getService } from '../../../utils';\n\nconst folderExists = async (folderId: number) => {\n  if (isNil(folderId)) {\n    return true;\n  }\n\n  const exists = await getService('folder').exists({ id: folderId });\n\n  return exists;\n};\n\nexport { folderExists };\n"],"names":["folderExists","folderId","isNil","exists","getService","id"],"mappings":";;;AAGA,MAAMA,eAAe,OAAOC,QAAAA,GAAAA;AAC1B,IAAA,IAAIC,MAAMD,QAAAA,CAAAA,EAAW;QACnB,OAAO,IAAA;AACT,IAAA;AAEA,IAAA,MAAME,MAAAA,GAAS,MAAMC,UAAAA,CAAW,QAAA,CAAA,CAAUD,MAAM,CAAC;QAAEE,EAAAA,EAAIJ;AAAS,KAAA,CAAA;IAEhE,OAAOE,MAAAA;AACT;;;;"}
+{"version":3,"file":"utils.mjs","sources":["../../../../../server/src/controllers/validation/admin/utils.ts"],"sourcesContent":["import { getService } from '../../../utils';\n\nconst folderExists = async (folderId: number) => {\n  if (folderId == null) {\n    return true;\n  }\n\n  const exists = await getService('folder').exists({ id: folderId });\n\n  return exists;\n};\n\nexport { folderExists };\n"],"names":["folderExists","folderId","exists","getService","id"],"mappings":";;AAEA,MAAMA,eAAe,OAAOC,QAAAA,GAAAA;AAC1B,IAAA,IAAIA,YAAY,IAAA,EAAM;QACpB,OAAO,IAAA;AACT,IAAA;AAEA,IAAA,MAAMC,MAAAA,GAAS,MAAMC,UAAAA,CAAW,QAAA,CAAA,CAAUD,MAAM,CAAC;QAAEE,EAAAA,EAAIH;AAAS,KAAA,CAAA;IAEhE,OAAOC,MAAAA;AACT;;;;"}

package/dist/server/errors.js

@@ -0,0 +1,12 @@
+'use strict';
+
+var utils = require('@strapi/utils');
+
+class FolderContainsUnauthorizedAssetsError extends utils.errors.PolicyError {
+    constructor(){
+        super('FolderContainsUnauthorizedAssetsError');
+    }
+}
+
+exports.FolderContainsUnauthorizedAssetsError = FolderContainsUnauthorizedAssetsError;
+//# sourceMappingURL=errors.js.map

package/dist/server/errors.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"errors.js","sources":["../../server/src/errors.ts"],"sourcesContent":["import { errors } from '@strapi/utils';\n\nclass FolderContainsUnauthorizedAssetsError extends errors.PolicyError<'FolderContainsUnauthorizedAssetsError'> {\n  constructor() {\n    super('FolderContainsUnauthorizedAssetsError');\n  }\n}\n\nexport { FolderContainsUnauthorizedAssetsError };\n"],"names":["FolderContainsUnauthorizedAssetsError","errors","PolicyError"],"mappings":";;;;AAEA,MAAMA,qCAAAA,SAA8CC,aAAOC,WAAW,CAAA;IACpE,WAAA,EAAc;AACZ,QAAA,KAAK,CAAC,uCAAA,CAAA;AACR,IAAA;AACF;;;;"}

package/dist/server/errors.mjs

@@ -0,0 +1,10 @@
+import { errors } from '@strapi/utils';
+
+class FolderContainsUnauthorizedAssetsError extends errors.PolicyError {
+    constructor(){
+        super('FolderContainsUnauthorizedAssetsError');
+    }
+}
+
+export { FolderContainsUnauthorizedAssetsError };
+//# sourceMappingURL=errors.mjs.map

package/dist/server/errors.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"errors.mjs","sources":["../../server/src/errors.ts"],"sourcesContent":["import { errors } from '@strapi/utils';\n\nclass FolderContainsUnauthorizedAssetsError extends errors.PolicyError<'FolderContainsUnauthorizedAssetsError'> {\n  constructor() {\n    super('FolderContainsUnauthorizedAssetsError');\n  }\n}\n\nexport { FolderContainsUnauthorizedAssetsError };\n"],"names":["FolderContainsUnauthorizedAssetsError","errors","PolicyError"],"mappings":";;AAEA,MAAMA,qCAAAA,SAA8CC,OAAOC,WAAW,CAAA;IACpE,WAAA,EAAc;AACZ,QAAA,KAAK,CAAC,uCAAA,CAAA;AACR,IAAA;AACF;;;;"}

package/dist/server/migrations/unsign-richtext-and-blocks-urls.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var fp = require('lodash/fp');
+var _ = require('lodash');
 var utils = require('../services/extensions/utils.js');
 
 const BATCH_SIZE = 100;
@@ -73,7 +73,7 @@ const migrateSchema = async (trx, db, schema, cache)=>{
                 // the provider), so the surrounding transaction is not poisoned.
                 try {
                     const unsigned = await unsignValue(row[name], type, cache);
-                    if (!fp.isEqual(unsigned, row[name])) {
+                    if (!_.isEqual(unsigned, row[name])) {
                         data[name] = unsigned;
                     }
                 } catch (error) {

package/dist/server/migrations/unsign-richtext-and-blocks-urls.js.map

@@ -1 +1 @@
-{"version":3,"file":"unsign-richtext-and-blocks-urls.js","sources":["../../../server/src/migrations/unsign-richtext-and-blocks-urls.ts"],"sourcesContent":["import { isEqual } from 'lodash/fp';\n\nimport type { Database, Migration } from '@strapi/database';\nimport type { Struct } from '@strapi/types';\n\nimport {\n  createSignCache,\n  mapBlocksImages,\n  mapRichtextUrls,\n  stripSignedUrl,\n  unsignImage,\n} from '../services/extensions/utils';\nimport type { SignCache } from '../services/extensions/utils';\n\nconst BATCH_SIZE = 100;\nconst LOG_PREFIX = '[unsign-richtext-and-blocks-urls]';\n\ntype MigrationTrx = Parameters<Migration['up']>[0];\n\ntype TargetAttribute = { name: string; type: 'richtext' | 'blocks' };\n\ntype Progress = { scanned: number; updated: number };\n\nconst getTargetAttributes = (schema: Struct.Schema): TargetAttribute[] =>\n  Object.entries(schema.attributes ?? {})\n    .filter(([, attribute]) => attribute.type === 'richtext' || attribute.type === 'blocks')\n    .map(([name, attribute]) => ({ name, type: attribute.type as TargetAttribute['type'] }));\n\nconst unsignValue = async (value: unknown, type: TargetAttribute['type'], cache: SignCache) => {\n  return type === 'blocks'\n    ? mapBlocksImages(value, (image) => unsignImage(image, cache))\n    : mapRichtextUrls(value, (url) => stripSignedUrl(url, cache));\n};\n\nconst migrateSchema = async (\n  trx: MigrationTrx,\n  db: Database,\n  schema: Struct.Schema,\n  cache: SignCache\n): Promise<Progress> => {\n  const progress: Progress = { scanned: 0, updated: 0 };\n  const attributes = getTargetAttributes(schema);\n\n  if (attributes.length === 0) {\n    return progress;\n  }\n\n  const { uid } = schema;\n\n  if (!db.metadata.has(uid)) {\n    return progress;\n  }\n\n  const meta = db.metadata.get(uid);\n  const { tableName } = meta;\n  // The schema checks must run on the migration transaction: on SQLite the pool\n  // has a single connection, so a root-connection query would wait on it forever\n  const knex = db.getSchemaConnection(trx);\n\n  // On a fresh project the migrations run before the tables exist\n  if (!(await knex.hasTable(tableName))) {\n    return progress;\n  }\n\n  // Internal migrations run before the schema sync: an attribute added in the\n  // same deploy as this version has no column yet, so only select what exists\n  const existing: TargetAttribute[] = [];\n\n  for (const attribute of attributes) {\n    const attributeMeta = meta.attributes[attribute.name];\n    const columnName =\n      attributeMeta && 'columnName' in attributeMeta && attributeMeta.columnName\n        ? attributeMeta.columnName\n        : attribute.name;\n\n    if (await knex.hasColumn(tableName, columnName)) {\n      existing.push(attribute);\n    }\n  }\n\n  if (existing.length === 0) {\n    return progress;\n  }\n\n  const select = ['id', ...existing.map(({ name }) => name)];\n\n  let offset = 0;\n  let hasMore = true;\n\n  while (hasMore) {\n    const rows: Record<string, any>[] = await strapi.db.query(uid).findMany({\n      select,\n      limit: BATCH_SIZE,\n      offset,\n      orderBy: { id: 'asc' },\n    });\n\n    hasMore = rows.length === BATCH_SIZE;\n    offset += rows.length;\n    progress.scanned += rows.length;\n\n    for (const row of rows) {\n      const data: Record<string, unknown> = {};\n\n      for (const { name, type } of existing) {\n        // A value the mapper cannot process is logged and skipped. This is safe\n        // to catch: the mapper does no database work (presigning is local to\n        // the provider), so the surrounding transaction is not poisoned.\n        try {\n          const unsigned = await unsignValue(row[name], type, cache);\n\n          if (!isEqual(unsigned, row[name])) {\n            data[name] = unsigned;\n          }\n        } catch (error) {\n          strapi.log.warn(\n            `${LOG_PREFIX} Skipped ${uid}.${name} on row ${row.id}: ${\n              error instanceof Error ? error.message : String(error)\n            }`\n          );\n        }\n      }\n\n      if (Object.keys(data).length > 0) {\n        await strapi.db.query(uid).update({ where: { id: row.id }, data });\n        progress.updated += 1;\n      }\n    }\n  }\n\n  if (progress.scanned > 0) {\n    strapi.log.info(\n      `${LOG_PREFIX} ${uid}: ${progress.scanned} rows scanned, ${progress.updated} updated`\n    );\n  }\n\n  return progress;\n};\n\nconst migrateUp = async (trx: MigrationTrx, db: Database) => {\n  const { provider } = strapi.plugins.upload;\n\n  // Nothing is signed on a public provider, so there is nothing to strip\n  if (!provider || !(await provider.isPrivate())) {\n    return;\n  }\n\n  const schemas = [\n    ...Object.values(strapi.contentTypes),\n    ...Object.values(strapi.components),\n  ] as Struct.Schema[];\n\n  // One presign per distinct URL for the whole run, however many rows it appears in\n  const cache = createSignCache();\n  const total: Progress = { scanned: 0, updated: 0 };\n\n  for (const schema of schemas) {\n    const progress = await migrateSchema(trx, db, schema, cache);\n\n    total.scanned += progress.scanned;\n    total.updated += progress.updated;\n  }\n\n  strapi.log.info(`${LOG_PREFIX} Done: ${total.scanned} rows scanned, ${total.updated} updated`);\n};\n\n/**\n * Richtext and blocks attributes embed the file URL in their own value, so a\n * signed URL written by the admin used to be frozen in the row and broke as\n * soon as the signature expired. New writes are normalised by the upload\n * document service middleware, and the read path re-signs a stored URL that\n * still carries a stale signature, so this migration is a cleanup of the rows\n * written before the fix rather than a prerequisite for it.\n *\n * Idempotent: re-running it finds nothing left to change.\n *\n * Runs inside the internal migration transaction like every other internal\n * migration: a database error fails the boot. A single value the mapper cannot\n * process is logged with a warning and skipped; it is normalised by the\n * middleware on its next save and re-signed on read until then.\n */\nexport const unsignRichtextAndBlocksUrls: Migration = {\n  name: 'upload::unsign-richtext-and-blocks-urls',\n  async up(trx, db) {\n    await migrateUp(trx, db);\n  },\n  async down() {\n    throw new Error('not implemented');\n  },\n};\n"],"names":["BATCH_SIZE","LOG_PREFIX","getTargetAttributes","schema","Object","entries","attributes","filter","attribute","type","map","name","unsignValue","value","cache","mapBlocksImages","image","unsignImage","mapRichtextUrls","url","stripSignedUrl","migrateSchema","trx","db","progress","scanned","updated","length","uid","metadata","has","meta","get","tableName","knex","getSchemaConnection","hasTable","existing","attributeMeta","columnName","hasColumn","push","select","offset","hasMore","rows","strapi","query","findMany","limit","orderBy","id","row","data","unsigned","isEqual","error","log","warn","Error","message","String","keys","update","where","info","migrateUp","provider","plugins","upload","isPrivate","schemas","values","contentTypes","components","createSignCache","total","unsignRichtextAndBlocksUrls","up","down"],"mappings":"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"}
+{"version":3,"file":"unsign-richtext-and-blocks-urls.js","sources":["../../../server/src/migrations/unsign-richtext-and-blocks-urls.ts"],"sourcesContent":["import { isEqual } from 'lodash';\n\nimport type { Database, Migration } from '@strapi/database';\nimport type { Struct } from '@strapi/types';\n\nimport {\n  createSignCache,\n  mapBlocksImages,\n  mapRichtextUrls,\n  stripSignedUrl,\n  unsignImage,\n} from '../services/extensions/utils';\nimport type { SignCache } from '../services/extensions/utils';\n\nconst BATCH_SIZE = 100;\nconst LOG_PREFIX = '[unsign-richtext-and-blocks-urls]';\n\ntype MigrationTrx = Parameters<Migration['up']>[0];\n\ntype TargetAttribute = { name: string; type: 'richtext' | 'blocks' };\n\ntype Progress = { scanned: number; updated: number };\n\nconst getTargetAttributes = (schema: Struct.Schema): TargetAttribute[] =>\n  Object.entries(schema.attributes ?? {})\n    .filter(([, attribute]) => attribute.type === 'richtext' || attribute.type === 'blocks')\n    .map(([name, attribute]) => ({ name, type: attribute.type as TargetAttribute['type'] }));\n\nconst unsignValue = async (value: unknown, type: TargetAttribute['type'], cache: SignCache) => {\n  return type === 'blocks'\n    ? mapBlocksImages(value, (image) => unsignImage(image, cache))\n    : mapRichtextUrls(value, (url) => stripSignedUrl(url, cache));\n};\n\nconst migrateSchema = async (\n  trx: MigrationTrx,\n  db: Database,\n  schema: Struct.Schema,\n  cache: SignCache\n): Promise<Progress> => {\n  const progress: Progress = { scanned: 0, updated: 0 };\n  const attributes = getTargetAttributes(schema);\n\n  if (attributes.length === 0) {\n    return progress;\n  }\n\n  const { uid } = schema;\n\n  if (!db.metadata.has(uid)) {\n    return progress;\n  }\n\n  const meta = db.metadata.get(uid);\n  const { tableName } = meta;\n  // The schema checks must run on the migration transaction: on SQLite the pool\n  // has a single connection, so a root-connection query would wait on it forever\n  const knex = db.getSchemaConnection(trx);\n\n  // On a fresh project the migrations run before the tables exist\n  if (!(await knex.hasTable(tableName))) {\n    return progress;\n  }\n\n  // Internal migrations run before the schema sync: an attribute added in the\n  // same deploy as this version has no column yet, so only select what exists\n  const existing: TargetAttribute[] = [];\n\n  for (const attribute of attributes) {\n    const attributeMeta = meta.attributes[attribute.name];\n    const columnName =\n      attributeMeta && 'columnName' in attributeMeta && attributeMeta.columnName\n        ? attributeMeta.columnName\n        : attribute.name;\n\n    if (await knex.hasColumn(tableName, columnName)) {\n      existing.push(attribute);\n    }\n  }\n\n  if (existing.length === 0) {\n    return progress;\n  }\n\n  const select = ['id', ...existing.map(({ name }) => name)];\n\n  let offset = 0;\n  let hasMore = true;\n\n  while (hasMore) {\n    const rows: Record<string, any>[] = await strapi.db.query(uid).findMany({\n      select,\n      limit: BATCH_SIZE,\n      offset,\n      orderBy: { id: 'asc' },\n    });\n\n    hasMore = rows.length === BATCH_SIZE;\n    offset += rows.length;\n    progress.scanned += rows.length;\n\n    for (const row of rows) {\n      const data: Record<string, unknown> = {};\n\n      for (const { name, type } of existing) {\n        // A value the mapper cannot process is logged and skipped. This is safe\n        // to catch: the mapper does no database work (presigning is local to\n        // the provider), so the surrounding transaction is not poisoned.\n        try {\n          const unsigned = await unsignValue(row[name], type, cache);\n\n          if (!isEqual(unsigned, row[name])) {\n            data[name] = unsigned;\n          }\n        } catch (error) {\n          strapi.log.warn(\n            `${LOG_PREFIX} Skipped ${uid}.${name} on row ${row.id}: ${\n              error instanceof Error ? error.message : String(error)\n            }`\n          );\n        }\n      }\n\n      if (Object.keys(data).length > 0) {\n        await strapi.db.query(uid).update({ where: { id: row.id }, data });\n        progress.updated += 1;\n      }\n    }\n  }\n\n  if (progress.scanned > 0) {\n    strapi.log.info(\n      `${LOG_PREFIX} ${uid}: ${progress.scanned} rows scanned, ${progress.updated} updated`\n    );\n  }\n\n  return progress;\n};\n\nconst migrateUp = async (trx: MigrationTrx, db: Database) => {\n  const { provider } = strapi.plugins.upload;\n\n  // Nothing is signed on a public provider, so there is nothing to strip\n  if (!provider || !(await provider.isPrivate())) {\n    return;\n  }\n\n  const schemas = [\n    ...Object.values(strapi.contentTypes),\n    ...Object.values(strapi.components),\n  ] as Struct.Schema[];\n\n  // One presign per distinct URL for the whole run, however many rows it appears in\n  const cache = createSignCache();\n  const total: Progress = { scanned: 0, updated: 0 };\n\n  for (const schema of schemas) {\n    const progress = await migrateSchema(trx, db, schema, cache);\n\n    total.scanned += progress.scanned;\n    total.updated += progress.updated;\n  }\n\n  strapi.log.info(`${LOG_PREFIX} Done: ${total.scanned} rows scanned, ${total.updated} updated`);\n};\n\n/**\n * Richtext and blocks attributes embed the file URL in their own value, so a\n * signed URL written by the admin used to be frozen in the row and broke as\n * soon as the signature expired. New writes are normalised by the upload\n * document service middleware, and the read path re-signs a stored URL that\n * still carries a stale signature, so this migration is a cleanup of the rows\n * written before the fix rather than a prerequisite for it.\n *\n * Idempotent: re-running it finds nothing left to change.\n *\n * Runs inside the internal migration transaction like every other internal\n * migration: a database error fails the boot. A single value the mapper cannot\n * process is logged with a warning and skipped; it is normalised by the\n * middleware on its next save and re-signed on read until then.\n */\nexport const unsignRichtextAndBlocksUrls: Migration = {\n  name: 'upload::unsign-richtext-and-blocks-urls',\n  async up(trx, db) {\n    await migrateUp(trx, db);\n  },\n  async down() {\n    throw new Error('not implemented');\n  },\n};\n"],"names":["BATCH_SIZE","LOG_PREFIX","getTargetAttributes","schema","Object","entries","attributes","filter","attribute","type","map","name","unsignValue","value","cache","mapBlocksImages","image","unsignImage","mapRichtextUrls","url","stripSignedUrl","migrateSchema","trx","db","progress","scanned","updated","length","uid","metadata","has","meta","get","tableName","knex","getSchemaConnection","hasTable","existing","attributeMeta","columnName","hasColumn","push","select","offset","hasMore","rows","strapi","query","findMany","limit","orderBy","id","row","data","unsigned","isEqual","error","log","warn","Error","message","String","keys","update","where","info","migrateUp","provider","plugins","upload","isPrivate","schemas","values","contentTypes","components","createSignCache","total","unsignRichtextAndBlocksUrls","up","down"],"mappings":"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"}

package/dist/server/migrations/unsign-richtext-and-blocks-urls.mjs

@@ -1,4 +1,4 @@
-import { isEqual } from 'lodash/fp';
+import { isEqual } from 'lodash';
 import { mapBlocksImages, unsignImage, mapRichtextUrls, stripSignedUrl, createSignCache } from '../services/extensions/utils.mjs';
 
 const BATCH_SIZE = 100;

package/dist/server/migrations/unsign-richtext-and-blocks-urls.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"unsign-richtext-and-blocks-urls.mjs","sources":["../../../server/src/migrations/unsign-richtext-and-blocks-urls.ts"],"sourcesContent":["import { isEqual } from 'lodash/fp';\n\nimport type { Database, Migration } from '@strapi/database';\nimport type { Struct } from '@strapi/types';\n\nimport {\n  createSignCache,\n  mapBlocksImages,\n  mapRichtextUrls,\n  stripSignedUrl,\n  unsignImage,\n} from '../services/extensions/utils';\nimport type { SignCache } from '../services/extensions/utils';\n\nconst BATCH_SIZE = 100;\nconst LOG_PREFIX = '[unsign-richtext-and-blocks-urls]';\n\ntype MigrationTrx = Parameters<Migration['up']>[0];\n\ntype TargetAttribute = { name: string; type: 'richtext' | 'blocks' };\n\ntype Progress = { scanned: number; updated: number };\n\nconst getTargetAttributes = (schema: Struct.Schema): TargetAttribute[] =>\n  Object.entries(schema.attributes ?? {})\n    .filter(([, attribute]) => attribute.type === 'richtext' || attribute.type === 'blocks')\n    .map(([name, attribute]) => ({ name, type: attribute.type as TargetAttribute['type'] }));\n\nconst unsignValue = async (value: unknown, type: TargetAttribute['type'], cache: SignCache) => {\n  return type === 'blocks'\n    ? mapBlocksImages(value, (image) => unsignImage(image, cache))\n    : mapRichtextUrls(value, (url) => stripSignedUrl(url, cache));\n};\n\nconst migrateSchema = async (\n  trx: MigrationTrx,\n  db: Database,\n  schema: Struct.Schema,\n  cache: SignCache\n): Promise<Progress> => {\n  const progress: Progress = { scanned: 0, updated: 0 };\n  const attributes = getTargetAttributes(schema);\n\n  if (attributes.length === 0) {\n    return progress;\n  }\n\n  const { uid } = schema;\n\n  if (!db.metadata.has(uid)) {\n    return progress;\n  }\n\n  const meta = db.metadata.get(uid);\n  const { tableName } = meta;\n  // The schema checks must run on the migration transaction: on SQLite the pool\n  // has a single connection, so a root-connection query would wait on it forever\n  const knex = db.getSchemaConnection(trx);\n\n  // On a fresh project the migrations run before the tables exist\n  if (!(await knex.hasTable(tableName))) {\n    return progress;\n  }\n\n  // Internal migrations run before the schema sync: an attribute added in the\n  // same deploy as this version has no column yet, so only select what exists\n  const existing: TargetAttribute[] = [];\n\n  for (const attribute of attributes) {\n    const attributeMeta = meta.attributes[attribute.name];\n    const columnName =\n      attributeMeta && 'columnName' in attributeMeta && attributeMeta.columnName\n        ? attributeMeta.columnName\n        : attribute.name;\n\n    if (await knex.hasColumn(tableName, columnName)) {\n      existing.push(attribute);\n    }\n  }\n\n  if (existing.length === 0) {\n    return progress;\n  }\n\n  const select = ['id', ...existing.map(({ name }) => name)];\n\n  let offset = 0;\n  let hasMore = true;\n\n  while (hasMore) {\n    const rows: Record<string, any>[] = await strapi.db.query(uid).findMany({\n      select,\n      limit: BATCH_SIZE,\n      offset,\n      orderBy: { id: 'asc' },\n    });\n\n    hasMore = rows.length === BATCH_SIZE;\n    offset += rows.length;\n    progress.scanned += rows.length;\n\n    for (const row of rows) {\n      const data: Record<string, unknown> = {};\n\n      for (const { name, type } of existing) {\n        // A value the mapper cannot process is logged and skipped. This is safe\n        // to catch: the mapper does no database work (presigning is local to\n        // the provider), so the surrounding transaction is not poisoned.\n        try {\n          const unsigned = await unsignValue(row[name], type, cache);\n\n          if (!isEqual(unsigned, row[name])) {\n            data[name] = unsigned;\n          }\n        } catch (error) {\n          strapi.log.warn(\n            `${LOG_PREFIX} Skipped ${uid}.${name} on row ${row.id}: ${\n              error instanceof Error ? error.message : String(error)\n            }`\n          );\n        }\n      }\n\n      if (Object.keys(data).length > 0) {\n        await strapi.db.query(uid).update({ where: { id: row.id }, data });\n        progress.updated += 1;\n      }\n    }\n  }\n\n  if (progress.scanned > 0) {\n    strapi.log.info(\n      `${LOG_PREFIX} ${uid}: ${progress.scanned} rows scanned, ${progress.updated} updated`\n    );\n  }\n\n  return progress;\n};\n\nconst migrateUp = async (trx: MigrationTrx, db: Database) => {\n  const { provider } = strapi.plugins.upload;\n\n  // Nothing is signed on a public provider, so there is nothing to strip\n  if (!provider || !(await provider.isPrivate())) {\n    return;\n  }\n\n  const schemas = [\n    ...Object.values(strapi.contentTypes),\n    ...Object.values(strapi.components),\n  ] as Struct.Schema[];\n\n  // One presign per distinct URL for the whole run, however many rows it appears in\n  const cache = createSignCache();\n  const total: Progress = { scanned: 0, updated: 0 };\n\n  for (const schema of schemas) {\n    const progress = await migrateSchema(trx, db, schema, cache);\n\n    total.scanned += progress.scanned;\n    total.updated += progress.updated;\n  }\n\n  strapi.log.info(`${LOG_PREFIX} Done: ${total.scanned} rows scanned, ${total.updated} updated`);\n};\n\n/**\n * Richtext and blocks attributes embed the file URL in their own value, so a\n * signed URL written by the admin used to be frozen in the row and broke as\n * soon as the signature expired. New writes are normalised by the upload\n * document service middleware, and the read path re-signs a stored URL that\n * still carries a stale signature, so this migration is a cleanup of the rows\n * written before the fix rather than a prerequisite for it.\n *\n * Idempotent: re-running it finds nothing left to change.\n *\n * Runs inside the internal migration transaction like every other internal\n * migration: a database error fails the boot. A single value the mapper cannot\n * process is logged with a warning and skipped; it is normalised by the\n * middleware on its next save and re-signed on read until then.\n */\nexport const unsignRichtextAndBlocksUrls: Migration = {\n  name: 'upload::unsign-richtext-and-blocks-urls',\n  async up(trx, db) {\n    await migrateUp(trx, db);\n  },\n  async down() {\n    throw new Error('not implemented');\n  },\n};\n"],"names":["BATCH_SIZE","LOG_PREFIX","getTargetAttributes","schema","Object","entries","attributes","filter","attribute","type","map","name","unsignValue","value","cache","mapBlocksImages","image","unsignImage","mapRichtextUrls","url","stripSignedUrl","migrateSchema","trx","db","progress","scanned","updated","length","uid","metadata","has","meta","get","tableName","knex","getSchemaConnection","hasTable","existing","attributeMeta","columnName","hasColumn","push","select","offset","hasMore","rows","strapi","query","findMany","limit","orderBy","id","row","data","unsigned","isEqual","error","log","warn","Error","message","String","keys","update","where","info","migrateUp","provider","plugins","upload","isPrivate","schemas","values","contentTypes","components","createSignCache","total","unsignRichtextAndBlocksUrls","up","down"],"mappings":"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"}
+{"version":3,"file":"unsign-richtext-and-blocks-urls.mjs","sources":["../../../server/src/migrations/unsign-richtext-and-blocks-urls.ts"],"sourcesContent":["import { isEqual } from 'lodash';\n\nimport type { Database, Migration } from '@strapi/database';\nimport type { Struct } from '@strapi/types';\n\nimport {\n  createSignCache,\n  mapBlocksImages,\n  mapRichtextUrls,\n  stripSignedUrl,\n  unsignImage,\n} from '../services/extensions/utils';\nimport type { SignCache } from '../services/extensions/utils';\n\nconst BATCH_SIZE = 100;\nconst LOG_PREFIX = '[unsign-richtext-and-blocks-urls]';\n\ntype MigrationTrx = Parameters<Migration['up']>[0];\n\ntype TargetAttribute = { name: string; type: 'richtext' | 'blocks' };\n\ntype Progress = { scanned: number; updated: number };\n\nconst getTargetAttributes = (schema: Struct.Schema): TargetAttribute[] =>\n  Object.entries(schema.attributes ?? {})\n    .filter(([, attribute]) => attribute.type === 'richtext' || attribute.type === 'blocks')\n    .map(([name, attribute]) => ({ name, type: attribute.type as TargetAttribute['type'] }));\n\nconst unsignValue = async (value: unknown, type: TargetAttribute['type'], cache: SignCache) => {\n  return type === 'blocks'\n    ? mapBlocksImages(value, (image) => unsignImage(image, cache))\n    : mapRichtextUrls(value, (url) => stripSignedUrl(url, cache));\n};\n\nconst migrateSchema = async (\n  trx: MigrationTrx,\n  db: Database,\n  schema: Struct.Schema,\n  cache: SignCache\n): Promise<Progress> => {\n  const progress: Progress = { scanned: 0, updated: 0 };\n  const attributes = getTargetAttributes(schema);\n\n  if (attributes.length === 0) {\n    return progress;\n  }\n\n  const { uid } = schema;\n\n  if (!db.metadata.has(uid)) {\n    return progress;\n  }\n\n  const meta = db.metadata.get(uid);\n  const { tableName } = meta;\n  // The schema checks must run on the migration transaction: on SQLite the pool\n  // has a single connection, so a root-connection query would wait on it forever\n  const knex = db.getSchemaConnection(trx);\n\n  // On a fresh project the migrations run before the tables exist\n  if (!(await knex.hasTable(tableName))) {\n    return progress;\n  }\n\n  // Internal migrations run before the schema sync: an attribute added in the\n  // same deploy as this version has no column yet, so only select what exists\n  const existing: TargetAttribute[] = [];\n\n  for (const attribute of attributes) {\n    const attributeMeta = meta.attributes[attribute.name];\n    const columnName =\n      attributeMeta && 'columnName' in attributeMeta && attributeMeta.columnName\n        ? attributeMeta.columnName\n        : attribute.name;\n\n    if (await knex.hasColumn(tableName, columnName)) {\n      existing.push(attribute);\n    }\n  }\n\n  if (existing.length === 0) {\n    return progress;\n  }\n\n  const select = ['id', ...existing.map(({ name }) => name)];\n\n  let offset = 0;\n  let hasMore = true;\n\n  while (hasMore) {\n    const rows: Record<string, any>[] = await strapi.db.query(uid).findMany({\n      select,\n      limit: BATCH_SIZE,\n      offset,\n      orderBy: { id: 'asc' },\n    });\n\n    hasMore = rows.length === BATCH_SIZE;\n    offset += rows.length;\n    progress.scanned += rows.length;\n\n    for (const row of rows) {\n      const data: Record<string, unknown> = {};\n\n      for (const { name, type } of existing) {\n        // A value the mapper cannot process is logged and skipped. This is safe\n        // to catch: the mapper does no database work (presigning is local to\n        // the provider), so the surrounding transaction is not poisoned.\n        try {\n          const unsigned = await unsignValue(row[name], type, cache);\n\n          if (!isEqual(unsigned, row[name])) {\n            data[name] = unsigned;\n          }\n        } catch (error) {\n          strapi.log.warn(\n            `${LOG_PREFIX} Skipped ${uid}.${name} on row ${row.id}: ${\n              error instanceof Error ? error.message : String(error)\n            }`\n          );\n        }\n      }\n\n      if (Object.keys(data).length > 0) {\n        await strapi.db.query(uid).update({ where: { id: row.id }, data });\n        progress.updated += 1;\n      }\n    }\n  }\n\n  if (progress.scanned > 0) {\n    strapi.log.info(\n      `${LOG_PREFIX} ${uid}: ${progress.scanned} rows scanned, ${progress.updated} updated`\n    );\n  }\n\n  return progress;\n};\n\nconst migrateUp = async (trx: MigrationTrx, db: Database) => {\n  const { provider } = strapi.plugins.upload;\n\n  // Nothing is signed on a public provider, so there is nothing to strip\n  if (!provider || !(await provider.isPrivate())) {\n    return;\n  }\n\n  const schemas = [\n    ...Object.values(strapi.contentTypes),\n    ...Object.values(strapi.components),\n  ] as Struct.Schema[];\n\n  // One presign per distinct URL for the whole run, however many rows it appears in\n  const cache = createSignCache();\n  const total: Progress = { scanned: 0, updated: 0 };\n\n  for (const schema of schemas) {\n    const progress = await migrateSchema(trx, db, schema, cache);\n\n    total.scanned += progress.scanned;\n    total.updated += progress.updated;\n  }\n\n  strapi.log.info(`${LOG_PREFIX} Done: ${total.scanned} rows scanned, ${total.updated} updated`);\n};\n\n/**\n * Richtext and blocks attributes embed the file URL in their own value, so a\n * signed URL written by the admin used to be frozen in the row and broke as\n * soon as the signature expired. New writes are normalised by the upload\n * document service middleware, and the read path re-signs a stored URL that\n * still carries a stale signature, so this migration is a cleanup of the rows\n * written before the fix rather than a prerequisite for it.\n *\n * Idempotent: re-running it finds nothing left to change.\n *\n * Runs inside the internal migration transaction like every other internal\n * migration: a database error fails the boot. A single value the mapper cannot\n * process is logged with a warning and skipped; it is normalised by the\n * middleware on its next save and re-signed on read until then.\n */\nexport const unsignRichtextAndBlocksUrls: Migration = {\n  name: 'upload::unsign-richtext-and-blocks-urls',\n  async up(trx, db) {\n    await migrateUp(trx, db);\n  },\n  async down() {\n    throw new Error('not implemented');\n  },\n};\n"],"names":["BATCH_SIZE","LOG_PREFIX","getTargetAttributes","schema","Object","entries","attributes","filter","attribute","type","map","name","unsignValue","value","cache","mapBlocksImages","image","unsignImage","mapRichtextUrls","url","stripSignedUrl","migrateSchema","trx","db","progress","scanned","updated","length","uid","metadata","has","meta","get","tableName","knex","getSchemaConnection","hasTable","existing","attributeMeta","columnName","hasColumn","push","select","offset","hasMore","rows","strapi","query","findMany","limit","orderBy","id","row","data","unsigned","isEqual","error","log","warn","Error","message","String","keys","update","where","info","migrateUp","provider","plugins","upload","isPrivate","schemas","values","contentTypes","components","createSignCache","total","unsignRichtextAndBlocksUrls","up","down"],"mappings":"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"}

package/dist/server/routes/content-api.js

@@ -33,7 +33,7 @@ const createRoutes = utils.createContentApiRoutesFactory(()=>{
             handler: 'content-api.upload',
             request: {
                 query: {
-                    id: validator.fileId.optional()
+                    id: validator.fileIdOrDocumentId.optional()
                 }
             },
             response: z__namespace.union([
@@ -77,7 +77,7 @@ const createRoutes = utils.createContentApiRoutesFactory(()=>{
             handler: 'content-api.findOne',
             request: {
                 params: {
-                    id: validator.fileId
+                    id: validator.fileIdOrDocumentId
                 },
                 query: {
                     fields: validator.queryFields.optional(),
@@ -92,7 +92,7 @@ const createRoutes = utils.createContentApiRoutesFactory(()=>{
             handler: 'content-api.destroy',
             request: {
                 params: {
-                    id: validator.fileId
+                    id: validator.fileIdOrDocumentId
                 }
             },
             response: validator.file