@strapi/upload 5.57.0 → 5.58.0

package/dist/admin/legacy/hooks/useEditAsset.js.map

@@ -1 +1 @@
-{"version":3,"file":"useEditAsset.js","sources":["../../../../admin/src/legacy/hooks/useEditAsset.ts"],"sourcesContent":["import * as React from 'react';\n\nimport { useNotification, useFetchClient, FetchClient } from '@strapi/admin/strapi-admin';\nimport { useIntl } from 'react-intl';\nimport { useMutation, useQueryClient } from 'react-query';\n\nimport { UpdateFile, File as FileAsset } from '../../../../shared/contracts/files';\nimport { pluginId } from '../../pluginId';\nimport { getTrad } from '../utils';\n\nexport type ErrorMutation = {\n  message: string;\n  response: {\n    status: number;\n    data: {\n      error: Error;\n    };\n  };\n} | null;\n\nconst editAssetRequest = (\n  asset: FileAsset,\n  file: File,\n  signal: AbortSignal,\n  onProgress: (progress: number) => void,\n  post: FetchClient['post']\n): Promise<UpdateFile.Response['data']> => {\n  const endpoint = `/${pluginId}?id=${asset.id}`;\n\n  const formData = new FormData();\n\n  if (file) {\n    formData.append('files', file);\n  }\n\n  formData.append(\n    'fileInfo',\n    JSON.stringify({\n      alternativeText: asset.alternativeText,\n      caption: asset.caption,\n      focalPoint: asset.focalPoint,\n      folder: asset.folder,\n      name: asset.name,\n    })\n  );\n\n  /**\n   * onProgress is not possible using native fetch\n   * need to look into an alternative to make it work\n   * perhaps using xhr like Axios does\n   */\n  return post<UpdateFile.Response['data'], UpdateFile.Request['body']>(endpoint, formData, {\n    signal,\n  }).then((res) => res.data);\n};\n\nexport const useEditAsset = () => {\n  const [progress, setProgress] = React.useState(0);\n  const { formatMessage } = useIntl();\n  const { toggleNotification } = useNotification();\n  const queryClient = useQueryClient();\n  const abortController = new AbortController();\n  const signal = abortController.signal;\n  const { post } = useFetchClient();\n\n  const mutation = useMutation<\n    UpdateFile.Response['data'],\n    ErrorMutation,\n    { asset: FileAsset; file: File }\n  >(({ asset, file }) => editAssetRequest(asset, file, signal, setProgress, post), {\n    onSuccess() {\n      queryClient.refetchQueries([pluginId, 'assets'], { active: true });\n      queryClient.refetchQueries([pluginId, 'asset-count'], { active: true });\n      queryClient.refetchQueries([pluginId, 'folders'], { active: true });\n    },\n    onError(reason) {\n      if (reason?.response?.status === 403) {\n        toggleNotification({\n          type: 'info',\n          message: formatMessage({ id: getTrad('permissions.not-allowed.update') }),\n        });\n      } else {\n        toggleNotification({ type: 'danger', message: reason?.message });\n      }\n    },\n  });\n\n  const editAsset = (asset: FileAsset, file: File) => mutation.mutateAsync({ asset, file });\n\n  const cancel = () => abortController.abort();\n\n  return { ...mutation, cancel, editAsset, progress, status: mutation.status };\n};\n"],"names":["editAssetRequest","asset","file","signal","onProgress","post","endpoint","pluginId","id","formData","FormData","append","JSON","stringify","alternativeText","caption","focalPoint","folder","name","then","res","data","useEditAsset","progress","setProgress","React","useState","formatMessage","useIntl","toggleNotification","useNotification","queryClient","useQueryClient","abortController","AbortController","useFetchClient","mutation","useMutation","onSuccess","refetchQueries","active","onError","reason","response","status","type","message","getTrad","editAsset","mutateAsync","cancel","abort"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAoBA,MAAMA,gBAAAA,GAAmB,CACvBC,KAAAA,EACAC,IAAAA,EACAC,QACAC,UAAAA,EACAC,IAAAA,GAAAA;IAEA,MAAMC,QAAAA,GAAW,CAAC,CAAC,EAAEC,kBAAS,IAAI,EAAEN,KAAAA,CAAMO,EAAE,CAAA,CAAE;AAE9C,IAAA,MAAMC,WAAW,IAAIC,QAAAA,EAAAA;AAErB,IAAA,IAAIR,IAAAA,EAAM;QACRO,QAAAA,CAASE,MAAM,CAAC,OAAA,EAAST,IAAAA,CAAAA;AAC3B,IAAA;AAEAO,IAAAA,QAAAA,CAASE,MAAM,CACb,UAAA,EACAC,IAAAA,CAAKC,SAAS,CAAC;AACbC,QAAAA,eAAAA,EAAiBb,MAAMa,eAAe;AACtCC,QAAAA,OAAAA,EAASd,MAAMc,OAAO;AACtBC,QAAAA,UAAAA,EAAYf,MAAMe,UAAU;AAC5BC,QAAAA,MAAAA,EAAQhB,MAAMgB,MAAM;AACpBC,QAAAA,IAAAA,EAAMjB,MAAMiB;AACd,KAAA,CAAA,CAAA;AAGF;;;;MAKA,OAAOb,IAAAA,CAA8DC,QAAAA,EAAUG,QAAAA,EAAU;AACvFN,QAAAA;AACF,KAAA,CAAA,CAAGgB,IAAI,CAAC,CAACC,GAAAA,GAAQA,IAAIC,IAAI,CAAA;AAC3B,CAAA;MAEaC,YAAAA,GAAe,IAAA;AAC1B,IAAA,MAAM,CAACC,QAAAA,EAAUC,WAAAA,CAAY,GAAGC,gBAAAA,CAAMC,QAAQ,CAAC,CAAA,CAAA;IAC/C,MAAM,EAAEC,aAAa,EAAE,GAAGC,iBAAAA,EAAAA;IAC1B,MAAM,EAAEC,kBAAkB,EAAE,GAAGC,2BAAAA,EAAAA;AAC/B,IAAA,MAAMC,WAAAA,GAAcC,yBAAAA,EAAAA;AACpB,IAAA,MAAMC,kBAAkB,IAAIC,eAAAA,EAAAA;IAC5B,MAAM/B,MAAAA,GAAS8B,gBAAgB9B,MAAM;IACrC,MAAM,EAAEE,IAAI,EAAE,GAAG8B,0BAAAA,EAAAA;AAEjB,IAAA,MAAMC,QAAAA,GAAWC,sBAAAA,CAIf,CAAC,EAAEpC,KAAK,EAAEC,IAAI,EAAE,GAAKF,gBAAAA,CAAiBC,KAAAA,EAAOC,IAAAA,EAAMC,MAAAA,EAAQqB,aAAanB,IAAAA,CAAAA,EAAO;AAC/EiC,QAAAA,SAAAA,CAAAA,GAAAA;AACEP,YAAAA,WAAAA,CAAYQ,cAAc,CAAC;AAAChC,gBAAAA,iBAAAA;AAAU,gBAAA;aAAS,EAAE;gBAAEiC,MAAAA,EAAQ;AAAK,aAAA,CAAA;AAChET,YAAAA,WAAAA,CAAYQ,cAAc,CAAC;AAAChC,gBAAAA,iBAAAA;AAAU,gBAAA;aAAc,EAAE;gBAAEiC,MAAAA,EAAQ;AAAK,aAAA,CAAA;AACrET,YAAAA,WAAAA,CAAYQ,cAAc,CAAC;AAAChC,gBAAAA,iBAAAA;AAAU,gBAAA;aAAU,EAAE;gBAAEiC,MAAAA,EAAQ;AAAK,aAAA,CAAA;AACnE,QAAA,CAAA;AACAC,QAAAA,OAAAA,CAAAA,CAAQC,MAAM,EAAA;YACZ,IAAIA,MAAAA,EAAQC,QAAAA,EAAUC,MAAAA,KAAW,GAAA,EAAK;gBACpCf,kBAAAA,CAAmB;oBACjBgB,IAAAA,EAAM,MAAA;AACNC,oBAAAA,OAAAA,EAASnB,aAAAA,CAAc;AAAEnB,wBAAAA,EAAAA,EAAIuC,eAAAA,CAAQ,gCAAA;AAAkC,qBAAA;AACzE,iBAAA,CAAA;YACF,CAAA,MAAO;gBACLlB,kBAAAA,CAAmB;oBAAEgB,IAAAA,EAAM,QAAA;AAAUC,oBAAAA,OAAAA,EAASJ,MAAAA,EAAQI;AAAQ,iBAAA,CAAA;AAChE,YAAA;AACF,QAAA;AACF,KAAA,CAAA;AAEA,IAAA,MAAME,YAAY,CAAC/C,KAAAA,EAAkBC,IAAAA,GAAekC,QAAAA,CAASa,WAAW,CAAC;AAAEhD,YAAAA,KAAAA;AAAOC,YAAAA;AAAK,SAAA,CAAA;IAEvF,MAAMgD,MAAAA,GAAS,IAAMjB,eAAAA,CAAgBkB,KAAK,EAAA;IAE1C,OAAO;AAAE,QAAA,GAAGf,QAAQ;AAAEc,QAAAA,MAAAA;AAAQF,QAAAA,SAAAA;AAAWzB,QAAAA,QAAAA;AAAUqB,QAAAA,MAAAA,EAAQR,SAASQ;AAAO,KAAA;AAC7E;;;;"}
+{"version":3,"file":"useEditAsset.js","sources":["../../../../admin/src/legacy/hooks/useEditAsset.ts"],"sourcesContent":["import * as React from 'react';\n\nimport {\n  useNotification,\n  useFetchClient,\n  FetchClient,\n  isAbortError,\n  isFetchError,\n} from '@strapi/admin/strapi-admin';\nimport { useIntl } from 'react-intl';\nimport { useMutation, useQueryClient } from 'react-query';\n\nimport { UpdateFile, File as FileAsset } from '../../../../shared/contracts/files';\nimport { pluginId } from '../../pluginId';\nimport { getTrad } from '../utils';\n\nconst editAssetRequest = (\n  asset: FileAsset,\n  file: File,\n  signal: AbortSignal,\n  onProgress: (progress: number) => void,\n  post: FetchClient['post']\n): Promise<UpdateFile.Response['data']> => {\n  const endpoint = `/${pluginId}?id=${asset.id}`;\n\n  const formData = new FormData();\n\n  if (file) {\n    formData.append('files', file);\n  }\n\n  formData.append(\n    'fileInfo',\n    JSON.stringify({\n      alternativeText: asset.alternativeText,\n      caption: asset.caption,\n      focalPoint: asset.focalPoint,\n      folder: asset.folder,\n      name: asset.name,\n    })\n  );\n\n  /**\n   * onProgress is not possible using native fetch\n   * need to look into an alternative to make it work\n   * perhaps using xhr like Axios does\n   */\n  return post<UpdateFile.Response['data'], UpdateFile.Request['body']>(endpoint, formData, {\n    signal,\n  }).then((res) => res.data);\n};\n\nexport const useEditAsset = () => {\n  const [progress, setProgress] = React.useState(0);\n  const { formatMessage } = useIntl();\n  const { toggleNotification } = useNotification();\n  const queryClient = useQueryClient();\n  const abortControllerRef = React.useRef<AbortController | null>(null);\n  const { post } = useFetchClient();\n\n  const mutation = useMutation<\n    UpdateFile.Response['data'],\n    Error,\n    { asset: FileAsset; file: File }\n  >(\n    ({ asset, file }) => {\n      // One controller per request, so `cancel` reaches it after the hook re-renders.\n      const abortController = new AbortController();\n      abortControllerRef.current = abortController;\n\n      return editAssetRequest(asset, file, abortController.signal, setProgress, post);\n    },\n    {\n      onSuccess() {\n        queryClient.refetchQueries([pluginId, 'assets'], { active: true });\n        queryClient.refetchQueries([pluginId, 'asset-count'], { active: true });\n        queryClient.refetchQueries([pluginId, 'folders'], { active: true });\n      },\n      onError(reason) {\n        if (isAbortError(reason) || abortControllerRef.current?.signal.aborted) return;\n\n        if (isFetchError(reason) && reason.status === 403) {\n          toggleNotification({\n            type: 'info',\n            message: formatMessage({ id: getTrad('permissions.not-allowed.update') }),\n          });\n        } else {\n          toggleNotification({ type: 'danger', message: reason.message });\n        }\n      },\n    }\n  );\n\n  const editAsset = (asset: FileAsset, file: File) => mutation.mutateAsync({ asset, file });\n\n  const cancel = () => abortControllerRef.current?.abort();\n\n  return { ...mutation, cancel, editAsset, progress, status: mutation.status };\n};\n"],"names":["editAssetRequest","asset","file","signal","onProgress","post","endpoint","pluginId","id","formData","FormData","append","JSON","stringify","alternativeText","caption","focalPoint","folder","name","then","res","data","useEditAsset","progress","setProgress","React","useState","formatMessage","useIntl","toggleNotification","useNotification","queryClient","useQueryClient","abortControllerRef","useRef","useFetchClient","mutation","useMutation","abortController","AbortController","current","onSuccess","refetchQueries","active","onError","reason","isAbortError","aborted","isFetchError","status","type","message","getTrad","editAsset","mutateAsync","cancel","abort"],"mappings":"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"}

package/dist/admin/legacy/hooks/useEditAsset.mjs

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { useNotification, useFetchClient } from '@strapi/admin/strapi-admin';
+import { useNotification, useFetchClient, isAbortError, isFetchError } from '@strapi/admin/strapi-admin';
 import { useIntl } from 'react-intl';
 import { useQueryClient, useMutation } from 'react-query';
 import { pluginId } from '../../pluginId.mjs';
@@ -35,10 +35,14 @@ const useEditAsset = ()=>{
     const { formatMessage } = useIntl();
     const { toggleNotification } = useNotification();
     const queryClient = useQueryClient();
-    const abortController = new AbortController();
-    const signal = abortController.signal;
+    const abortControllerRef = React.useRef(null);
     const { post } = useFetchClient();
-    const mutation = useMutation(({ asset, file })=>editAssetRequest(asset, file, signal, setProgress, post), {
+    const mutation = useMutation(({ asset, file })=>{
+        // One controller per request, so `cancel` reaches it after the hook re-renders.
+        const abortController = new AbortController();
+        abortControllerRef.current = abortController;
+        return editAssetRequest(asset, file, abortController.signal, setProgress, post);
+    }, {
         onSuccess () {
             queryClient.refetchQueries([
                 pluginId,
@@ -60,7 +64,8 @@ const useEditAsset = ()=>{
             });
         },
         onError (reason) {
-            if (reason?.response?.status === 403) {
+            if (isAbortError(reason) || abortControllerRef.current?.signal.aborted) return;
+            if (isFetchError(reason) && reason.status === 403) {
                 toggleNotification({
                     type: 'info',
                     message: formatMessage({
@@ -70,7 +75,7 @@ const useEditAsset = ()=>{
             } else {
                 toggleNotification({
                     type: 'danger',
-                    message: reason?.message
+                    message: reason.message
                 });
             }
         }
@@ -79,7 +84,7 @@ const useEditAsset = ()=>{
             asset,
             file
         });
-    const cancel = ()=>abortController.abort();
+    const cancel = ()=>abortControllerRef.current?.abort();
     return {
         ...mutation,
         cancel,

package/dist/admin/legacy/hooks/useEditAsset.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"useEditAsset.mjs","sources":["../../../../admin/src/legacy/hooks/useEditAsset.ts"],"sourcesContent":["import * as React from 'react';\n\nimport { useNotification, useFetchClient, FetchClient } from '@strapi/admin/strapi-admin';\nimport { useIntl } from 'react-intl';\nimport { useMutation, useQueryClient } from 'react-query';\n\nimport { UpdateFile, File as FileAsset } from '../../../../shared/contracts/files';\nimport { pluginId } from '../../pluginId';\nimport { getTrad } from '../utils';\n\nexport type ErrorMutation = {\n  message: string;\n  response: {\n    status: number;\n    data: {\n      error: Error;\n    };\n  };\n} | null;\n\nconst editAssetRequest = (\n  asset: FileAsset,\n  file: File,\n  signal: AbortSignal,\n  onProgress: (progress: number) => void,\n  post: FetchClient['post']\n): Promise<UpdateFile.Response['data']> => {\n  const endpoint = `/${pluginId}?id=${asset.id}`;\n\n  const formData = new FormData();\n\n  if (file) {\n    formData.append('files', file);\n  }\n\n  formData.append(\n    'fileInfo',\n    JSON.stringify({\n      alternativeText: asset.alternativeText,\n      caption: asset.caption,\n      focalPoint: asset.focalPoint,\n      folder: asset.folder,\n      name: asset.name,\n    })\n  );\n\n  /**\n   * onProgress is not possible using native fetch\n   * need to look into an alternative to make it work\n   * perhaps using xhr like Axios does\n   */\n  return post<UpdateFile.Response['data'], UpdateFile.Request['body']>(endpoint, formData, {\n    signal,\n  }).then((res) => res.data);\n};\n\nexport const useEditAsset = () => {\n  const [progress, setProgress] = React.useState(0);\n  const { formatMessage } = useIntl();\n  const { toggleNotification } = useNotification();\n  const queryClient = useQueryClient();\n  const abortController = new AbortController();\n  const signal = abortController.signal;\n  const { post } = useFetchClient();\n\n  const mutation = useMutation<\n    UpdateFile.Response['data'],\n    ErrorMutation,\n    { asset: FileAsset; file: File }\n  >(({ asset, file }) => editAssetRequest(asset, file, signal, setProgress, post), {\n    onSuccess() {\n      queryClient.refetchQueries([pluginId, 'assets'], { active: true });\n      queryClient.refetchQueries([pluginId, 'asset-count'], { active: true });\n      queryClient.refetchQueries([pluginId, 'folders'], { active: true });\n    },\n    onError(reason) {\n      if (reason?.response?.status === 403) {\n        toggleNotification({\n          type: 'info',\n          message: formatMessage({ id: getTrad('permissions.not-allowed.update') }),\n        });\n      } else {\n        toggleNotification({ type: 'danger', message: reason?.message });\n      }\n    },\n  });\n\n  const editAsset = (asset: FileAsset, file: File) => mutation.mutateAsync({ asset, file });\n\n  const cancel = () => abortController.abort();\n\n  return { ...mutation, cancel, editAsset, progress, status: mutation.status };\n};\n"],"names":["editAssetRequest","asset","file","signal","onProgress","post","endpoint","pluginId","id","formData","FormData","append","JSON","stringify","alternativeText","caption","focalPoint","folder","name","then","res","data","useEditAsset","progress","setProgress","React","useState","formatMessage","useIntl","toggleNotification","useNotification","queryClient","useQueryClient","abortController","AbortController","useFetchClient","mutation","useMutation","onSuccess","refetchQueries","active","onError","reason","response","status","type","message","getTrad","editAsset","mutateAsync","cancel","abort"],"mappings":"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"}
+{"version":3,"file":"useEditAsset.mjs","sources":["../../../../admin/src/legacy/hooks/useEditAsset.ts"],"sourcesContent":["import * as React from 'react';\n\nimport {\n  useNotification,\n  useFetchClient,\n  FetchClient,\n  isAbortError,\n  isFetchError,\n} from '@strapi/admin/strapi-admin';\nimport { useIntl } from 'react-intl';\nimport { useMutation, useQueryClient } from 'react-query';\n\nimport { UpdateFile, File as FileAsset } from '../../../../shared/contracts/files';\nimport { pluginId } from '../../pluginId';\nimport { getTrad } from '../utils';\n\nconst editAssetRequest = (\n  asset: FileAsset,\n  file: File,\n  signal: AbortSignal,\n  onProgress: (progress: number) => void,\n  post: FetchClient['post']\n): Promise<UpdateFile.Response['data']> => {\n  const endpoint = `/${pluginId}?id=${asset.id}`;\n\n  const formData = new FormData();\n\n  if (file) {\n    formData.append('files', file);\n  }\n\n  formData.append(\n    'fileInfo',\n    JSON.stringify({\n      alternativeText: asset.alternativeText,\n      caption: asset.caption,\n      focalPoint: asset.focalPoint,\n      folder: asset.folder,\n      name: asset.name,\n    })\n  );\n\n  /**\n   * onProgress is not possible using native fetch\n   * need to look into an alternative to make it work\n   * perhaps using xhr like Axios does\n   */\n  return post<UpdateFile.Response['data'], UpdateFile.Request['body']>(endpoint, formData, {\n    signal,\n  }).then((res) => res.data);\n};\n\nexport const useEditAsset = () => {\n  const [progress, setProgress] = React.useState(0);\n  const { formatMessage } = useIntl();\n  const { toggleNotification } = useNotification();\n  const queryClient = useQueryClient();\n  const abortControllerRef = React.useRef<AbortController | null>(null);\n  const { post } = useFetchClient();\n\n  const mutation = useMutation<\n    UpdateFile.Response['data'],\n    Error,\n    { asset: FileAsset; file: File }\n  >(\n    ({ asset, file }) => {\n      // One controller per request, so `cancel` reaches it after the hook re-renders.\n      const abortController = new AbortController();\n      abortControllerRef.current = abortController;\n\n      return editAssetRequest(asset, file, abortController.signal, setProgress, post);\n    },\n    {\n      onSuccess() {\n        queryClient.refetchQueries([pluginId, 'assets'], { active: true });\n        queryClient.refetchQueries([pluginId, 'asset-count'], { active: true });\n        queryClient.refetchQueries([pluginId, 'folders'], { active: true });\n      },\n      onError(reason) {\n        if (isAbortError(reason) || abortControllerRef.current?.signal.aborted) return;\n\n        if (isFetchError(reason) && reason.status === 403) {\n          toggleNotification({\n            type: 'info',\n            message: formatMessage({ id: getTrad('permissions.not-allowed.update') }),\n          });\n        } else {\n          toggleNotification({ type: 'danger', message: reason.message });\n        }\n      },\n    }\n  );\n\n  const editAsset = (asset: FileAsset, file: File) => mutation.mutateAsync({ asset, file });\n\n  const cancel = () => abortControllerRef.current?.abort();\n\n  return { ...mutation, cancel, editAsset, progress, status: mutation.status };\n};\n"],"names":["editAssetRequest","asset","file","signal","onProgress","post","endpoint","pluginId","id","formData","FormData","append","JSON","stringify","alternativeText","caption","focalPoint","folder","name","then","res","data","useEditAsset","progress","setProgress","React","useState","formatMessage","useIntl","toggleNotification","useNotification","queryClient","useQueryClient","abortControllerRef","useRef","useFetchClient","mutation","useMutation","abortController","AbortController","current","onSuccess","refetchQueries","active","onError","reason","isAbortError","aborted","isFetchError","status","type","message","getTrad","editAsset","mutateAsync","cancel","abort"],"mappings":"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"}

package/dist/admin/legacy/hooks/useUpload.js

@@ -61,11 +61,13 @@ const useUpload = ()=>{
     const dispatch = reactRedux.useDispatch();
     const [progress, setProgress] = React__namespace.useState(0);
     const queryClient = reactQuery.useQueryClient();
-    const abortController = new AbortController();
-    const signal = abortController.signal;
+    const abortControllerRef = React__namespace.useRef(null);
     const store = reactRedux.useStore();
     const mutation = reactQuery.useMutation(({ assets, folderId })=>{
-        return uploadAssets(assets, folderId, signal, setProgress, store.getState().admin_app?.token);
+        // One controller per request, so `cancel` reaches it after the hook re-renders.
+        const abortController = new AbortController();
+        abortControllerRef.current = abortController;
+        return uploadAssets(assets, folderId, abortController.signal, setProgress, store.getState().admin_app?.token);
     }, {
         mutationKey: [
             pluginId.pluginId,
@@ -94,7 +96,7 @@ const useUpload = ()=>{
             assets,
             folderId
         });
-    const cancel = ()=>abortController.abort();
+    const cancel = ()=>abortControllerRef.current?.abort();
     return {
         upload,
         isLoading: mutation.isLoading,

package/dist/admin/legacy/hooks/useUpload.js.map

@@ -1 +1 @@
-{"version":3,"file":"useUpload.js","sources":["../../../../admin/src/legacy/hooks/useUpload.ts"],"sourcesContent":["import * as React from 'react';\n\nimport { adminApi } from '@strapi/admin/strapi-admin';\nimport { useMutation, useQueryClient } from 'react-query';\nimport { useDispatch, useStore } from 'react-redux';\n\nimport { File, RawFile, CreateFile } from '../../../../shared/contracts/files';\nimport { pluginId } from '../../pluginId';\nimport { uploadFileViaXHR } from '../../services/uploadFileViaXHR';\n\nconst endpoint = `/${pluginId}`;\n\ninterface Asset extends Omit<File, 'id' | 'hash'> {\n  rawFile?: RawFile;\n  id?: File['id'];\n  hash?: File['hash'];\n}\n\ninterface StoreState {\n  admin_app: {\n    token?: string | null;\n  };\n}\n\nconst uploadAssets = (\n  assets: Asset | Asset[],\n  folderId: number | null,\n  signal: AbortSignal,\n  onProgress: (progress: number) => void,\n  token: string | null | undefined\n): Promise<CreateFile.Response['data']> => {\n  const assetsArray = Array.isArray(assets) ? assets : [assets];\n  const formData = new FormData();\n\n  // Add all files to the form data\n  assetsArray.forEach((asset) => {\n    if (asset.rawFile) {\n      formData.append('files', asset.rawFile);\n    }\n  });\n\n  // Add each fileInfo as a separate stringified field\n  assetsArray.forEach((asset) => {\n    formData.append(\n      'fileInfo',\n      JSON.stringify({\n        name: asset.name,\n        caption: asset.caption,\n        alternativeText: asset.alternativeText,\n        folder: folderId,\n      })\n    );\n  });\n\n  /**\n   * Native fetch cannot report upload progress, so upload via the shared XHR\n   * service and surface its byte-level progress as a 0-100 percentage.\n   */\n  return uploadFileViaXHR<CreateFile.Response['data']>(\n    `${window.strapi.backendURL}${endpoint}`,\n    token,\n    formData,\n    signal,\n    (loaded, total) => {\n      if (total > 0) {\n        onProgress(Math.round((loaded / total) * 100));\n      }\n    }\n  );\n};\n\nexport const useUpload = () => {\n  const dispatch = useDispatch();\n  const [progress, setProgress] = React.useState(0);\n  const queryClient = useQueryClient();\n  const abortController = new AbortController();\n  const signal = abortController.signal;\n  const store = useStore<StoreState>();\n\n  const mutation = useMutation<\n    CreateFile.Response['data'],\n    CreateFile.Response['error'],\n    { assets: Asset | Asset[]; folderId: number | null }\n  >(\n    ({ assets, folderId }) => {\n      return uploadAssets(assets, folderId, signal, setProgress, store.getState().admin_app?.token);\n    },\n    {\n      mutationKey: [pluginId, 'upload'],\n      onSuccess() {\n        queryClient.refetchQueries([pluginId, 'assets'], { active: true });\n        queryClient.refetchQueries([pluginId, 'asset-count'], { active: true });\n        dispatch(adminApi.util.invalidateTags(['HomepageKeyStatistics', 'AiUsage']));\n      },\n    }\n  );\n\n  const upload = (assets: Asset | Asset[], folderId: number | null) =>\n    mutation.mutateAsync({ assets, folderId });\n\n  const cancel = () => abortController.abort();\n\n  return {\n    upload,\n    isLoading: mutation.isLoading,\n    cancel,\n    error: mutation.error,\n    progress,\n    status: mutation.status,\n  };\n};\n"],"names":["endpoint","pluginId","uploadAssets","assets","folderId","signal","onProgress","token","assetsArray","Array","isArray","formData","FormData","forEach","asset","rawFile","append","JSON","stringify","name","caption","alternativeText","folder","uploadFileViaXHR","window","strapi","backendURL","loaded","total","Math","round","useUpload","dispatch","useDispatch","progress","setProgress","React","useState","queryClient","useQueryClient","abortController","AbortController","store","useStore","mutation","useMutation","getState","admin_app","mutationKey","onSuccess","refetchQueries","active","adminApi","util","invalidateTags","upload","mutateAsync","cancel","abort","isLoading","error","status"],"mappings":"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"}
+{"version":3,"file":"useUpload.js","sources":["../../../../admin/src/legacy/hooks/useUpload.ts"],"sourcesContent":["import * as React from 'react';\n\nimport { adminApi } from '@strapi/admin/strapi-admin';\nimport { useMutation, useQueryClient } from 'react-query';\nimport { useDispatch, useStore } from 'react-redux';\n\nimport { File, RawFile, CreateFile } from '../../../../shared/contracts/files';\nimport { pluginId } from '../../pluginId';\nimport { uploadFileViaXHR } from '../../services/uploadFileViaXHR';\n\nconst endpoint = `/${pluginId}`;\n\ninterface Asset extends Omit<File, 'id' | 'hash'> {\n  rawFile?: RawFile;\n  id?: File['id'];\n  hash?: File['hash'];\n}\n\ninterface StoreState {\n  admin_app: {\n    token?: string | null;\n  };\n}\n\nconst uploadAssets = (\n  assets: Asset | Asset[],\n  folderId: number | null,\n  signal: AbortSignal,\n  onProgress: (progress: number) => void,\n  token: string | null | undefined\n): Promise<CreateFile.Response['data']> => {\n  const assetsArray = Array.isArray(assets) ? assets : [assets];\n  const formData = new FormData();\n\n  // Add all files to the form data\n  assetsArray.forEach((asset) => {\n    if (asset.rawFile) {\n      formData.append('files', asset.rawFile);\n    }\n  });\n\n  // Add each fileInfo as a separate stringified field\n  assetsArray.forEach((asset) => {\n    formData.append(\n      'fileInfo',\n      JSON.stringify({\n        name: asset.name,\n        caption: asset.caption,\n        alternativeText: asset.alternativeText,\n        folder: folderId,\n      })\n    );\n  });\n\n  /**\n   * Native fetch cannot report upload progress, so upload via the shared XHR\n   * service and surface its byte-level progress as a 0-100 percentage.\n   */\n  return uploadFileViaXHR<CreateFile.Response['data']>(\n    `${window.strapi.backendURL}${endpoint}`,\n    token,\n    formData,\n    signal,\n    (loaded, total) => {\n      if (total > 0) {\n        onProgress(Math.round((loaded / total) * 100));\n      }\n    }\n  );\n};\n\nexport const useUpload = () => {\n  const dispatch = useDispatch();\n  const [progress, setProgress] = React.useState(0);\n  const queryClient = useQueryClient();\n  const abortControllerRef = React.useRef<AbortController | null>(null);\n  const store = useStore<StoreState>();\n\n  const mutation = useMutation<\n    CreateFile.Response['data'],\n    CreateFile.Response['error'],\n    { assets: Asset | Asset[]; folderId: number | null }\n  >(\n    ({ assets, folderId }) => {\n      // One controller per request, so `cancel` reaches it after the hook re-renders.\n      const abortController = new AbortController();\n      abortControllerRef.current = abortController;\n\n      return uploadAssets(\n        assets,\n        folderId,\n        abortController.signal,\n        setProgress,\n        store.getState().admin_app?.token\n      );\n    },\n    {\n      mutationKey: [pluginId, 'upload'],\n      onSuccess() {\n        queryClient.refetchQueries([pluginId, 'assets'], { active: true });\n        queryClient.refetchQueries([pluginId, 'asset-count'], { active: true });\n        dispatch(adminApi.util.invalidateTags(['HomepageKeyStatistics', 'AiUsage']));\n      },\n    }\n  );\n\n  const upload = (assets: Asset | Asset[], folderId: number | null) =>\n    mutation.mutateAsync({ assets, folderId });\n\n  const cancel = () => abortControllerRef.current?.abort();\n\n  return {\n    upload,\n    isLoading: mutation.isLoading,\n    cancel,\n    error: mutation.error,\n    progress,\n    status: mutation.status,\n  };\n};\n"],"names":["endpoint","pluginId","uploadAssets","assets","folderId","signal","onProgress","token","assetsArray","Array","isArray","formData","FormData","forEach","asset","rawFile","append","JSON","stringify","name","caption","alternativeText","folder","uploadFileViaXHR","window","strapi","backendURL","loaded","total","Math","round","useUpload","dispatch","useDispatch","progress","setProgress","React","useState","queryClient","useQueryClient","abortControllerRef","useRef","store","useStore","mutation","useMutation","abortController","AbortController","current","getState","admin_app","mutationKey","onSuccess","refetchQueries","active","adminApi","util","invalidateTags","upload","mutateAsync","cancel","abort","isLoading","error","status"],"mappings":"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"}

package/dist/admin/legacy/hooks/useUpload.mjs

@@ -39,11 +39,13 @@ const useUpload = ()=>{
     const dispatch = useDispatch();
     const [progress, setProgress] = React.useState(0);
     const queryClient = useQueryClient();
-    const abortController = new AbortController();
-    const signal = abortController.signal;
+    const abortControllerRef = React.useRef(null);
     const store = useStore();
     const mutation = useMutation(({ assets, folderId })=>{
-        return uploadAssets(assets, folderId, signal, setProgress, store.getState().admin_app?.token);
+        // One controller per request, so `cancel` reaches it after the hook re-renders.
+        const abortController = new AbortController();
+        abortControllerRef.current = abortController;
+        return uploadAssets(assets, folderId, abortController.signal, setProgress, store.getState().admin_app?.token);
     }, {
         mutationKey: [
             pluginId,
@@ -72,7 +74,7 @@ const useUpload = ()=>{
             assets,
             folderId
         });
-    const cancel = ()=>abortController.abort();
+    const cancel = ()=>abortControllerRef.current?.abort();
     return {
         upload,
         isLoading: mutation.isLoading,

package/dist/admin/legacy/hooks/useUpload.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"useUpload.mjs","sources":["../../../../admin/src/legacy/hooks/useUpload.ts"],"sourcesContent":["import * as React from 'react';\n\nimport { adminApi } from '@strapi/admin/strapi-admin';\nimport { useMutation, useQueryClient } from 'react-query';\nimport { useDispatch, useStore } from 'react-redux';\n\nimport { File, RawFile, CreateFile } from '../../../../shared/contracts/files';\nimport { pluginId } from '../../pluginId';\nimport { uploadFileViaXHR } from '../../services/uploadFileViaXHR';\n\nconst endpoint = `/${pluginId}`;\n\ninterface Asset extends Omit<File, 'id' | 'hash'> {\n  rawFile?: RawFile;\n  id?: File['id'];\n  hash?: File['hash'];\n}\n\ninterface StoreState {\n  admin_app: {\n    token?: string | null;\n  };\n}\n\nconst uploadAssets = (\n  assets: Asset | Asset[],\n  folderId: number | null,\n  signal: AbortSignal,\n  onProgress: (progress: number) => void,\n  token: string | null | undefined\n): Promise<CreateFile.Response['data']> => {\n  const assetsArray = Array.isArray(assets) ? assets : [assets];\n  const formData = new FormData();\n\n  // Add all files to the form data\n  assetsArray.forEach((asset) => {\n    if (asset.rawFile) {\n      formData.append('files', asset.rawFile);\n    }\n  });\n\n  // Add each fileInfo as a separate stringified field\n  assetsArray.forEach((asset) => {\n    formData.append(\n      'fileInfo',\n      JSON.stringify({\n        name: asset.name,\n        caption: asset.caption,\n        alternativeText: asset.alternativeText,\n        folder: folderId,\n      })\n    );\n  });\n\n  /**\n   * Native fetch cannot report upload progress, so upload via the shared XHR\n   * service and surface its byte-level progress as a 0-100 percentage.\n   */\n  return uploadFileViaXHR<CreateFile.Response['data']>(\n    `${window.strapi.backendURL}${endpoint}`,\n    token,\n    formData,\n    signal,\n    (loaded, total) => {\n      if (total > 0) {\n        onProgress(Math.round((loaded / total) * 100));\n      }\n    }\n  );\n};\n\nexport const useUpload = () => {\n  const dispatch = useDispatch();\n  const [progress, setProgress] = React.useState(0);\n  const queryClient = useQueryClient();\n  const abortController = new AbortController();\n  const signal = abortController.signal;\n  const store = useStore<StoreState>();\n\n  const mutation = useMutation<\n    CreateFile.Response['data'],\n    CreateFile.Response['error'],\n    { assets: Asset | Asset[]; folderId: number | null }\n  >(\n    ({ assets, folderId }) => {\n      return uploadAssets(assets, folderId, signal, setProgress, store.getState().admin_app?.token);\n    },\n    {\n      mutationKey: [pluginId, 'upload'],\n      onSuccess() {\n        queryClient.refetchQueries([pluginId, 'assets'], { active: true });\n        queryClient.refetchQueries([pluginId, 'asset-count'], { active: true });\n        dispatch(adminApi.util.invalidateTags(['HomepageKeyStatistics', 'AiUsage']));\n      },\n    }\n  );\n\n  const upload = (assets: Asset | Asset[], folderId: number | null) =>\n    mutation.mutateAsync({ assets, folderId });\n\n  const cancel = () => abortController.abort();\n\n  return {\n    upload,\n    isLoading: mutation.isLoading,\n    cancel,\n    error: mutation.error,\n    progress,\n    status: mutation.status,\n  };\n};\n"],"names":["endpoint","pluginId","uploadAssets","assets","folderId","signal","onProgress","token","assetsArray","Array","isArray","formData","FormData","forEach","asset","rawFile","append","JSON","stringify","name","caption","alternativeText","folder","uploadFileViaXHR","window","strapi","backendURL","loaded","total","Math","round","useUpload","dispatch","useDispatch","progress","setProgress","React","useState","queryClient","useQueryClient","abortController","AbortController","store","useStore","mutation","useMutation","getState","admin_app","mutationKey","onSuccess","refetchQueries","active","adminApi","util","invalidateTags","upload","mutateAsync","cancel","abort","isLoading","error","status"],"mappings":"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"}
+{"version":3,"file":"useUpload.mjs","sources":["../../../../admin/src/legacy/hooks/useUpload.ts"],"sourcesContent":["import * as React from 'react';\n\nimport { adminApi } from '@strapi/admin/strapi-admin';\nimport { useMutation, useQueryClient } from 'react-query';\nimport { useDispatch, useStore } from 'react-redux';\n\nimport { File, RawFile, CreateFile } from '../../../../shared/contracts/files';\nimport { pluginId } from '../../pluginId';\nimport { uploadFileViaXHR } from '../../services/uploadFileViaXHR';\n\nconst endpoint = `/${pluginId}`;\n\ninterface Asset extends Omit<File, 'id' | 'hash'> {\n  rawFile?: RawFile;\n  id?: File['id'];\n  hash?: File['hash'];\n}\n\ninterface StoreState {\n  admin_app: {\n    token?: string | null;\n  };\n}\n\nconst uploadAssets = (\n  assets: Asset | Asset[],\n  folderId: number | null,\n  signal: AbortSignal,\n  onProgress: (progress: number) => void,\n  token: string | null | undefined\n): Promise<CreateFile.Response['data']> => {\n  const assetsArray = Array.isArray(assets) ? assets : [assets];\n  const formData = new FormData();\n\n  // Add all files to the form data\n  assetsArray.forEach((asset) => {\n    if (asset.rawFile) {\n      formData.append('files', asset.rawFile);\n    }\n  });\n\n  // Add each fileInfo as a separate stringified field\n  assetsArray.forEach((asset) => {\n    formData.append(\n      'fileInfo',\n      JSON.stringify({\n        name: asset.name,\n        caption: asset.caption,\n        alternativeText: asset.alternativeText,\n        folder: folderId,\n      })\n    );\n  });\n\n  /**\n   * Native fetch cannot report upload progress, so upload via the shared XHR\n   * service and surface its byte-level progress as a 0-100 percentage.\n   */\n  return uploadFileViaXHR<CreateFile.Response['data']>(\n    `${window.strapi.backendURL}${endpoint}`,\n    token,\n    formData,\n    signal,\n    (loaded, total) => {\n      if (total > 0) {\n        onProgress(Math.round((loaded / total) * 100));\n      }\n    }\n  );\n};\n\nexport const useUpload = () => {\n  const dispatch = useDispatch();\n  const [progress, setProgress] = React.useState(0);\n  const queryClient = useQueryClient();\n  const abortControllerRef = React.useRef<AbortController | null>(null);\n  const store = useStore<StoreState>();\n\n  const mutation = useMutation<\n    CreateFile.Response['data'],\n    CreateFile.Response['error'],\n    { assets: Asset | Asset[]; folderId: number | null }\n  >(\n    ({ assets, folderId }) => {\n      // One controller per request, so `cancel` reaches it after the hook re-renders.\n      const abortController = new AbortController();\n      abortControllerRef.current = abortController;\n\n      return uploadAssets(\n        assets,\n        folderId,\n        abortController.signal,\n        setProgress,\n        store.getState().admin_app?.token\n      );\n    },\n    {\n      mutationKey: [pluginId, 'upload'],\n      onSuccess() {\n        queryClient.refetchQueries([pluginId, 'assets'], { active: true });\n        queryClient.refetchQueries([pluginId, 'asset-count'], { active: true });\n        dispatch(adminApi.util.invalidateTags(['HomepageKeyStatistics', 'AiUsage']));\n      },\n    }\n  );\n\n  const upload = (assets: Asset | Asset[], folderId: number | null) =>\n    mutation.mutateAsync({ assets, folderId });\n\n  const cancel = () => abortControllerRef.current?.abort();\n\n  return {\n    upload,\n    isLoading: mutation.isLoading,\n    cancel,\n    error: mutation.error,\n    progress,\n    status: mutation.status,\n  };\n};\n"],"names":["endpoint","pluginId","uploadAssets","assets","folderId","signal","onProgress","token","assetsArray","Array","isArray","formData","FormData","forEach","asset","rawFile","append","JSON","stringify","name","caption","alternativeText","folder","uploadFileViaXHR","window","strapi","backendURL","loaded","total","Math","round","useUpload","dispatch","useDispatch","progress","setProgress","React","useState","queryClient","useQueryClient","abortControllerRef","useRef","store","useStore","mutation","useMutation","abortController","AbortController","current","getState","admin_app","mutationKey","onSuccess","refetchQueries","active","adminApi","util","invalidateTags","upload","mutateAsync","cancel","abort","isLoading","error","status"],"mappings":"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"}

package/dist/admin/src/legacy/hooks/useEditAsset.d.ts

@@ -1,15 +1,6 @@
 import { File as FileAsset } from '../../../../shared/contracts/files';
-export type ErrorMutation = {
-    message: string;
-    response: {
-        status: number;
-        data: {
-            error: Error;
-        };
-    };
-} | null;
 export declare const useEditAsset: () => {
-    cancel: () => void;
+    cancel: () => void | undefined;
     editAsset: (asset: FileAsset, file: File) => Promise<FileAsset>;
     progress: number;
     status: "success" | "error" | "loading" | "idle";
@@ -19,7 +10,7 @@ export declare const useEditAsset: () => {
     isIdle: true;
     isLoading: false;
     isSuccess: false;
-    mutate: import("react-query").UseMutateFunction<FileAsset, ErrorMutation, {
+    mutate: import("react-query").UseMutateFunction<FileAsset, Error, {
         asset: FileAsset;
         file: File;
     }, unknown>;
@@ -31,12 +22,12 @@ export declare const useEditAsset: () => {
         asset: FileAsset;
         file: File;
     } | undefined;
-    mutateAsync: import("react-query").UseMutateAsyncFunction<FileAsset, ErrorMutation, {
+    mutateAsync: import("react-query").UseMutateAsyncFunction<FileAsset, Error, {
         asset: FileAsset;
         file: File;
     }, unknown>;
 } | {
-    cancel: () => void;
+    cancel: () => void | undefined;
     editAsset: (asset: FileAsset, file: File) => Promise<FileAsset>;
     progress: number;
     status: "success" | "error" | "loading" | "idle";
@@ -46,7 +37,7 @@ export declare const useEditAsset: () => {
     isIdle: false;
     isLoading: true;
     isSuccess: false;
-    mutate: import("react-query").UseMutateFunction<FileAsset, ErrorMutation, {
+    mutate: import("react-query").UseMutateFunction<FileAsset, Error, {
         asset: FileAsset;
         file: File;
     }, unknown>;
@@ -58,22 +49,22 @@ export declare const useEditAsset: () => {
         asset: FileAsset;
         file: File;
     } | undefined;
-    mutateAsync: import("react-query").UseMutateAsyncFunction<FileAsset, ErrorMutation, {
+    mutateAsync: import("react-query").UseMutateAsyncFunction<FileAsset, Error, {
         asset: FileAsset;
         file: File;
     }, unknown>;
 } | {
-    cancel: () => void;
+    cancel: () => void | undefined;
     editAsset: (asset: FileAsset, file: File) => Promise<FileAsset>;
     progress: number;
     status: "success" | "error" | "loading" | "idle";
     data: undefined;
-    error: ErrorMutation;
+    error: Error;
     isError: true;
     isIdle: false;
     isLoading: false;
     isSuccess: false;
-    mutate: import("react-query").UseMutateFunction<FileAsset, ErrorMutation, {
+    mutate: import("react-query").UseMutateFunction<FileAsset, Error, {
         asset: FileAsset;
         file: File;
     }, unknown>;
@@ -85,12 +76,12 @@ export declare const useEditAsset: () => {
         asset: FileAsset;
         file: File;
     } | undefined;
-    mutateAsync: import("react-query").UseMutateAsyncFunction<FileAsset, ErrorMutation, {
+    mutateAsync: import("react-query").UseMutateAsyncFunction<FileAsset, Error, {
         asset: FileAsset;
         file: File;
     }, unknown>;
 } | {
-    cancel: () => void;
+    cancel: () => void | undefined;
     editAsset: (asset: FileAsset, file: File) => Promise<FileAsset>;
     progress: number;
     status: "success" | "error" | "loading" | "idle";
@@ -100,7 +91,7 @@ export declare const useEditAsset: () => {
     isIdle: false;
     isLoading: false;
     isSuccess: true;
-    mutate: import("react-query").UseMutateFunction<FileAsset, ErrorMutation, {
+    mutate: import("react-query").UseMutateFunction<FileAsset, Error, {
         asset: FileAsset;
         file: File;
     }, unknown>;
@@ -112,7 +103,7 @@ export declare const useEditAsset: () => {
         asset: FileAsset;
         file: File;
     } | undefined;
-    mutateAsync: import("react-query").UseMutateAsyncFunction<FileAsset, ErrorMutation, {
+    mutateAsync: import("react-query").UseMutateAsyncFunction<FileAsset, Error, {
         asset: FileAsset;
         file: File;
     }, unknown>;

package/dist/admin/src/legacy/hooks/useUpload.d.ts

@@ -7,7 +7,7 @@ interface Asset extends Omit<File, 'id' | 'hash'> {
 export declare const useUpload: () => {
     upload: (assets: Asset | Asset[], folderId: number | null) => Promise<File[]>;
     isLoading: boolean;
-    cancel: () => void;
+    cancel: () => void | undefined;
     error: import("@strapi/utils/dist/errors").ApplicationError<"ApplicationError", string, unknown> | import("@strapi/utils/dist/errors").ValidationError<string, unknown> | null | undefined;
     progress: number;
     status: "success" | "error" | "loading" | "idle";

package/dist/server/services/extensions/utils.js

@@ -320,7 +320,7 @@ const getImageFormats = (image)=>Object.entries(image.formats ?? {});
  * if they are from the current upload provider
  *
  * @param {Object} entity
- * @param {Object} modelAttributes
+ * @param {UID.Schema} uid - UID of the model the entity belongs to
  * @param {Map} cache one per document service call, see `SignCache`
  * @returns
  */ const signEntityMedia = async (entity, uid, cache = createSignCache())=>{

package/dist/server/services/extensions/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sources":["../../../../server/src/services/extensions/utils.ts"],"sourcesContent":["import path from 'path';\n\nimport { async, traverseEntity } from '@strapi/utils';\n\nimport type { Schema, UID } from '@strapi/types';\n\nimport { getService } from '../../utils';\nimport { FILE_MODEL_UID } from '../../constants';\n\nimport type { Config, File } from '../../types';\n\ntype SignEntityMediaVisitor = (\n  args: {\n    key: string;\n    value: unknown;\n    attribute: Schema.Attribute.AnyAttribute;\n  },\n  utils: {\n    set: (key: string, value: unknown) => void;\n  }\n) => Promise<void>;\n\n/**\n * One presign per distinct URL, keyed by the bare (unsigned) URL. The promise\n * is stored rather than its result so concurrent occurrences of the same URL\n * (the `async.map` in `mapRichtextUrls`, or several entries of a `findMany`)\n * share a single provider call.\n *\n * A cache must never outlive the document service call or migration run that\n * created it: a signed URL is only as fresh as the request that produced it.\n */\ntype SignCache = Map<string, Promise<string | null>>;\n\nconst createSignCache = (): SignCache => new Map();\n\n/**\n * URL bearing syntaxes found in a richtext (markdown) value. Each pattern\n * captures a prefix (group 1) and the URL (group 2) so the rebuild loop in\n * `mapRichtextUrls` can splice a new URL in place without touching anything\n * else.\n *\n * - markdown image / link: `![alt](url)` or `[text](url)`. The URL is captured\n *   up to the first whitespace or closing parenthesis, which also covers the\n *   optional title form `[text](url \"title\")`.\n * - raw HTML `src` / `href` attributes, double or single quoted, on the\n *   elements the editor lets users write by hand (`<img src=\"...\" width=\"200\">`\n *   is the usual way to size an image).\n */\nconst RICHTEXT_URL_REGEXES = [\n  /(!?\\[[^\\]]*\\]\\()([^)\\s]+)/g,\n  /(<(?:img|a|source|video|audio)\\b[^>]*?\\b(?:src|href)=\")([^\"]+)/gi,\n  /(<(?:img|a|source|video|audio)\\b[^>]*?\\b(?:src|href)=')([^']+)/gi,\n];\n\n/** Cheap short circuit for richtext values that cannot contain a URL we would rewrite. */\nconst RICHTEXT_URL_HINTS = ['](', 'src=', 'href='];\n\ntype BlocksNode = {\n  type?: string;\n  image?: File;\n  children?: unknown;\n  [key: string]: unknown;\n};\n\ntype ImageFormat = { url?: string; isUrlSigned?: boolean; [key: string]: unknown };\n\nfunction isFile(value: unknown, attribute: Schema.Attribute.AnyAttribute): value is File {\n  if (!value || attribute.type !== 'media') {\n    return false;\n  }\n\n  return true;\n}\n\nconst stripQueryString = (url: string) => url.split('?')[0];\n\nconst decodeQueryParamName = (pair: string) => {\n  const name = pair.split('=')[0];\n\n  try {\n    return decodeURIComponent(name);\n  } catch {\n    return name;\n  }\n};\n\n/**\n * Split a URL into what precedes the `?`, the raw `key=value` pairs of its\n * query string and the `#fragment`, if any. Plain string work on purpose:\n * `new URL` throws on the relative `/uploads/...` paths a local provider\n * writes, and would re-encode the pairs we want to hand back untouched.\n */\nconst splitUrl = (url: string) => {\n  const hashIndex = url.indexOf('#');\n  const fragment = hashIndex === -1 ? '' : url.slice(hashIndex);\n  const withoutFragment = hashIndex === -1 ? url : url.slice(0, hashIndex);\n\n  const queryIndex = withoutFragment.indexOf('?');\n\n  if (queryIndex === -1) {\n    return { base: withoutFragment, pairs: [] as string[], fragment };\n  }\n\n  return {\n    base: withoutFragment.slice(0, queryIndex),\n    pairs: withoutFragment\n      .slice(queryIndex + 1)\n      .split('&')\n      .filter(Boolean),\n    fragment,\n  };\n};\n\n/** Names of the query parameters of `url`, decoded, in order. */\nconst getQueryParamNames = (url: string): string[] => splitUrl(url).pairs.map(decodeQueryParamName);\n\n/**\n * `url` with every query parameter whose name is in `names` removed. The\n * surviving pairs keep their order and encoding; the `?` is dropped when\n * nothing is left.\n */\nconst removeQueryParams = (url: string, names: string[]): string => {\n  const { base, pairs, fragment } = splitUrl(url);\n\n  if (pairs.length === 0 || names.length === 0) {\n    return url;\n  }\n\n  const kept = pairs.filter((pair) => !names.includes(decodeQueryParamName(pair)));\n\n  return kept.length === 0 ? `${base}${fragment}` : `${base}?${kept.join('&')}${fragment}`;\n};\n\n/**\n * Build the minimal file shape `signFileUrls` needs out of a bare URL, as found\n * in a richtext value.\n *\n * `hash` and `ext` are taken from the last path segment and `path` is left\n * unset, which rebuilds the S3 key for the default layout and for the\n * `rootPath` provider option (the provider prefixes it itself). A URL whose key\n * has extra segments (a file uploaded with the per-file `path` option, or an\n * older key layout) is still recognised as ours by the provider, but it is\n * signed with a key that does not exist and the link returns 403. Media\n * signing has the same limit because `path` is not persisted on the file\n * (`content-types/file.ts`). Not addressed here.\n */\nconst getFileFromUrl = (url: string): File => {\n  const unsignedUrl = stripQueryString(url);\n  const { provider } = strapi.config.get<Config>('plugin::upload');\n  const { name, ext } = path.parse(unsignedUrl.split('/').pop() ?? '');\n\n  return { url: unsignedUrl, hash: name, ext, provider } as File;\n};\n\n/**\n * Ask the provider to sign `file` and return the signed URL if the provider\n * owns it, otherwise `null`. Memoised in `cache` by the bare URL.\n *\n * Ownership is decided by whether the provider changed the URL: `signFileUrls`\n * flags every file of the configured provider as signed, but the provider\n * itself returns URLs it does not own untouched (an S3 URL from another\n * bucket, an external site, a local `/uploads` path), so a changed URL is the\n * only reliable signal. `file.url` must already be the bare URL so the\n * comparison is meaningful.\n */\nconst signFileIfOwned = (file: File, cache: SignCache): Promise<string | null> => {\n  const bareUrl = file.url ?? '';\n  const cached = cache.get(bareUrl);\n\n  if (cached) {\n    return cached;\n  }\n\n  const pending = (async () => {\n    const { signFileUrls } = getService('file');\n    const signedFile = await signFileUrls(file);\n\n    return signedFile.url && signedFile.url !== bareUrl ? signedFile.url : null;\n  })();\n\n  cache.set(bareUrl, pending);\n\n  return pending;\n};\n\n/**\n * Signs a richtext URL if the configured provider owns it, otherwise `null`.\n * See `signFileIfOwned` for how ownership is decided. A single predicate means\n * the read path (sign) and the write path (unsign) can never disagree about\n * what they own.\n */\nconst signIfOwned = (url: string, cache: SignCache): Promise<string | null> =>\n  signFileIfOwned(getFileFromUrl(url), cache);\n\n/**\n * Returns a richtext URL with its signature removed, if we own it.\n *\n * Only the query parameters the provider's own fresh signature introduces are\n * removed (for S3, the `X-Amz-*` family), every other parameter is kept. That\n * way a provider that signs whatever it is handed cannot make us drop `?v=x`\n * from a link to an external site. A parameter of an old signature that the\n * fresh one no longer carries (an `X-Amz-Security-Token` from credentials no\n * longer in use, say) survives in the row; it is not a signature, and the read\n * path replaces the whole URL with the provider output anyway.\n */\nconst stripSignedUrl = async (url: string, cache: SignCache) => {\n  // Nothing to strip, and no reason to ask the provider\n  if (!url.includes('?')) {\n    return url;\n  }\n\n  const signedUrl = await signIfOwned(url, cache);\n\n  if (signedUrl === null) {\n    return url;\n  }\n\n  return removeQueryParams(url, getQueryParamNames(signedUrl));\n};\n\n/** Returns a freshly signed richtext URL, if we own it. */\nconst signUrl = async (url: string, cache: SignCache) => (await signIfOwned(url, cache)) ?? url;\n\n/**\n * Apply `mapUrl` to every markdown image / link URL and every raw HTML\n * `src` / `href` URL of a richtext value.\n */\nconst mapRichtextUrls = async (value: unknown, mapUrl: (url: string) => Promise<string>) => {\n  if (typeof value !== 'string' || !RICHTEXT_URL_HINTS.some((hint) => value.includes(hint))) {\n    return value;\n  }\n\n  // The rebuild loop splices by match index, so matches must be in ascending order\n  const matches = RICHTEXT_URL_REGEXES.flatMap((regex) => Array.from(value.matchAll(regex))).sort(\n    (a, b) => (a.index as number) - (b.index as number)\n  );\n\n  if (matches.length === 0) {\n    return value;\n  }\n\n  const urls: string[] = await async.map(matches, (match: RegExpMatchArray) => mapUrl(match[2]));\n\n  let result = '';\n  let cursor = 0;\n\n  matches.forEach((match, index) => {\n    const urlStart = (match.index as number) + match[1].length;\n\n    // Two patterns matched overlapping text: keep the first, never splice twice\n    if (urlStart < cursor) {\n      return;\n    }\n\n    result += value.slice(cursor, urlStart) + urls[index];\n    cursor = urlStart + match[2].length;\n  });\n\n  return result + value.slice(cursor);\n};\n\n/**\n * Apply `mapImage` to every `image` node of a blocks value, recursively.\n * A new array is always returned, the original value is never mutated.\n */\nconst mapBlocksImages = async (\n  value: unknown,\n  mapImage: (image: File) => Promise<File>\n): Promise<unknown> => {\n  if (!Array.isArray(value)) {\n    return value;\n  }\n\n  return async.map(value, async (node: BlocksNode) => {\n    if (!node || typeof node !== 'object') {\n      return node;\n    }\n\n    let result = node;\n\n    if (node.type === 'image' && node.image) {\n      result = { ...result, image: await mapImage(node.image) };\n    }\n\n    if (Array.isArray(node.children)) {\n      result = { ...result, children: await mapBlocksImages(node.children, mapImage) };\n    }\n\n    return result;\n  });\n};\n\nconst getImageFormats = (image: File): [string, ImageFormat][] =>\n  Object.entries(image.formats ?? {}) as [string, ImageFormat][];\n\n/** True when the node still carries anything `unsignImage` would remove. */\nconst hasSignatureTraces = (image: File) => {\n  if (image.isUrlSigned !== undefined || (image.url ?? '').includes('?')) {\n    return true;\n  }\n\n  return getImageFormats(image).some(\n    ([, format]) => format?.isUrlSigned !== undefined || (format?.url ?? '').includes('?')\n  );\n};\n\n/**\n * Remove the signature from a blocks `image` node: the signature parameters on\n * the file URL and on every format URL (the same presigner signs them all, so\n * the same parameter names apply), and the `isUrlSigned` flag `signFileUrls`\n * sets on the file and on each format. The node carries a full file object, so\n * the ownership check is made with it rather than with a URL derived stand in.\n */\nconst unsignImage = async (image: File, cache: SignCache = createSignCache()) => {\n  // Already bare: nothing to do, and no reason to ask the provider\n  if (!hasSignatureTraces(image)) {\n    return image;\n  }\n\n  const bareUrl = stripQueryString(image.url ?? '');\n  const signedUrl = await signFileIfOwned({ ...image, url: bareUrl }, cache);\n\n  // Not one of ours (different provider, external URL, public provider): the\n  // provider hands the URL back unchanged, leave the node as is\n  if (signedUrl === null) {\n    return image;\n  }\n\n  const names = getQueryParamNames(signedUrl);\n  const { isUrlSigned: _isUrlSigned, ...result }: File = {\n    ...image,\n    url: removeQueryParams(image.url ?? '', names),\n  };\n\n  if (image.formats) {\n    result.formats = Object.fromEntries(\n      getImageFormats(image).map(([key, format]) => {\n        if (!format || typeof format !== 'object') {\n          return [key, format];\n        }\n\n        const { isUrlSigned: _formatIsUrlSigned, ...unsignedFormat } = {\n          ...format,\n          ...(format.url ? { url: removeQueryParams(format.url, names) } : {}),\n        };\n\n        return [key, unsignedFormat];\n      })\n    );\n  }\n\n  return result;\n};\n\n/**\n * Visitor function to sign media URLs\n */\nconst createSignEntityMediaVisitor =\n  (cache: SignCache): SignEntityMediaVisitor =>\n  async ({ key, value, attribute }, { set }) => {\n    const { signFileUrls } = getService('file');\n\n    if (!attribute) {\n      return;\n    }\n\n    switch (attribute.type) {\n      case 'blocks':\n        set(key, await mapBlocksImages(value, signFileUrls));\n        return;\n\n      case 'richtext':\n        set(key, await mapRichtextUrls(value, (url) => signUrl(url, cache)));\n        return;\n\n      case 'media': {\n        if (isFile(value, attribute)) {\n          // If the attribute is repeatable sign each file\n          if (attribute.multiple) {\n            const signedFiles = await async.map(value, signFileUrls);\n            set(key, signedFiles);\n            return;\n          }\n\n          // If the attribute is not repeatable only sign a single file\n          const signedFile = await signFileUrls(value);\n          set(key, signedFile);\n        }\n        break;\n      }\n\n      default:\n        break;\n    }\n  };\n\n/**\n * Visitor function to remove the signature from richtext / blocks URLs before\n * they are persisted. Media attributes are left alone: the files table already\n * holds the unsigned URL.\n */\nconst createUnsignEntityMediaVisitor =\n  (cache: SignCache): SignEntityMediaVisitor =>\n  async ({ key, value, attribute }, { set }) => {\n    if (!attribute) {\n      return;\n    }\n\n    if (attribute.type === 'blocks') {\n      set(key, await mapBlocksImages(value, (image) => unsignImage(image, cache)));\n      return;\n    }\n\n    if (attribute.type === 'richtext') {\n      set(key, await mapRichtextUrls(value, (url) => stripSignedUrl(url, cache)));\n    }\n  };\n\n/**\n *\n * Iterate through an entity manager result\n * Check which modelAttributes are media and pre sign the image URLs\n * if they are from the current upload provider\n *\n * @param {Object} entity\n * @param {Object} modelAttributes\n * @param {Map} cache one per document service call, see `SignCache`\n * @returns\n */\nconst signEntityMedia = async (\n  entity: any,\n  uid: UID.Schema,\n  cache: SignCache = createSignCache()\n) => {\n  if (!entity) {\n    return entity;\n  }\n\n  // If the entity itself is a file, sign it directly\n  if (uid === FILE_MODEL_UID) {\n    const { signFileUrls } = getService('file');\n    return signFileUrls(entity);\n  }\n\n  // If the entity is a regular content type, look for media attributes\n  const model = strapi.getModel(uid);\n  return traverseEntity(\n    // @ts-expect-error - FIXME: fix traverseEntity using wrong types\n    createSignEntityMediaVisitor(cache),\n    { schema: model, getModel: strapi.getModel.bind(strapi) },\n    entity\n  );\n};\n\n/**\n * Iterate through the input data of a create / update / clone and replace\n * every signed provider URL found in a richtext or blocks attribute with its\n * unsigned form, so that a short lived signature is never persisted.\n */\nconst unsignEntityMedia = async (\n  data: any,\n  uid: UID.Schema,\n  cache: SignCache = createSignCache()\n) => {\n  if (!data || uid === FILE_MODEL_UID) {\n    return data;\n  }\n\n  const model = strapi.getModel(uid);\n\n  return traverseEntity(\n    // @ts-expect-error - FIXME: fix traverseEntity using wrong types\n    createUnsignEntityMediaVisitor(cache),\n    { schema: model, getModel: strapi.getModel.bind(strapi) },\n    data\n  );\n};\n\nexport type { SignCache };\n\nexport {\n  createSignCache,\n  signEntityMedia,\n  unsignEntityMedia,\n  mapRichtextUrls,\n  mapBlocksImages,\n  stripSignedUrl,\n  unsignImage,\n};\n"],"names":["createSignCache","Map","RICHTEXT_URL_REGEXES","RICHTEXT_URL_HINTS","isFile","value","attribute","type","stripQueryString","url","split","decodeQueryParamName","pair","name","decodeURIComponent","splitUrl","hashIndex","indexOf","fragment","slice","withoutFragment","queryIndex","base","pairs","filter","Boolean","getQueryParamNames","map","removeQueryParams","names","length","kept","includes","join","getFileFromUrl","unsignedUrl","provider","strapi","config","get","ext","path","parse","pop","hash","signFileIfOwned","file","cache","bareUrl","cached","pending","signFileUrls","getService","signedFile","set","signIfOwned","stripSignedUrl","signedUrl","signUrl","mapRichtextUrls","mapUrl","some","hint","matches","flatMap","regex","Array","from","matchAll","sort","a","b","index","urls","async","match","result","cursor","forEach","urlStart","mapBlocksImages","mapImage","isArray","node","image","children","getImageFormats","Object","entries","formats","hasSignatureTraces","isUrlSigned","undefined","format","unsignImage","_isUrlSigned","fromEntries","key","_formatIsUrlSigned","unsignedFormat","createSignEntityMediaVisitor","multiple","signedFiles","createUnsignEntityMediaVisitor","signEntityMedia","entity","uid","FILE_MODEL_UID","model","getModel","traverseEntity","schema","bind","unsignEntityMedia","data"],"mappings":"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"}
+{"version":3,"file":"utils.js","sources":["../../../../server/src/services/extensions/utils.ts"],"sourcesContent":["import path from 'path';\n\nimport { async, traverseEntity } from '@strapi/utils';\n\nimport type { Schema, UID } from '@strapi/types';\n\nimport { getService } from '../../utils';\nimport { FILE_MODEL_UID } from '../../constants';\n\nimport type { Config, File } from '../../types';\n\ntype SignEntityMediaVisitor = (\n  args: {\n    key: string;\n    value: unknown;\n    attribute: Schema.Attribute.AnyAttribute;\n  },\n  utils: {\n    set: (key: string, value: unknown) => void;\n  }\n) => Promise<void>;\n\n/**\n * One presign per distinct URL, keyed by the bare (unsigned) URL. The promise\n * is stored rather than its result so concurrent occurrences of the same URL\n * (the `async.map` in `mapRichtextUrls`, or several entries of a `findMany`)\n * share a single provider call.\n *\n * A cache must never outlive the document service call or migration run that\n * created it: a signed URL is only as fresh as the request that produced it.\n */\ntype SignCache = Map<string, Promise<string | null>>;\n\nconst createSignCache = (): SignCache => new Map();\n\n/**\n * URL bearing syntaxes found in a richtext (markdown) value. Each pattern\n * captures a prefix (group 1) and the URL (group 2) so the rebuild loop in\n * `mapRichtextUrls` can splice a new URL in place without touching anything\n * else.\n *\n * - markdown image / link: `![alt](url)` or `[text](url)`. The URL is captured\n *   up to the first whitespace or closing parenthesis, which also covers the\n *   optional title form `[text](url \"title\")`.\n * - raw HTML `src` / `href` attributes, double or single quoted, on the\n *   elements the editor lets users write by hand (`<img src=\"...\" width=\"200\">`\n *   is the usual way to size an image).\n */\nconst RICHTEXT_URL_REGEXES = [\n  /(!?\\[[^\\]]*\\]\\()([^)\\s]+)/g,\n  /(<(?:img|a|source|video|audio)\\b[^>]*?\\b(?:src|href)=\")([^\"]+)/gi,\n  /(<(?:img|a|source|video|audio)\\b[^>]*?\\b(?:src|href)=')([^']+)/gi,\n];\n\n/** Cheap short circuit for richtext values that cannot contain a URL we would rewrite. */\nconst RICHTEXT_URL_HINTS = ['](', 'src=', 'href='];\n\ntype BlocksNode = {\n  type?: string;\n  image?: File;\n  children?: unknown;\n  [key: string]: unknown;\n};\n\ntype ImageFormat = { url?: string; isUrlSigned?: boolean; [key: string]: unknown };\n\nfunction isFile(value: unknown, attribute: Schema.Attribute.AnyAttribute): value is File {\n  if (!value || attribute.type !== 'media') {\n    return false;\n  }\n\n  return true;\n}\n\nconst stripQueryString = (url: string) => url.split('?')[0];\n\nconst decodeQueryParamName = (pair: string) => {\n  const name = pair.split('=')[0];\n\n  try {\n    return decodeURIComponent(name);\n  } catch {\n    return name;\n  }\n};\n\n/**\n * Split a URL into what precedes the `?`, the raw `key=value` pairs of its\n * query string and the `#fragment`, if any. Plain string work on purpose:\n * `new URL` throws on the relative `/uploads/...` paths a local provider\n * writes, and would re-encode the pairs we want to hand back untouched.\n */\nconst splitUrl = (url: string) => {\n  const hashIndex = url.indexOf('#');\n  const fragment = hashIndex === -1 ? '' : url.slice(hashIndex);\n  const withoutFragment = hashIndex === -1 ? url : url.slice(0, hashIndex);\n\n  const queryIndex = withoutFragment.indexOf('?');\n\n  if (queryIndex === -1) {\n    return { base: withoutFragment, pairs: [] as string[], fragment };\n  }\n\n  return {\n    base: withoutFragment.slice(0, queryIndex),\n    pairs: withoutFragment\n      .slice(queryIndex + 1)\n      .split('&')\n      .filter(Boolean),\n    fragment,\n  };\n};\n\n/** Names of the query parameters of `url`, decoded, in order. */\nconst getQueryParamNames = (url: string): string[] => splitUrl(url).pairs.map(decodeQueryParamName);\n\n/**\n * `url` with every query parameter whose name is in `names` removed. The\n * surviving pairs keep their order and encoding; the `?` is dropped when\n * nothing is left.\n */\nconst removeQueryParams = (url: string, names: string[]): string => {\n  const { base, pairs, fragment } = splitUrl(url);\n\n  if (pairs.length === 0 || names.length === 0) {\n    return url;\n  }\n\n  const kept = pairs.filter((pair) => !names.includes(decodeQueryParamName(pair)));\n\n  return kept.length === 0 ? `${base}${fragment}` : `${base}?${kept.join('&')}${fragment}`;\n};\n\n/**\n * Build the minimal file shape `signFileUrls` needs out of a bare URL, as found\n * in a richtext value.\n *\n * `hash` and `ext` are taken from the last path segment and `path` is left\n * unset, which rebuilds the S3 key for the default layout and for the\n * `rootPath` provider option (the provider prefixes it itself). A URL whose key\n * has extra segments (a file uploaded with the per-file `path` option, or an\n * older key layout) is still recognised as ours by the provider, but it is\n * signed with a key that does not exist and the link returns 403. Media\n * signing has the same limit because `path` is not persisted on the file\n * (`content-types/file.ts`). Not addressed here.\n */\nconst getFileFromUrl = (url: string): File => {\n  const unsignedUrl = stripQueryString(url);\n  const { provider } = strapi.config.get<Config>('plugin::upload');\n  const { name, ext } = path.parse(unsignedUrl.split('/').pop() ?? '');\n\n  return { url: unsignedUrl, hash: name, ext, provider } as File;\n};\n\n/**\n * Ask the provider to sign `file` and return the signed URL if the provider\n * owns it, otherwise `null`. Memoised in `cache` by the bare URL.\n *\n * Ownership is decided by whether the provider changed the URL: `signFileUrls`\n * flags every file of the configured provider as signed, but the provider\n * itself returns URLs it does not own untouched (an S3 URL from another\n * bucket, an external site, a local `/uploads` path), so a changed URL is the\n * only reliable signal. `file.url` must already be the bare URL so the\n * comparison is meaningful.\n */\nconst signFileIfOwned = (file: File, cache: SignCache): Promise<string | null> => {\n  const bareUrl = file.url ?? '';\n  const cached = cache.get(bareUrl);\n\n  if (cached) {\n    return cached;\n  }\n\n  const pending = (async () => {\n    const { signFileUrls } = getService('file');\n    const signedFile = await signFileUrls(file);\n\n    return signedFile.url && signedFile.url !== bareUrl ? signedFile.url : null;\n  })();\n\n  cache.set(bareUrl, pending);\n\n  return pending;\n};\n\n/**\n * Signs a richtext URL if the configured provider owns it, otherwise `null`.\n * See `signFileIfOwned` for how ownership is decided. A single predicate means\n * the read path (sign) and the write path (unsign) can never disagree about\n * what they own.\n */\nconst signIfOwned = (url: string, cache: SignCache): Promise<string | null> =>\n  signFileIfOwned(getFileFromUrl(url), cache);\n\n/**\n * Returns a richtext URL with its signature removed, if we own it.\n *\n * Only the query parameters the provider's own fresh signature introduces are\n * removed (for S3, the `X-Amz-*` family), every other parameter is kept. That\n * way a provider that signs whatever it is handed cannot make us drop `?v=x`\n * from a link to an external site. A parameter of an old signature that the\n * fresh one no longer carries (an `X-Amz-Security-Token` from credentials no\n * longer in use, say) survives in the row; it is not a signature, and the read\n * path replaces the whole URL with the provider output anyway.\n */\nconst stripSignedUrl = async (url: string, cache: SignCache) => {\n  // Nothing to strip, and no reason to ask the provider\n  if (!url.includes('?')) {\n    return url;\n  }\n\n  const signedUrl = await signIfOwned(url, cache);\n\n  if (signedUrl === null) {\n    return url;\n  }\n\n  return removeQueryParams(url, getQueryParamNames(signedUrl));\n};\n\n/** Returns a freshly signed richtext URL, if we own it. */\nconst signUrl = async (url: string, cache: SignCache) => (await signIfOwned(url, cache)) ?? url;\n\n/**\n * Apply `mapUrl` to every markdown image / link URL and every raw HTML\n * `src` / `href` URL of a richtext value.\n */\nconst mapRichtextUrls = async (value: unknown, mapUrl: (url: string) => Promise<string>) => {\n  if (typeof value !== 'string' || !RICHTEXT_URL_HINTS.some((hint) => value.includes(hint))) {\n    return value;\n  }\n\n  // The rebuild loop splices by match index, so matches must be in ascending order\n  const matches = RICHTEXT_URL_REGEXES.flatMap((regex) => Array.from(value.matchAll(regex))).sort(\n    (a, b) => (a.index as number) - (b.index as number)\n  );\n\n  if (matches.length === 0) {\n    return value;\n  }\n\n  const urls: string[] = await async.map(matches, (match: RegExpMatchArray) => mapUrl(match[2]));\n\n  let result = '';\n  let cursor = 0;\n\n  matches.forEach((match, index) => {\n    const urlStart = (match.index as number) + match[1].length;\n\n    // Two patterns matched overlapping text: keep the first, never splice twice\n    if (urlStart < cursor) {\n      return;\n    }\n\n    result += value.slice(cursor, urlStart) + urls[index];\n    cursor = urlStart + match[2].length;\n  });\n\n  return result + value.slice(cursor);\n};\n\n/**\n * Apply `mapImage` to every `image` node of a blocks value, recursively.\n * A new array is always returned, the original value is never mutated.\n */\nconst mapBlocksImages = async (\n  value: unknown,\n  mapImage: (image: File) => Promise<File>\n): Promise<unknown> => {\n  if (!Array.isArray(value)) {\n    return value;\n  }\n\n  return async.map(value, async (node: BlocksNode) => {\n    if (!node || typeof node !== 'object') {\n      return node;\n    }\n\n    let result = node;\n\n    if (node.type === 'image' && node.image) {\n      result = { ...result, image: await mapImage(node.image) };\n    }\n\n    if (Array.isArray(node.children)) {\n      result = { ...result, children: await mapBlocksImages(node.children, mapImage) };\n    }\n\n    return result;\n  });\n};\n\nconst getImageFormats = (image: File): [string, ImageFormat][] =>\n  Object.entries(image.formats ?? {}) as [string, ImageFormat][];\n\n/** True when the node still carries anything `unsignImage` would remove. */\nconst hasSignatureTraces = (image: File) => {\n  if (image.isUrlSigned !== undefined || (image.url ?? '').includes('?')) {\n    return true;\n  }\n\n  return getImageFormats(image).some(\n    ([, format]) => format?.isUrlSigned !== undefined || (format?.url ?? '').includes('?')\n  );\n};\n\n/**\n * Remove the signature from a blocks `image` node: the signature parameters on\n * the file URL and on every format URL (the same presigner signs them all, so\n * the same parameter names apply), and the `isUrlSigned` flag `signFileUrls`\n * sets on the file and on each format. The node carries a full file object, so\n * the ownership check is made with it rather than with a URL derived stand in.\n */\nconst unsignImage = async (image: File, cache: SignCache = createSignCache()) => {\n  // Already bare: nothing to do, and no reason to ask the provider\n  if (!hasSignatureTraces(image)) {\n    return image;\n  }\n\n  const bareUrl = stripQueryString(image.url ?? '');\n  const signedUrl = await signFileIfOwned({ ...image, url: bareUrl }, cache);\n\n  // Not one of ours (different provider, external URL, public provider): the\n  // provider hands the URL back unchanged, leave the node as is\n  if (signedUrl === null) {\n    return image;\n  }\n\n  const names = getQueryParamNames(signedUrl);\n  const { isUrlSigned: _isUrlSigned, ...result }: File = {\n    ...image,\n    url: removeQueryParams(image.url ?? '', names),\n  };\n\n  if (image.formats) {\n    result.formats = Object.fromEntries(\n      getImageFormats(image).map(([key, format]) => {\n        if (!format || typeof format !== 'object') {\n          return [key, format];\n        }\n\n        const { isUrlSigned: _formatIsUrlSigned, ...unsignedFormat } = {\n          ...format,\n          ...(format.url ? { url: removeQueryParams(format.url, names) } : {}),\n        };\n\n        return [key, unsignedFormat];\n      })\n    );\n  }\n\n  return result;\n};\n\n/**\n * Visitor function to sign media URLs\n */\nconst createSignEntityMediaVisitor =\n  (cache: SignCache): SignEntityMediaVisitor =>\n  async ({ key, value, attribute }, { set }) => {\n    const { signFileUrls } = getService('file');\n\n    if (!attribute) {\n      return;\n    }\n\n    switch (attribute.type) {\n      case 'blocks':\n        set(key, await mapBlocksImages(value, signFileUrls));\n        return;\n\n      case 'richtext':\n        set(key, await mapRichtextUrls(value, (url) => signUrl(url, cache)));\n        return;\n\n      case 'media': {\n        if (isFile(value, attribute)) {\n          // If the attribute is repeatable sign each file\n          if (attribute.multiple) {\n            const signedFiles = await async.map(value, signFileUrls);\n            set(key, signedFiles);\n            return;\n          }\n\n          // If the attribute is not repeatable only sign a single file\n          const signedFile = await signFileUrls(value);\n          set(key, signedFile);\n        }\n        break;\n      }\n\n      default:\n        break;\n    }\n  };\n\n/**\n * Visitor function to remove the signature from richtext / blocks URLs before\n * they are persisted. Media attributes are left alone: the files table already\n * holds the unsigned URL.\n */\nconst createUnsignEntityMediaVisitor =\n  (cache: SignCache): SignEntityMediaVisitor =>\n  async ({ key, value, attribute }, { set }) => {\n    if (!attribute) {\n      return;\n    }\n\n    if (attribute.type === 'blocks') {\n      set(key, await mapBlocksImages(value, (image) => unsignImage(image, cache)));\n      return;\n    }\n\n    if (attribute.type === 'richtext') {\n      set(key, await mapRichtextUrls(value, (url) => stripSignedUrl(url, cache)));\n    }\n  };\n\n/**\n *\n * Iterate through an entity manager result\n * Check which modelAttributes are media and pre sign the image URLs\n * if they are from the current upload provider\n *\n * @param {Object} entity\n * @param {UID.Schema} uid - UID of the model the entity belongs to\n * @param {Map} cache one per document service call, see `SignCache`\n * @returns\n */\nconst signEntityMedia = async (\n  entity: any,\n  uid: UID.Schema,\n  cache: SignCache = createSignCache()\n) => {\n  if (!entity) {\n    return entity;\n  }\n\n  // If the entity itself is a file, sign it directly\n  if (uid === FILE_MODEL_UID) {\n    const { signFileUrls } = getService('file');\n    return signFileUrls(entity);\n  }\n\n  // If the entity is a regular content type, look for media attributes\n  const model = strapi.getModel(uid);\n  return traverseEntity(\n    // @ts-expect-error - FIXME: fix traverseEntity using wrong types\n    createSignEntityMediaVisitor(cache),\n    { schema: model, getModel: strapi.getModel.bind(strapi) },\n    entity\n  );\n};\n\n/**\n * Iterate through the input data of a create / update / clone and replace\n * every signed provider URL found in a richtext or blocks attribute with its\n * unsigned form, so that a short lived signature is never persisted.\n */\nconst unsignEntityMedia = async (\n  data: any,\n  uid: UID.Schema,\n  cache: SignCache = createSignCache()\n) => {\n  if (!data || uid === FILE_MODEL_UID) {\n    return data;\n  }\n\n  const model = strapi.getModel(uid);\n\n  return traverseEntity(\n    // @ts-expect-error - FIXME: fix traverseEntity using wrong types\n    createUnsignEntityMediaVisitor(cache),\n    { schema: model, getModel: strapi.getModel.bind(strapi) },\n    data\n  );\n};\n\nexport type { SignCache };\n\nexport {\n  createSignCache,\n  signEntityMedia,\n  unsignEntityMedia,\n  mapRichtextUrls,\n  mapBlocksImages,\n  stripSignedUrl,\n  unsignImage,\n};\n"],"names":["createSignCache","Map","RICHTEXT_URL_REGEXES","RICHTEXT_URL_HINTS","isFile","value","attribute","type","stripQueryString","url","split","decodeQueryParamName","pair","name","decodeURIComponent","splitUrl","hashIndex","indexOf","fragment","slice","withoutFragment","queryIndex","base","pairs","filter","Boolean","getQueryParamNames","map","removeQueryParams","names","length","kept","includes","join","getFileFromUrl","unsignedUrl","provider","strapi","config","get","ext","path","parse","pop","hash","signFileIfOwned","file","cache","bareUrl","cached","pending","signFileUrls","getService","signedFile","set","signIfOwned","stripSignedUrl","signedUrl","signUrl","mapRichtextUrls","mapUrl","some","hint","matches","flatMap","regex","Array","from","matchAll","sort","a","b","index","urls","async","match","result","cursor","forEach","urlStart","mapBlocksImages","mapImage","isArray","node","image","children","getImageFormats","Object","entries","formats","hasSignatureTraces","isUrlSigned","undefined","format","unsignImage","_isUrlSigned","fromEntries","key","_formatIsUrlSigned","unsignedFormat","createSignEntityMediaVisitor","multiple","signedFiles","createUnsignEntityMediaVisitor","signEntityMedia","entity","uid","FILE_MODEL_UID","model","getModel","traverseEntity","schema","bind","unsignEntityMedia","data"],"mappings":"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"}

package/dist/server/services/extensions/utils.mjs

@@ -314,7 +314,7 @@ const getImageFormats = (image)=>Object.entries(image.formats ?? {});
  * if they are from the current upload provider
  *
  * @param {Object} entity
- * @param {Object} modelAttributes
+ * @param {UID.Schema} uid - UID of the model the entity belongs to
  * @param {Map} cache one per document service call, see `SignCache`
  * @returns
  */ const signEntityMedia = async (entity, uid, cache = createSignCache())=>{