@strapi/upload 5.39.0 → 5.41.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (18) hide show
  1. package/dist/admin/components/FilterList/FilterList.js +33 -37
  2. package/dist/admin/components/FilterList/FilterList.js.map +1 -1
  3. package/dist/admin/components/FilterList/FilterList.mjs +33 -37
  4. package/dist/admin/components/FilterList/FilterList.mjs.map +1 -1
  5. package/dist/admin/components/TableList/TableRows.js +1 -1
  6. package/dist/admin/components/TableList/TableRows.js.map +1 -1
  7. package/dist/admin/components/TableList/TableRows.mjs +1 -1
  8. package/dist/admin/components/TableList/TableRows.mjs.map +1 -1
  9. package/dist/admin/utils/getAllowedFiles.js +1 -1
  10. package/dist/admin/utils/getAllowedFiles.js.map +1 -1
  11. package/dist/admin/utils/getAllowedFiles.mjs +1 -1
  12. package/dist/admin/utils/getAllowedFiles.mjs.map +1 -1
  13. package/dist/server/services/file.js +3 -2
  14. package/dist/server/services/file.js.map +1 -1
  15. package/dist/server/services/file.mjs +3 -2
  16. package/dist/server/services/file.mjs.map +1 -1
  17. package/dist/server/src/services/file.d.ts.map +1 -1
  18. package/package.json +8 -8
package/dist/admin/components/FilterList/FilterList.js CHANGED
@@ -4,18 +4,26 @@ var jsxRuntime = require('react/jsx-runtime');
4
4
  var FilterTag = require('./FilterTag.js');
5
5
 
6
6
  // TODO: find a better naming convention for the file that was an index file before
7
+ /** Normalizes array or number-keyed object { 0: 'a', 1: 'b' } to string array */ const toMimeArray = (val)=>{
8
+ if (Array.isArray(val)) return val;
9
+ if (val && typeof val === 'object') {
10
+ const values = Object.values(val);
11
+ if (values.length > 0 && values.every((v)=>typeof v === 'string')) return values;
12
+ }
13
+ return undefined;
14
+ };
7
15
  const FilterList = ({ appliedFilters, filtersSchema, onRemoveFilter })=>{
8
16
  const handleClick = (filter)=>{
17
+ const [name] = Object.keys(filter);
18
+ const filterObj = filter[name];
19
+ const [filterType] = Object.keys(filterObj);
20
+ const filterValue = filterObj[filterType];
9
21
  const nextFilters = appliedFilters.filter((prevFilter)=>{
10
- const name = Object.keys(filter)[0];
11
- const filterName = filter[name];
12
- if (filterName !== undefined) {
13
- const filterType = Object.keys(filterName)[0];
14
- const filterValue = filterName[filterType];
15
- if (typeof filterValue === 'string') {
16
- const decodedValue = decodeURIComponent(filterValue);
17
- return prevFilter[name]?.[filterType] !== decodedValue;
18
- }
22
+ if (typeof filterValue === 'string') {
23
+ return prevFilter[name]?.[filterType] !== decodeURIComponent(filterValue);
24
+ }
25
+ if (typeof filterValue === 'object' && filterValue !== null) {
26
+ return JSON.stringify(prevFilter[name]?.[filterType]) !== JSON.stringify(filterValue);
19
27
  }
20
28
  return true;
21
29
  });
@@ -24,40 +32,28 @@ const FilterList = ({ appliedFilters, filtersSchema, onRemoveFilter })=>{
24
32
  return appliedFilters.map((filter, i)=>{
25
33
  const attributeName = Object.keys(filter)[0];
26
34
  const attribute = filtersSchema.find(({ name })=>name === attributeName);
27
- if (!attribute) {
28
- // Handle the case where attribute is undefined
29
- return null;
30
- }
35
+ if (!attribute) return null;
31
36
  const filterObj = filter[attributeName];
32
37
  const operator = Object.keys(filterObj)[0];
33
- let value = filterObj[operator];
34
- if (Array.isArray(value)) {
35
- value = value.join(', ');
36
- } else if (typeof value === 'object') {
37
- value = Object.values(value).join(', ');
38
+ const rawValue = filterObj[operator];
39
+ let value;
40
+ if (Array.isArray(rawValue)) {
41
+ value = rawValue.join(', ');
42
+ } else if (typeof rawValue === 'object' && rawValue !== null) {
43
+ const inner = rawValue.$contains;
44
+ const arr = toMimeArray(inner ?? rawValue);
45
+ value = arr ? arr.join(', ') : Object.values(rawValue).join(', ');
38
46
  } else {
39
- value = Array.isArray(value) || typeof value === 'object' ? Object.values(value).join(', ') : decodeURIComponent(value);
47
+ value = decodeURIComponent(rawValue);
40
48
  }
41
49
  let displayedOperator = operator;
42
- if (attribute?.name === 'mime') {
43
- displayedOperator = operator === '$contains' ? '$eq' : '$ne';
44
- // Type is file
45
- // The filter for the file is the following: { mime: {$not: {$contains: ['image', 'video']}}}
46
- if (operator === '$not') {
47
- value = 'file';
48
- displayedOperator = '$eq';
49
- }
50
- // Here the type is file and the filter is not file
51
- // { mime: {$contains: ['image', 'video'] }}
52
- if ([
53
- 'image',
54
- 'video'
55
- ].includes(value[0]) && [
56
- 'image',
57
- 'video'
58
- ].includes(value[1])) {
50
+ if (attribute.name === 'mime') {
51
+ const mimeArray = Array.isArray(rawValue) ? rawValue : toMimeArray(rawValue?.$contains ?? rawValue);
52
+ if (mimeArray?.includes('image') && mimeArray.includes('video')) {
59
53
  value = 'file';
60
- displayedOperator = '$ne';
54
+ displayedOperator = operator === '$not' ? '$eq' : '$ne';
55
+ } else {
56
+ displayedOperator = operator === '$contains' ? '$eq' : '$ne';
61
57
  }
62
58
  }
63
59
  return /*#__PURE__*/ jsxRuntime.jsx(FilterTag.FilterTag, {
package/dist/admin/components/FilterList/FilterList.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"FilterList.js","sources":["../../../../admin/src/components/FilterList/FilterList.tsx"],"sourcesContent":["// TODO: find a better naming convention for the file that was an index file before\n/**\n *\n * FilterList\n *\n */\nimport { FilterTag } from './FilterTag';\n\ntype NumberKeyedObject = Record<number, string>;\n\ntype StringFilter = {\n [key: string]: string;\n};\n\ntype MimeFilter = {\n [key: string]:\n | string\n | NumberKeyedObject\n | Record<string, string | NumberKeyedObject>\n | undefined;\n};\n\nexport type FilterStructure = {\n [key: string]: MimeFilter | StringFilter | undefined;\n};\n\nexport interface FilterListProps {\n appliedFilters: FilterStructure[];\n filtersSchema: {\n name: string;\n metadatas?: {\n label?: string;\n };\n fieldSchema?: {\n type?: string;\n mainField?: {\n name: string;\n type: string;\n };\n options?: {\n label: string;\n value: string;\n }[];\n };\n }[];\n onRemoveFilter: (filters: FilterStructure[]) => void;\n}\n\nexport const FilterList = ({ appliedFilters, filtersSchema, onRemoveFilter }: FilterListProps) => {\n const handleClick = (filter: FilterStructure) => {\n const nextFilters = appliedFilters.filter((prevFilter) => {\n const name = Object.keys(filter)[0];\n const filterName = filter[name];\n if (filterName !== undefined) {\n const filterType = Object.keys(filterName)[0];\n const filterValue = filterName[filterType];\n if (typeof filterValue === 'string') {\n const decodedValue = decodeURIComponent(filterValue);\n return prevFilter[name]?.[filterType] !== decodedValue;\n }\n }\n\n return true;\n });\n\n onRemoveFilter(nextFilters);\n };\n\n return appliedFilters.map((filter, i) => {\n const attributeName = Object.keys(filter)[0];\n const attribute = filtersSchema.find(({ name }) => name === attributeName);\n\n if (!attribute) {\n // Handle the case where attribute is undefined\n return null;\n }\n\n const filterObj = filter[attributeName];\n const operator = Object.keys(filterObj!)[0];\n let value = filterObj![operator];\n\n if (Array.isArray(value)) {\n value = value.join(', ');\n } else if (typeof value === 'object') {\n value = Object.values(value).join(', ');\n } else {\n value =\n Array.isArray(value) || typeof value === 'object'\n ? Object.values(value).join(', ')\n : decodeURIComponent(value!);\n }\n\n let displayedOperator = operator;\n\n if (attribute?.name === 'mime') {\n displayedOperator = operator === '$contains' ? '$eq' : '$ne';\n\n // Type is file\n // The filter for the file is the following: { mime: {$not: {$contains: ['image', 'video']}}}\n if (operator === '$not') {\n value = 'file';\n displayedOperator = '$eq';\n }\n\n // Here the type is file and the filter is not file\n // { mime: {$contains: ['image', 'video'] }}\n if (['image', 'video'].includes(value[0]) && ['image', 'video'].includes(value[1])) {\n value = 'file';\n displayedOperator = '$ne';\n }\n }\n\n return (\n <FilterTag\n // eslint-disable-next-line react/no-array-index-key\n key={`${attributeName}-${i}`}\n attribute={attribute}\n filter={filter}\n onClick={handleClick}\n operator={displayedOperator}\n value={value as string}\n />\n );\n });\n};\n"],"names":["FilterList","appliedFilters","filtersSchema","onRemoveFilter","handleClick","filter","nextFilters","prevFilter","name","Object","keys","filterName","undefined","filterType","filterValue","decodedValue","decodeURIComponent","map","i","attributeName","attribute","find","filterObj","operator","value","Array","isArray","join","values","displayedOperator","includes","_jsx","FilterTag","onClick"],"mappings":"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"}
1
+ {"version":3,"file":"FilterList.js","sources":["../../../../admin/src/components/FilterList/FilterList.tsx"],"sourcesContent":["// TODO: find a better naming convention for the file that was an index file before\n/**\n *\n * FilterList\n *\n */\nimport { FilterTag } from './FilterTag';\n\ntype NumberKeyedObject = Record<number, string>;\n\ntype StringFilter = {\n [key: string]: string;\n};\n\ntype MimeFilter = {\n [key: string]:\n | string\n | NumberKeyedObject\n | Record<string, string | NumberKeyedObject>\n | undefined;\n};\n\nexport type FilterStructure = {\n [key: string]: MimeFilter | StringFilter | undefined;\n};\n\n/** Normalizes array or number-keyed object { 0: 'a', 1: 'b' } to string array */\nconst toMimeArray = (val: unknown): string[] | undefined => {\n if (Array.isArray(val)) return val;\n if (val && typeof val === 'object') {\n const values = Object.values(val);\n if (values.length > 0 && values.every((v) => typeof v === 'string')) return values as string[];\n }\n return undefined;\n};\n\nexport interface FilterListProps {\n appliedFilters: FilterStructure[];\n filtersSchema: {\n name: string;\n metadatas?: {\n label?: string;\n };\n fieldSchema?: {\n type?: string;\n mainField?: {\n name: string;\n type: string;\n };\n options?: {\n label: string;\n value: string;\n }[];\n };\n }[];\n onRemoveFilter: (filters: FilterStructure[]) => void;\n}\n\nexport const FilterList = ({ appliedFilters, filtersSchema, onRemoveFilter }: FilterListProps) => {\n const handleClick = (filter: FilterStructure) => {\n const [name] = Object.keys(filter);\n const filterObj = filter[name];\n const [filterType] = Object.keys(filterObj!);\n const filterValue = filterObj![filterType];\n\n const nextFilters = appliedFilters.filter((prevFilter) => {\n if (typeof filterValue === 'string') {\n return prevFilter[name]?.[filterType] !== decodeURIComponent(filterValue);\n }\n if (typeof filterValue === 'object' && filterValue !== null) {\n return JSON.stringify(prevFilter[name]?.[filterType]) !== JSON.stringify(filterValue);\n }\n return true;\n });\n\n onRemoveFilter(nextFilters);\n };\n\n return appliedFilters.map((filter, i) => {\n const attributeName = Object.keys(filter)[0];\n const attribute = filtersSchema.find(({ name }) => name === attributeName);\n\n if (!attribute) return null;\n\n const filterObj = filter[attributeName];\n const operator = Object.keys(filterObj!)[0];\n const rawValue = filterObj![operator];\n\n let value: string;\n if (Array.isArray(rawValue)) {\n value = rawValue.join(', ');\n } else if (typeof rawValue === 'object' && rawValue !== null) {\n const inner = (rawValue as { $contains?: unknown }).$contains;\n const arr = toMimeArray(inner ?? rawValue);\n value = arr ? arr.join(', ') : Object.values(rawValue).join(', ');\n } else {\n value = decodeURIComponent(rawValue!);\n }\n\n let displayedOperator = operator;\n if (attribute.name === 'mime') {\n const mimeArray = Array.isArray(rawValue)\n ? rawValue\n : toMimeArray((rawValue as { $contains?: unknown })?.$contains ?? rawValue);\n\n if (mimeArray?.includes('image') && mimeArray.includes('video')) {\n value = 'file';\n displayedOperator = operator === '$not' ? '$eq' : '$ne';\n } else {\n displayedOperator = operator === '$contains' ? '$eq' : '$ne';\n }\n }\n\n return (\n <FilterTag\n // eslint-disable-next-line react/no-array-index-key\n key={`${attributeName}-${i}`}\n attribute={attribute}\n filter={filter}\n onClick={handleClick}\n operator={displayedOperator}\n value={value as string}\n />\n );\n });\n};\n"],"names":["toMimeArray","val","Array","isArray","values","Object","length","every","v","undefined","FilterList","appliedFilters","filtersSchema","onRemoveFilter","handleClick","filter","name","keys","filterObj","filterType","filterValue","nextFilters","prevFilter","decodeURIComponent","JSON","stringify","map","i","attributeName","attribute","find","operator","rawValue","value","join","inner","$contains","arr","displayedOperator","mimeArray","includes","_jsx","FilterTag","onClick"],"mappings":"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"}
package/dist/admin/components/FilterList/FilterList.mjs CHANGED
@@ -2,18 +2,26 @@ import { jsx } from 'react/jsx-runtime';
2
2
  import { FilterTag } from './FilterTag.mjs';
3
3
 
4
4
  // TODO: find a better naming convention for the file that was an index file before
5
+ /** Normalizes array or number-keyed object { 0: 'a', 1: 'b' } to string array */ const toMimeArray = (val)=>{
6
+ if (Array.isArray(val)) return val;
7
+ if (val && typeof val === 'object') {
8
+ const values = Object.values(val);
9
+ if (values.length > 0 && values.every((v)=>typeof v === 'string')) return values;
10
+ }
11
+ return undefined;
12
+ };
5
13
  const FilterList = ({ appliedFilters, filtersSchema, onRemoveFilter })=>{
6
14
  const handleClick = (filter)=>{
15
+ const [name] = Object.keys(filter);
16
+ const filterObj = filter[name];
17
+ const [filterType] = Object.keys(filterObj);
18
+ const filterValue = filterObj[filterType];
7
19
  const nextFilters = appliedFilters.filter((prevFilter)=>{
8
- const name = Object.keys(filter)[0];
9
- const filterName = filter[name];
10
- if (filterName !== undefined) {
11
- const filterType = Object.keys(filterName)[0];
12
- const filterValue = filterName[filterType];
13
- if (typeof filterValue === 'string') {
14
- const decodedValue = decodeURIComponent(filterValue);
15
- return prevFilter[name]?.[filterType] !== decodedValue;
16
- }
20
+ if (typeof filterValue === 'string') {
21
+ return prevFilter[name]?.[filterType] !== decodeURIComponent(filterValue);
22
+ }
23
+ if (typeof filterValue === 'object' && filterValue !== null) {
24
+ return JSON.stringify(prevFilter[name]?.[filterType]) !== JSON.stringify(filterValue);
17
25
  }
18
26
  return true;
19
27
  });
@@ -22,40 +30,28 @@ const FilterList = ({ appliedFilters, filtersSchema, onRemoveFilter })=>{
22
30
  return appliedFilters.map((filter, i)=>{
23
31
  const attributeName = Object.keys(filter)[0];
24
32
  const attribute = filtersSchema.find(({ name })=>name === attributeName);
25
- if (!attribute) {
26
- // Handle the case where attribute is undefined
27
- return null;
28
- }
33
+ if (!attribute) return null;
29
34
  const filterObj = filter[attributeName];
30
35
  const operator = Object.keys(filterObj)[0];
31
- let value = filterObj[operator];
32
- if (Array.isArray(value)) {
33
- value = value.join(', ');
34
- } else if (typeof value === 'object') {
35
- value = Object.values(value).join(', ');
36
+ const rawValue = filterObj[operator];
37
+ let value;
38
+ if (Array.isArray(rawValue)) {
39
+ value = rawValue.join(', ');
40
+ } else if (typeof rawValue === 'object' && rawValue !== null) {
41
+ const inner = rawValue.$contains;
42
+ const arr = toMimeArray(inner ?? rawValue);
43
+ value = arr ? arr.join(', ') : Object.values(rawValue).join(', ');
36
44
  } else {
37
- value = Array.isArray(value) || typeof value === 'object' ? Object.values(value).join(', ') : decodeURIComponent(value);
45
+ value = decodeURIComponent(rawValue);
38
46
  }
39
47
  let displayedOperator = operator;
40
- if (attribute?.name === 'mime') {
41
- displayedOperator = operator === '$contains' ? '$eq' : '$ne';
42
- // Type is file
43
- // The filter for the file is the following: { mime: {$not: {$contains: ['image', 'video']}}}
44
- if (operator === '$not') {
45
- value = 'file';
46
- displayedOperator = '$eq';
47
- }
48
- // Here the type is file and the filter is not file
49
- // { mime: {$contains: ['image', 'video'] }}
50
- if ([
51
- 'image',
52
- 'video'
53
- ].includes(value[0]) && [
54
- 'image',
55
- 'video'
56
- ].includes(value[1])) {
48
+ if (attribute.name === 'mime') {
49
+ const mimeArray = Array.isArray(rawValue) ? rawValue : toMimeArray(rawValue?.$contains ?? rawValue);
50
+ if (mimeArray?.includes('image') && mimeArray.includes('video')) {
57
51
  value = 'file';
58
- displayedOperator = '$ne';
52
+ displayedOperator = operator === '$not' ? '$eq' : '$ne';
53
+ } else {
54
+ displayedOperator = operator === '$contains' ? '$eq' : '$ne';
59
55
  }
60
56
  }
61
57
  return /*#__PURE__*/ jsx(FilterTag, {
package/dist/admin/components/FilterList/FilterList.mjs.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"FilterList.mjs","sources":["../../../../admin/src/components/FilterList/FilterList.tsx"],"sourcesContent":["// TODO: find a better naming convention for the file that was an index file before\n/**\n *\n * FilterList\n *\n */\nimport { FilterTag } from './FilterTag';\n\ntype NumberKeyedObject = Record<number, string>;\n\ntype StringFilter = {\n [key: string]: string;\n};\n\ntype MimeFilter = {\n [key: string]:\n | string\n | NumberKeyedObject\n | Record<string, string | NumberKeyedObject>\n | undefined;\n};\n\nexport type FilterStructure = {\n [key: string]: MimeFilter | StringFilter | undefined;\n};\n\nexport interface FilterListProps {\n appliedFilters: FilterStructure[];\n filtersSchema: {\n name: string;\n metadatas?: {\n label?: string;\n };\n fieldSchema?: {\n type?: string;\n mainField?: {\n name: string;\n type: string;\n };\n options?: {\n label: string;\n value: string;\n }[];\n };\n }[];\n onRemoveFilter: (filters: FilterStructure[]) => void;\n}\n\nexport const FilterList = ({ appliedFilters, filtersSchema, onRemoveFilter }: FilterListProps) => {\n const handleClick = (filter: FilterStructure) => {\n const nextFilters = appliedFilters.filter((prevFilter) => {\n const name = Object.keys(filter)[0];\n const filterName = filter[name];\n if (filterName !== undefined) {\n const filterType = Object.keys(filterName)[0];\n const filterValue = filterName[filterType];\n if (typeof filterValue === 'string') {\n const decodedValue = decodeURIComponent(filterValue);\n return prevFilter[name]?.[filterType] !== decodedValue;\n }\n }\n\n return true;\n });\n\n onRemoveFilter(nextFilters);\n };\n\n return appliedFilters.map((filter, i) => {\n const attributeName = Object.keys(filter)[0];\n const attribute = filtersSchema.find(({ name }) => name === attributeName);\n\n if (!attribute) {\n // Handle the case where attribute is undefined\n return null;\n }\n\n const filterObj = filter[attributeName];\n const operator = Object.keys(filterObj!)[0];\n let value = filterObj![operator];\n\n if (Array.isArray(value)) {\n value = value.join(', ');\n } else if (typeof value === 'object') {\n value = Object.values(value).join(', ');\n } else {\n value =\n Array.isArray(value) || typeof value === 'object'\n ? Object.values(value).join(', ')\n : decodeURIComponent(value!);\n }\n\n let displayedOperator = operator;\n\n if (attribute?.name === 'mime') {\n displayedOperator = operator === '$contains' ? '$eq' : '$ne';\n\n // Type is file\n // The filter for the file is the following: { mime: {$not: {$contains: ['image', 'video']}}}\n if (operator === '$not') {\n value = 'file';\n displayedOperator = '$eq';\n }\n\n // Here the type is file and the filter is not file\n // { mime: {$contains: ['image', 'video'] }}\n if (['image', 'video'].includes(value[0]) && ['image', 'video'].includes(value[1])) {\n value = 'file';\n displayedOperator = '$ne';\n }\n }\n\n return (\n <FilterTag\n // eslint-disable-next-line react/no-array-index-key\n key={`${attributeName}-${i}`}\n attribute={attribute}\n filter={filter}\n onClick={handleClick}\n operator={displayedOperator}\n value={value as string}\n />\n );\n });\n};\n"],"names":["FilterList","appliedFilters","filtersSchema","onRemoveFilter","handleClick","filter","nextFilters","prevFilter","name","Object","keys","filterName","undefined","filterType","filterValue","decodedValue","decodeURIComponent","map","i","attributeName","attribute","find","filterObj","operator","value","Array","isArray","join","values","displayedOperator","includes","_jsx","FilterTag","onClick"],"mappings":";;;AAAA;AAgDO,MAAMA,aAAa,CAAC,EAAEC,cAAc,EAAEC,aAAa,EAAEC,cAAc,EAAmB,GAAA;AAC3F,IAAA,MAAMC,cAAc,CAACC,MAAAA,GAAAA;AACnB,QAAA,MAAMC,WAAAA,GAAcL,cAAAA,CAAeI,MAAM,CAAC,CAACE,UAAAA,GAAAA;AACzC,YAAA,MAAMC,OAAOC,MAAAA,CAAOC,IAAI,CAACL,MAAAA,CAAO,CAAC,CAAA,CAAE;YACnC,MAAMM,UAAAA,GAAaN,MAAM,CAACG,IAAAA,CAAK;AAC/B,YAAA,IAAIG,eAAeC,SAAAA,EAAW;AAC5B,gBAAA,MAAMC,aAAaJ,MAAAA,CAAOC,IAAI,CAACC,UAAAA,CAAW,CAAC,CAAA,CAAE;gBAC7C,MAAMG,WAAAA,GAAcH,UAAU,CAACE,UAAAA,CAAW;gBAC1C,IAAI,OAAOC,gBAAgB,QAAA,EAAU;AACnC,oBAAA,MAAMC,eAAeC,kBAAAA,CAAmBF,WAAAA,CAAAA;AACxC,oBAAA,OAAOP,UAAU,CAACC,IAAAA,CAAK,GAAGK,WAAW,KAAKE,YAAAA;AAC5C,gBAAA;AACF,YAAA;YAEA,OAAO,IAAA;AACT,QAAA,CAAA,CAAA;QAEAZ,cAAAA,CAAeG,WAAAA,CAAAA;AACjB,IAAA,CAAA;AAEA,IAAA,OAAOL,cAAAA,CAAegB,GAAG,CAAC,CAACZ,MAAAA,EAAQa,CAAAA,GAAAA;AACjC,QAAA,MAAMC,gBAAgBV,MAAAA,CAAOC,IAAI,CAACL,MAAAA,CAAO,CAAC,CAAA,CAAE;QAC5C,MAAMe,SAAAA,GAAYlB,cAAcmB,IAAI,CAAC,CAAC,EAAEb,IAAI,EAAE,GAAKA,IAAAA,KAASW,aAAAA,CAAAA;AAE5D,QAAA,IAAI,CAACC,SAAAA,EAAW;;YAEd,OAAO,IAAA;AACT,QAAA;QAEA,MAAME,SAAAA,GAAYjB,MAAM,CAACc,aAAAA,CAAc;AACvC,QAAA,MAAMI,WAAWd,MAAAA,CAAOC,IAAI,CAACY,SAAAA,CAAW,CAAC,CAAA,CAAE;QAC3C,IAAIE,KAAAA,GAAQF,SAAU,CAACC,QAAAA,CAAS;QAEhC,IAAIE,KAAAA,CAAMC,OAAO,CAACF,KAAAA,CAAAA,EAAQ;YACxBA,KAAAA,GAAQA,KAAAA,CAAMG,IAAI,CAAC,IAAA,CAAA;QACrB,CAAA,MAAO,IAAI,OAAOH,KAAAA,KAAU,QAAA,EAAU;AACpCA,YAAAA,KAAAA,GAAQf,MAAAA,CAAOmB,MAAM,CAACJ,KAAAA,CAAAA,CAAOG,IAAI,CAAC,IAAA,CAAA;QACpC,CAAA,MAAO;AACLH,YAAAA,KAAAA,GACEC,KAAAA,CAAMC,OAAO,CAACF,KAAAA,CAAAA,IAAU,OAAOA,KAAAA,KAAU,QAAA,GACrCf,MAAAA,CAAOmB,MAAM,CAACJ,KAAAA,CAAAA,CAAOG,IAAI,CAAC,QAC1BX,kBAAAA,CAAmBQ,KAAAA,CAAAA;AAC3B,QAAA;AAEA,QAAA,IAAIK,iBAAAA,GAAoBN,QAAAA;QAExB,IAAIH,SAAAA,EAAWZ,SAAS,MAAA,EAAQ;YAC9BqB,iBAAAA,GAAoBN,QAAAA,KAAa,cAAc,KAAA,GAAQ,KAAA;;;AAIvD,YAAA,IAAIA,aAAa,MAAA,EAAQ;gBACvBC,KAAAA,GAAQ,MAAA;gBACRK,iBAAAA,GAAoB,KAAA;AACtB,YAAA;;;YAIA,IAAI;AAAC,gBAAA,OAAA;AAAS,gBAAA;AAAQ,aAAA,CAACC,QAAQ,CAACN,KAAK,CAAC,EAAE,CAAA,IAAK;AAAC,gBAAA,OAAA;AAAS,gBAAA;AAAQ,aAAA,CAACM,QAAQ,CAACN,KAAK,CAAC,EAAE,CAAA,EAAG;gBAClFA,KAAAA,GAAQ,MAAA;gBACRK,iBAAAA,GAAoB,KAAA;AACtB,YAAA;AACF,QAAA;AAEA,QAAA,qBACEE,GAAA,CAACC,SAAAA,EAAAA;YAGCZ,SAAAA,EAAWA,SAAAA;YACXf,MAAAA,EAAQA,MAAAA;YACR4B,OAAAA,EAAS7B,WAAAA;YACTmB,QAAAA,EAAUM,iBAAAA;YACVL,KAAAA,EAAOA;WALF,CAAA,EAAGL,aAAAA,CAAc,CAAC,EAAED,CAAAA,CAAAA,CAAG,CAAA;AAQlC,IAAA,CAAA,CAAA;AACF;;;;"}
1
+ {"version":3,"file":"FilterList.mjs","sources":["../../../../admin/src/components/FilterList/FilterList.tsx"],"sourcesContent":["// TODO: find a better naming convention for the file that was an index file before\n/**\n *\n * FilterList\n *\n */\nimport { FilterTag } from './FilterTag';\n\ntype NumberKeyedObject = Record<number, string>;\n\ntype StringFilter = {\n [key: string]: string;\n};\n\ntype MimeFilter = {\n [key: string]:\n | string\n | NumberKeyedObject\n | Record<string, string | NumberKeyedObject>\n | undefined;\n};\n\nexport type FilterStructure = {\n [key: string]: MimeFilter | StringFilter | undefined;\n};\n\n/** Normalizes array or number-keyed object { 0: 'a', 1: 'b' } to string array */\nconst toMimeArray = (val: unknown): string[] | undefined => {\n if (Array.isArray(val)) return val;\n if (val && typeof val === 'object') {\n const values = Object.values(val);\n if (values.length > 0 && values.every((v) => typeof v === 'string')) return values as string[];\n }\n return undefined;\n};\n\nexport interface FilterListProps {\n appliedFilters: FilterStructure[];\n filtersSchema: {\n name: string;\n metadatas?: {\n label?: string;\n };\n fieldSchema?: {\n type?: string;\n mainField?: {\n name: string;\n type: string;\n };\n options?: {\n label: string;\n value: string;\n }[];\n };\n }[];\n onRemoveFilter: (filters: FilterStructure[]) => void;\n}\n\nexport const FilterList = ({ appliedFilters, filtersSchema, onRemoveFilter }: FilterListProps) => {\n const handleClick = (filter: FilterStructure) => {\n const [name] = Object.keys(filter);\n const filterObj = filter[name];\n const [filterType] = Object.keys(filterObj!);\n const filterValue = filterObj![filterType];\n\n const nextFilters = appliedFilters.filter((prevFilter) => {\n if (typeof filterValue === 'string') {\n return prevFilter[name]?.[filterType] !== decodeURIComponent(filterValue);\n }\n if (typeof filterValue === 'object' && filterValue !== null) {\n return JSON.stringify(prevFilter[name]?.[filterType]) !== JSON.stringify(filterValue);\n }\n return true;\n });\n\n onRemoveFilter(nextFilters);\n };\n\n return appliedFilters.map((filter, i) => {\n const attributeName = Object.keys(filter)[0];\n const attribute = filtersSchema.find(({ name }) => name === attributeName);\n\n if (!attribute) return null;\n\n const filterObj = filter[attributeName];\n const operator = Object.keys(filterObj!)[0];\n const rawValue = filterObj![operator];\n\n let value: string;\n if (Array.isArray(rawValue)) {\n value = rawValue.join(', ');\n } else if (typeof rawValue === 'object' && rawValue !== null) {\n const inner = (rawValue as { $contains?: unknown }).$contains;\n const arr = toMimeArray(inner ?? rawValue);\n value = arr ? arr.join(', ') : Object.values(rawValue).join(', ');\n } else {\n value = decodeURIComponent(rawValue!);\n }\n\n let displayedOperator = operator;\n if (attribute.name === 'mime') {\n const mimeArray = Array.isArray(rawValue)\n ? rawValue\n : toMimeArray((rawValue as { $contains?: unknown })?.$contains ?? rawValue);\n\n if (mimeArray?.includes('image') && mimeArray.includes('video')) {\n value = 'file';\n displayedOperator = operator === '$not' ? '$eq' : '$ne';\n } else {\n displayedOperator = operator === '$contains' ? '$eq' : '$ne';\n }\n }\n\n return (\n <FilterTag\n // eslint-disable-next-line react/no-array-index-key\n key={`${attributeName}-${i}`}\n attribute={attribute}\n filter={filter}\n onClick={handleClick}\n operator={displayedOperator}\n value={value as string}\n />\n );\n });\n};\n"],"names":["toMimeArray","val","Array","isArray","values","Object","length","every","v","undefined","FilterList","appliedFilters","filtersSchema","onRemoveFilter","handleClick","filter","name","keys","filterObj","filterType","filterValue","nextFilters","prevFilter","decodeURIComponent","JSON","stringify","map","i","attributeName","attribute","find","operator","rawValue","value","join","inner","$contains","arr","displayedOperator","mimeArray","includes","_jsx","FilterTag","onClick"],"mappings":"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"}
package/dist/admin/components/TableList/TableRows.js CHANGED
@@ -96,7 +96,7 @@ const TableRows = ({ onChangeFolder = null, onEditAsset, onEditFolder, onSelectO
96
96
  })
97
97
  })
98
98
  ]
99
- }, id);
99
+ }, `${contentType}-${id}`);
100
100
  })
101
101
  });
102
102
  };
package/dist/admin/components/TableList/TableRows.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"TableRows.js","sources":["../../../../admin/src/components/TableList/TableRows.tsx"],"sourcesContent":["import { Checkbox, Flex, IconButton, Tbody, Td, Tr } from '@strapi/design-system';\nimport { Eye, Pencil } from '@strapi/icons';\nimport { useIntl } from 'react-intl';\nimport { Link } from 'react-router-dom';\n\nimport { tableHeaders as cells } from '../../constants';\nimport { getTrad } from '../../utils';\n\nimport { CellContent } from './CellContent';\n\nimport type { File } from '../../../../shared/contracts/files';\nimport type { Folder } from '../../../../shared/contracts/folders';\n\ninterface FileRow extends File {\n folderURL?: string;\n isSelectable?: boolean;\n type?: string;\n}\n\ninterface FolderRow extends Folder {\n folderURL?: string;\n isSelectable?: boolean;\n type?: string;\n}\n\nexport interface TableRowsProps {\n onChangeFolder?: ((folderId: number, folderPath?: string) => void) | null;\n onEditAsset: (asset: FileRow) => void;\n onEditFolder: (folder: FolderRow) => void;\n onSelectOne: (element: FileRow | FolderRow) => void;\n rows: FileRow[] | FolderRow[];\n selected: FileRow[] | FolderRow[];\n}\n\nexport const TableRows = ({\n onChangeFolder = null,\n onEditAsset,\n onEditFolder,\n onSelectOne,\n rows = [],\n selected = [],\n}: TableRowsProps) => {\n const { formatMessage } = useIntl();\n\n const handleRowClickFn = (\n element: FileRow | FolderRow,\n id: number,\n path: FolderRow['path'],\n elementType?: string\n ) => {\n if (elementType === 'asset') {\n onEditAsset(element as FileRow);\n } else {\n if (onChangeFolder) {\n onChangeFolder(id, path);\n }\n }\n };\n\n return (\n <Tbody>\n {rows.map((element) => {\n const { path, id, isSelectable, name, folderURL, type: contentType } = element;\n\n const isSelected = !!selected.find(\n (currentRow) => currentRow.id === id && currentRow.type === contentType\n );\n\n return (\n <Tr\n key={id}\n onClick={() => handleRowClickFn(element, id, path || undefined, contentType)}\n >\n <Td onClick={(e) => e.stopPropagation()}>\n <Checkbox\n aria-label={formatMessage(\n {\n id: contentType === 'asset' ? 'list-assets-select' : 'list.folder.select',\n defaultMessage:\n contentType === 'asset' ? 'Select {name} asset' : 'Select {name} folder',\n },\n { name }\n )}\n disabled={!isSelectable}\n onCheckedChange={() => onSelectOne(element)}\n onPointerDown={(e) => {\n e.preventDefault();\n }}\n checked={isSelected}\n />\n </Td>\n {cells.map(({ name, type: cellType }) => {\n return (\n <Td key={name}>\n <CellContent\n content={element as FileRow}\n cellType={cellType}\n contentType={contentType}\n name={name}\n />\n </Td>\n );\n })}\n\n <Td onClick={(e) => e.stopPropagation()}>\n <Flex justifyContent=\"flex-end\">\n {contentType === 'folder' &&\n (folderURL ? (\n <IconButton\n tag={Link}\n label={formatMessage({\n id: getTrad('list.folders.link-label'),\n defaultMessage: 'Access folder',\n })}\n to={folderURL}\n variant=\"ghost\"\n >\n <Eye />\n </IconButton>\n ) : (\n <IconButton\n tag=\"button\"\n label={formatMessage({\n id: getTrad('list.folders.link-label'),\n defaultMessage: 'Access folder',\n })}\n onClick={() => onChangeFolder && onChangeFolder(id)}\n variant=\"ghost\"\n >\n <Eye />\n </IconButton>\n ))}\n <IconButton\n label={formatMessage({\n id: getTrad('control-card.edit'),\n defaultMessage: 'Edit',\n })}\n onClick={() =>\n contentType === 'asset'\n ? onEditAsset(element as FileRow)\n : onEditFolder(element as FolderRow)\n }\n variant=\"ghost\"\n >\n <Pencil />\n </IconButton>\n </Flex>\n </Td>\n </Tr>\n );\n })}\n </Tbody>\n );\n};\n"],"names":["TableRows","onChangeFolder","onEditAsset","onEditFolder","onSelectOne","rows","selected","formatMessage","useIntl","handleRowClickFn","element","id","path","elementType","_jsx","Tbody","map","isSelectable","name","folderURL","type","contentType","isSelected","find","currentRow","_jsxs","Tr","onClick","undefined","Td","e","stopPropagation","Checkbox","aria-label","defaultMessage","disabled","onCheckedChange","onPointerDown","preventDefault","checked","cells","cellType","CellContent","content","Flex","justifyContent","IconButton","tag","Link","label","getTrad","to","variant","Eye","Pencil"],"mappings":"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"}
1
+ {"version":3,"file":"TableRows.js","sources":["../../../../admin/src/components/TableList/TableRows.tsx"],"sourcesContent":["import { Checkbox, Flex, IconButton, Tbody, Td, Tr } from '@strapi/design-system';\nimport { Eye, Pencil } from '@strapi/icons';\nimport { useIntl } from 'react-intl';\nimport { Link } from 'react-router-dom';\n\nimport { tableHeaders as cells } from '../../constants';\nimport { getTrad } from '../../utils';\n\nimport { CellContent } from './CellContent';\n\nimport type { File } from '../../../../shared/contracts/files';\nimport type { Folder } from '../../../../shared/contracts/folders';\n\ninterface FileRow extends File {\n folderURL?: string;\n isSelectable?: boolean;\n type?: string;\n}\n\ninterface FolderRow extends Folder {\n folderURL?: string;\n isSelectable?: boolean;\n type?: string;\n}\n\nexport interface TableRowsProps {\n onChangeFolder?: ((folderId: number, folderPath?: string) => void) | null;\n onEditAsset: (asset: FileRow) => void;\n onEditFolder: (folder: FolderRow) => void;\n onSelectOne: (element: FileRow | FolderRow) => void;\n rows: FileRow[] | FolderRow[];\n selected: FileRow[] | FolderRow[];\n}\n\nexport const TableRows = ({\n onChangeFolder = null,\n onEditAsset,\n onEditFolder,\n onSelectOne,\n rows = [],\n selected = [],\n}: TableRowsProps) => {\n const { formatMessage } = useIntl();\n\n const handleRowClickFn = (\n element: FileRow | FolderRow,\n id: number,\n path: FolderRow['path'],\n elementType?: string\n ) => {\n if (elementType === 'asset') {\n onEditAsset(element as FileRow);\n } else {\n if (onChangeFolder) {\n onChangeFolder(id, path);\n }\n }\n };\n\n return (\n <Tbody>\n {rows.map((element) => {\n const { path, id, isSelectable, name, folderURL, type: contentType } = element;\n\n const isSelected = !!selected.find(\n (currentRow) => currentRow.id === id && currentRow.type === contentType\n );\n\n return (\n <Tr\n key={`${contentType}-${id}`}\n onClick={() => handleRowClickFn(element, id, path || undefined, contentType)}\n >\n <Td onClick={(e) => e.stopPropagation()}>\n <Checkbox\n aria-label={formatMessage(\n {\n id: contentType === 'asset' ? 'list-assets-select' : 'list.folder.select',\n defaultMessage:\n contentType === 'asset' ? 'Select {name} asset' : 'Select {name} folder',\n },\n { name }\n )}\n disabled={!isSelectable}\n onCheckedChange={() => onSelectOne(element)}\n onPointerDown={(e) => {\n e.preventDefault();\n }}\n checked={isSelected}\n />\n </Td>\n {cells.map(({ name, type: cellType }) => {\n return (\n <Td key={name}>\n <CellContent\n content={element as FileRow}\n cellType={cellType}\n contentType={contentType}\n name={name}\n />\n </Td>\n );\n })}\n\n <Td onClick={(e) => e.stopPropagation()}>\n <Flex justifyContent=\"flex-end\">\n {contentType === 'folder' &&\n (folderURL ? (\n <IconButton\n tag={Link}\n label={formatMessage({\n id: getTrad('list.folders.link-label'),\n defaultMessage: 'Access folder',\n })}\n to={folderURL}\n variant=\"ghost\"\n >\n <Eye />\n </IconButton>\n ) : (\n <IconButton\n tag=\"button\"\n label={formatMessage({\n id: getTrad('list.folders.link-label'),\n defaultMessage: 'Access folder',\n })}\n onClick={() => onChangeFolder && onChangeFolder(id)}\n variant=\"ghost\"\n >\n <Eye />\n </IconButton>\n ))}\n <IconButton\n label={formatMessage({\n id: getTrad('control-card.edit'),\n defaultMessage: 'Edit',\n })}\n onClick={() =>\n contentType === 'asset'\n ? onEditAsset(element as FileRow)\n : onEditFolder(element as FolderRow)\n }\n variant=\"ghost\"\n >\n <Pencil />\n </IconButton>\n </Flex>\n </Td>\n </Tr>\n );\n })}\n </Tbody>\n );\n};\n"],"names":["TableRows","onChangeFolder","onEditAsset","onEditFolder","onSelectOne","rows","selected","formatMessage","useIntl","handleRowClickFn","element","id","path","elementType","_jsx","Tbody","map","isSelectable","name","folderURL","type","contentType","isSelected","find","currentRow","_jsxs","Tr","onClick","undefined","Td","e","stopPropagation","Checkbox","aria-label","defaultMessage","disabled","onCheckedChange","onPointerDown","preventDefault","checked","cells","cellType","CellContent","content","Flex","justifyContent","IconButton","tag","Link","label","getTrad","to","variant","Eye","Pencil"],"mappings":";;;;;;;;;;;;;;;;MAkCaA,SAAAA,GAAY,CAAC,EACxBC,cAAAA,GAAiB,IAAI,EACrBC,WAAW,EACXC,YAAY,EACZC,WAAW,EACXC,IAAAA,GAAO,EAAE,EACTC,QAAAA,GAAW,EAAE,EACE,GAAA;IACf,MAAM,EAAEC,aAAa,EAAE,GAAGC,iBAAAA,EAAAA;AAE1B,IAAA,MAAMC,gBAAAA,GAAmB,CACvBC,OAAAA,EACAC,EAAAA,EACAC,IAAAA,EACAC,WAAAA,GAAAA;AAEA,QAAA,IAAIA,gBAAgB,OAAA,EAAS;YAC3BX,WAAAA,CAAYQ,OAAAA,CAAAA;QACd,CAAA,MAAO;AACL,YAAA,IAAIT,cAAAA,EAAgB;AAClBA,gBAAAA,cAAAA,CAAeU,EAAAA,EAAIC,IAAAA,CAAAA;AACrB,YAAA;AACF,QAAA;AACF,IAAA,CAAA;AAEA,IAAA,qBACEE,cAAA,CAACC,kBAAAA,EAAAA;kBACEV,IAAAA,CAAKW,GAAG,CAAC,CAACN,OAAAA,GAAAA;AACT,YAAA,MAAM,EAAEE,IAAI,EAAED,EAAE,EAAEM,YAAY,EAAEC,IAAI,EAAEC,SAAS,EAAEC,IAAAA,EAAMC,WAAW,EAAE,GAAGX,OAAAA;AAEvE,YAAA,MAAMY,UAAAA,GAAa,CAAC,CAAChB,QAAAA,CAASiB,IAAI,CAChC,CAACC,UAAAA,GAAeA,UAAAA,CAAWb,EAAE,KAAKA,EAAAA,IAAMa,UAAAA,CAAWJ,IAAI,KAAKC,WAAAA,CAAAA;AAG9D,YAAA,qBACEI,eAAA,CAACC,eAAAA,EAAAA;AAECC,gBAAAA,OAAAA,EAAS,IAAMlB,gBAAAA,CAAiBC,OAAAA,EAASC,EAAAA,EAAIC,QAAQgB,SAAAA,EAAWP,WAAAA,CAAAA;;kCAEhEP,cAAA,CAACe,eAAAA,EAAAA;wBAAGF,OAAAA,EAAS,CAACG,CAAAA,GAAMA,CAAAA,CAAEC,eAAe,EAAA;AACnC,wBAAA,QAAA,gBAAAjB,cAAA,CAACkB,qBAAAA,EAAAA;AACCC,4BAAAA,YAAAA,EAAY1B,aAAAA,CACV;gCACEI,EAAAA,EAAIU,WAAAA,KAAgB,UAAU,oBAAA,GAAuB,oBAAA;gCACrDa,cAAAA,EACEb,WAAAA,KAAgB,UAAU,qBAAA,GAAwB;6BACtD,EACA;AAAEH,gCAAAA;AAAK,6BAAA,CAAA;AAETiB,4BAAAA,QAAAA,EAAU,CAAClB,YAAAA;AACXmB,4BAAAA,eAAAA,EAAiB,IAAMhC,WAAAA,CAAYM,OAAAA,CAAAA;AACnC2B,4BAAAA,aAAAA,EAAe,CAACP,CAAAA,GAAAA;AACdA,gCAAAA,CAAAA,CAAEQ,cAAc,EAAA;AAClB,4BAAA,CAAA;4BACAC,OAAAA,EAASjB;;;oBAGZkB,sBAAAA,CAAMxB,GAAG,CAAC,CAAC,EAAEE,IAAI,EAAEE,IAAAA,EAAMqB,QAAQ,EAAE,GAAA;AAClC,wBAAA,qBACE3B,cAAA,CAACe,eAAAA,EAAAA;AACC,4BAAA,QAAA,gBAAAf,cAAA,CAAC4B,uBAAAA,EAAAA;gCACCC,OAAAA,EAASjC,OAAAA;gCACT+B,QAAAA,EAAUA,QAAAA;gCACVpB,WAAAA,EAAaA,WAAAA;gCACbH,IAAAA,EAAMA;;AALDA,yBAAAA,EAAAA,IAAAA,CAAAA;AASb,oBAAA,CAAA,CAAA;kCAEAJ,cAAA,CAACe,eAAAA,EAAAA;wBAAGF,OAAAA,EAAS,CAACG,CAAAA,GAAMA,CAAAA,CAAEC,eAAe,EAAA;AACnC,wBAAA,QAAA,gBAAAN,eAAA,CAACmB,iBAAAA,EAAAA;4BAAKC,cAAAA,EAAe,UAAA;;gCAClBxB,WAAAA,KAAgB,QAAA,KACdF,SAAAA,iBACCL,cAAA,CAACgC,uBAAAA,EAAAA;oCACCC,GAAAA,EAAKC,mBAAAA;AACLC,oCAAAA,KAAAA,EAAO1C,aAAAA,CAAc;AACnBI,wCAAAA,EAAAA,EAAIuC,eAAAA,CAAQ,yBAAA,CAAA;wCACZhB,cAAAA,EAAgB;AAClB,qCAAA,CAAA;oCACAiB,EAAAA,EAAIhC,SAAAA;oCACJiC,OAAAA,EAAQ,OAAA;AAER,oCAAA,QAAA,gBAAAtC,cAAA,CAACuC,SAAAA,EAAAA,EAAAA;mDAGHvC,cAAA,CAACgC,uBAAAA,EAAAA;oCACCC,GAAAA,EAAI,QAAA;AACJE,oCAAAA,KAAAA,EAAO1C,aAAAA,CAAc;AACnBI,wCAAAA,EAAAA,EAAIuC,eAAAA,CAAQ,yBAAA,CAAA;wCACZhB,cAAAA,EAAgB;AAClB,qCAAA,CAAA;oCACAP,OAAAA,EAAS,IAAM1B,kBAAkBA,cAAAA,CAAeU,EAAAA,CAAAA;oCAChDyC,OAAAA,EAAQ,OAAA;AAER,oCAAA,QAAA,gBAAAtC,cAAA,CAACuC,SAAAA,EAAAA,EAAAA;AAEL,iCAAA,CAAA,CAAA;8CACFvC,cAAA,CAACgC,uBAAAA,EAAAA;AACCG,oCAAAA,KAAAA,EAAO1C,aAAAA,CAAc;AACnBI,wCAAAA,EAAAA,EAAIuC,eAAAA,CAAQ,mBAAA,CAAA;wCACZhB,cAAAA,EAAgB;AAClB,qCAAA,CAAA;AACAP,oCAAAA,OAAAA,EAAS,IACPN,WAAAA,KAAgB,OAAA,GACZnB,WAAAA,CAAYQ,WACZP,YAAAA,CAAaO,OAAAA,CAAAA;oCAEnB0C,OAAAA,EAAQ,OAAA;AAER,oCAAA,QAAA,gBAAAtC,cAAA,CAACwC,YAAAA,EAAAA,EAAAA;;;;;;eA1EF,CAAA,EAAGjC,WAAAA,CAAY,CAAC,EAAEV,EAAAA,CAAAA,CAAI,CAAA;AAgFjC,QAAA,CAAA;;AAGN;;;;"}
package/dist/admin/components/TableList/TableRows.mjs CHANGED
@@ -94,7 +94,7 @@ const TableRows = ({ onChangeFolder = null, onEditAsset, onEditFolder, onSelectO
94
94
  })
95
95
  })
96
96
  ]
97
- }, id);
97
+ }, `${contentType}-${id}`);
98
98
  })
99
99
  });
100
100
  };
package/dist/admin/components/TableList/TableRows.mjs.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"TableRows.mjs","sources":["../../../../admin/src/components/TableList/TableRows.tsx"],"sourcesContent":["import { Checkbox, Flex, IconButton, Tbody, Td, Tr } from '@strapi/design-system';\nimport { Eye, Pencil } from '@strapi/icons';\nimport { useIntl } from 'react-intl';\nimport { Link } from 'react-router-dom';\n\nimport { tableHeaders as cells } from '../../constants';\nimport { getTrad } from '../../utils';\n\nimport { CellContent } from './CellContent';\n\nimport type { File } from '../../../../shared/contracts/files';\nimport type { Folder } from '../../../../shared/contracts/folders';\n\ninterface FileRow extends File {\n folderURL?: string;\n isSelectable?: boolean;\n type?: string;\n}\n\ninterface FolderRow extends Folder {\n folderURL?: string;\n isSelectable?: boolean;\n type?: string;\n}\n\nexport interface TableRowsProps {\n onChangeFolder?: ((folderId: number, folderPath?: string) => void) | null;\n onEditAsset: (asset: FileRow) => void;\n onEditFolder: (folder: FolderRow) => void;\n onSelectOne: (element: FileRow | FolderRow) => void;\n rows: FileRow[] | FolderRow[];\n selected: FileRow[] | FolderRow[];\n}\n\nexport const TableRows = ({\n onChangeFolder = null,\n onEditAsset,\n onEditFolder,\n onSelectOne,\n rows = [],\n selected = [],\n}: TableRowsProps) => {\n const { formatMessage } = useIntl();\n\n const handleRowClickFn = (\n element: FileRow | FolderRow,\n id: number,\n path: FolderRow['path'],\n elementType?: string\n ) => {\n if (elementType === 'asset') {\n onEditAsset(element as FileRow);\n } else {\n if (onChangeFolder) {\n onChangeFolder(id, path);\n }\n }\n };\n\n return (\n <Tbody>\n {rows.map((element) => {\n const { path, id, isSelectable, name, folderURL, type: contentType } = element;\n\n const isSelected = !!selected.find(\n (currentRow) => currentRow.id === id && currentRow.type === contentType\n );\n\n return (\n <Tr\n key={id}\n onClick={() => handleRowClickFn(element, id, path || undefined, contentType)}\n >\n <Td onClick={(e) => e.stopPropagation()}>\n <Checkbox\n aria-label={formatMessage(\n {\n id: contentType === 'asset' ? 'list-assets-select' : 'list.folder.select',\n defaultMessage:\n contentType === 'asset' ? 'Select {name} asset' : 'Select {name} folder',\n },\n { name }\n )}\n disabled={!isSelectable}\n onCheckedChange={() => onSelectOne(element)}\n onPointerDown={(e) => {\n e.preventDefault();\n }}\n checked={isSelected}\n />\n </Td>\n {cells.map(({ name, type: cellType }) => {\n return (\n <Td key={name}>\n <CellContent\n content={element as FileRow}\n cellType={cellType}\n contentType={contentType}\n name={name}\n />\n </Td>\n );\n })}\n\n <Td onClick={(e) => e.stopPropagation()}>\n <Flex justifyContent=\"flex-end\">\n {contentType === 'folder' &&\n (folderURL ? (\n <IconButton\n tag={Link}\n label={formatMessage({\n id: getTrad('list.folders.link-label'),\n defaultMessage: 'Access folder',\n })}\n to={folderURL}\n variant=\"ghost\"\n >\n <Eye />\n </IconButton>\n ) : (\n <IconButton\n tag=\"button\"\n label={formatMessage({\n id: getTrad('list.folders.link-label'),\n defaultMessage: 'Access folder',\n })}\n onClick={() => onChangeFolder && onChangeFolder(id)}\n variant=\"ghost\"\n >\n <Eye />\n </IconButton>\n ))}\n <IconButton\n label={formatMessage({\n id: getTrad('control-card.edit'),\n defaultMessage: 'Edit',\n })}\n onClick={() =>\n contentType === 'asset'\n ? onEditAsset(element as FileRow)\n : onEditFolder(element as FolderRow)\n }\n variant=\"ghost\"\n >\n <Pencil />\n </IconButton>\n </Flex>\n </Td>\n </Tr>\n );\n })}\n </Tbody>\n );\n};\n"],"names":["TableRows","onChangeFolder","onEditAsset","onEditFolder","onSelectOne","rows","selected","formatMessage","useIntl","handleRowClickFn","element","id","path","elementType","_jsx","Tbody","map","isSelectable","name","folderURL","type","contentType","isSelected","find","currentRow","_jsxs","Tr","onClick","undefined","Td","e","stopPropagation","Checkbox","aria-label","defaultMessage","disabled","onCheckedChange","onPointerDown","preventDefault","checked","cells","cellType","CellContent","content","Flex","justifyContent","IconButton","tag","Link","label","getTrad","to","variant","Eye","Pencil"],"mappings":"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"}
1
+ {"version":3,"file":"TableRows.mjs","sources":["../../../../admin/src/components/TableList/TableRows.tsx"],"sourcesContent":["import { Checkbox, Flex, IconButton, Tbody, Td, Tr } from '@strapi/design-system';\nimport { Eye, Pencil } from '@strapi/icons';\nimport { useIntl } from 'react-intl';\nimport { Link } from 'react-router-dom';\n\nimport { tableHeaders as cells } from '../../constants';\nimport { getTrad } from '../../utils';\n\nimport { CellContent } from './CellContent';\n\nimport type { File } from '../../../../shared/contracts/files';\nimport type { Folder } from '../../../../shared/contracts/folders';\n\ninterface FileRow extends File {\n folderURL?: string;\n isSelectable?: boolean;\n type?: string;\n}\n\ninterface FolderRow extends Folder {\n folderURL?: string;\n isSelectable?: boolean;\n type?: string;\n}\n\nexport interface TableRowsProps {\n onChangeFolder?: ((folderId: number, folderPath?: string) => void) | null;\n onEditAsset: (asset: FileRow) => void;\n onEditFolder: (folder: FolderRow) => void;\n onSelectOne: (element: FileRow | FolderRow) => void;\n rows: FileRow[] | FolderRow[];\n selected: FileRow[] | FolderRow[];\n}\n\nexport const TableRows = ({\n onChangeFolder = null,\n onEditAsset,\n onEditFolder,\n onSelectOne,\n rows = [],\n selected = [],\n}: TableRowsProps) => {\n const { formatMessage } = useIntl();\n\n const handleRowClickFn = (\n element: FileRow | FolderRow,\n id: number,\n path: FolderRow['path'],\n elementType?: string\n ) => {\n if (elementType === 'asset') {\n onEditAsset(element as FileRow);\n } else {\n if (onChangeFolder) {\n onChangeFolder(id, path);\n }\n }\n };\n\n return (\n <Tbody>\n {rows.map((element) => {\n const { path, id, isSelectable, name, folderURL, type: contentType } = element;\n\n const isSelected = !!selected.find(\n (currentRow) => currentRow.id === id && currentRow.type === contentType\n );\n\n return (\n <Tr\n key={`${contentType}-${id}`}\n onClick={() => handleRowClickFn(element, id, path || undefined, contentType)}\n >\n <Td onClick={(e) => e.stopPropagation()}>\n <Checkbox\n aria-label={formatMessage(\n {\n id: contentType === 'asset' ? 'list-assets-select' : 'list.folder.select',\n defaultMessage:\n contentType === 'asset' ? 'Select {name} asset' : 'Select {name} folder',\n },\n { name }\n )}\n disabled={!isSelectable}\n onCheckedChange={() => onSelectOne(element)}\n onPointerDown={(e) => {\n e.preventDefault();\n }}\n checked={isSelected}\n />\n </Td>\n {cells.map(({ name, type: cellType }) => {\n return (\n <Td key={name}>\n <CellContent\n content={element as FileRow}\n cellType={cellType}\n contentType={contentType}\n name={name}\n />\n </Td>\n );\n })}\n\n <Td onClick={(e) => e.stopPropagation()}>\n <Flex justifyContent=\"flex-end\">\n {contentType === 'folder' &&\n (folderURL ? (\n <IconButton\n tag={Link}\n label={formatMessage({\n id: getTrad('list.folders.link-label'),\n defaultMessage: 'Access folder',\n })}\n to={folderURL}\n variant=\"ghost\"\n >\n <Eye />\n </IconButton>\n ) : (\n <IconButton\n tag=\"button\"\n label={formatMessage({\n id: getTrad('list.folders.link-label'),\n defaultMessage: 'Access folder',\n })}\n onClick={() => onChangeFolder && onChangeFolder(id)}\n variant=\"ghost\"\n >\n <Eye />\n </IconButton>\n ))}\n <IconButton\n label={formatMessage({\n id: getTrad('control-card.edit'),\n defaultMessage: 'Edit',\n })}\n onClick={() =>\n contentType === 'asset'\n ? onEditAsset(element as FileRow)\n : onEditFolder(element as FolderRow)\n }\n variant=\"ghost\"\n >\n <Pencil />\n </IconButton>\n </Flex>\n </Td>\n </Tr>\n );\n })}\n </Tbody>\n );\n};\n"],"names":["TableRows","onChangeFolder","onEditAsset","onEditFolder","onSelectOne","rows","selected","formatMessage","useIntl","handleRowClickFn","element","id","path","elementType","_jsx","Tbody","map","isSelectable","name","folderURL","type","contentType","isSelected","find","currentRow","_jsxs","Tr","onClick","undefined","Td","e","stopPropagation","Checkbox","aria-label","defaultMessage","disabled","onCheckedChange","onPointerDown","preventDefault","checked","cells","cellType","CellContent","content","Flex","justifyContent","IconButton","tag","Link","label","getTrad","to","variant","Eye","Pencil"],"mappings":"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"}
package/dist/admin/utils/getAllowedFiles.js CHANGED
@@ -10,7 +10,7 @@ const getAllowedFiles = (pluralTypes, files)=>{
10
10
  const allowedFiles = files.filter((file)=>{
11
11
  const fileType = file?.mime?.split('/')[0];
12
12
  if (!fileType) {
13
- return false;
13
+ return singularTypes.includes('file');
14
14
  }
15
15
  if (singularTypes.includes('file') && ![
16
16
  'video',
package/dist/admin/utils/getAllowedFiles.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"getAllowedFiles.js","sources":["../../../admin/src/utils/getAllowedFiles.ts"],"sourcesContent":["import { toSingularTypes } from './toSingularTypes';\n\nimport type { File } from '../../../shared/contracts/files';\n/**\n * Returns the files that can be added to the media field\n * @param {Object[]} pluralTypes Array of string (allowedTypes)\n * @param {Object[]} files Array of files\n * @returns Object[]\n */\n\nexport interface AllowedFiles extends File {\n documentId: string;\n isSelectable: boolean;\n locale: string | null;\n type: string;\n}\n\nexport const getAllowedFiles = (pluralTypes: string[] | null, files: AllowedFiles[]) => {\n if (!pluralTypes) {\n return files;\n }\n\n const singularTypes = toSingularTypes(pluralTypes);\n\n const allowedFiles = files.filter((file) => {\n const fileType = file?.mime?.split('/')[0];\n\n if (!fileType) {\n return false;\n }\n\n if (singularTypes.includes('file') && !['video', 'image', 'audio'].includes(fileType)) {\n return true;\n }\n\n return singularTypes.includes(fileType);\n });\n\n return allowedFiles;\n};\n"],"names":["getAllowedFiles","pluralTypes","files","singularTypes","toSingularTypes","allowedFiles","filter","file","fileType","mime","split","includes"],"mappings":";;;;AAiBO,MAAMA,eAAAA,GAAkB,CAACC,WAAAA,EAA8BC,KAAAA,GAAAA;AAC5D,IAAA,IAAI,CAACD,WAAAA,EAAa;QAChB,OAAOC,KAAAA;AACT,IAAA;AAEA,IAAA,MAAMC,gBAAgBC,+BAAAA,CAAgBH,WAAAA,CAAAA;AAEtC,IAAA,MAAMI,YAAAA,GAAeH,KAAAA,CAAMI,MAAM,CAAC,CAACC,IAAAA,GAAAA;AACjC,QAAA,MAAMC,WAAWD,IAAAA,EAAME,IAAAA,EAAMC,KAAAA,CAAM,GAAA,CAAI,CAAC,CAAA,CAAE;AAE1C,QAAA,IAAI,CAACF,QAAAA,EAAU;YACb,OAAO,KAAA;AACT,QAAA;AAEA,QAAA,IAAIL,aAAAA,CAAcQ,QAAQ,CAAC,MAAA,CAAA,IAAW,CAAC;AAAC,YAAA,OAAA;AAAS,YAAA,OAAA;AAAS,YAAA;SAAQ,CAACA,QAAQ,CAACH,QAAAA,CAAAA,EAAW;YACrF,OAAO,IAAA;AACT,QAAA;QAEA,OAAOL,aAAAA,CAAcQ,QAAQ,CAACH,QAAAA,CAAAA;AAChC,IAAA,CAAA,CAAA;IAEA,OAAOH,YAAAA;AACT;;;;"}
1
+ {"version":3,"file":"getAllowedFiles.js","sources":["../../../admin/src/utils/getAllowedFiles.ts"],"sourcesContent":["import { toSingularTypes } from './toSingularTypes';\n\nimport type { File } from '../../../shared/contracts/files';\n/**\n * Returns the files that can be added to the media field\n * @param {Object[]} pluralTypes Array of string (allowedTypes)\n * @param {Object[]} files Array of files\n * @returns Object[]\n */\n\nexport interface AllowedFiles extends File {\n documentId: string;\n isSelectable: boolean;\n locale: string | null;\n type: string;\n}\n\nexport const getAllowedFiles = (pluralTypes: string[] | null, files: AllowedFiles[]) => {\n if (!pluralTypes) {\n return files;\n }\n\n const singularTypes = toSingularTypes(pluralTypes);\n\n const allowedFiles = files.filter((file) => {\n const fileType = file?.mime?.split('/')[0];\n\n if (!fileType) {\n return singularTypes.includes('file');\n }\n\n if (singularTypes.includes('file') && !['video', 'image', 'audio'].includes(fileType)) {\n return true;\n }\n\n return singularTypes.includes(fileType);\n });\n\n return allowedFiles;\n};\n"],"names":["getAllowedFiles","pluralTypes","files","singularTypes","toSingularTypes","allowedFiles","filter","file","fileType","mime","split","includes"],"mappings":";;;;AAiBO,MAAMA,eAAAA,GAAkB,CAACC,WAAAA,EAA8BC,KAAAA,GAAAA;AAC5D,IAAA,IAAI,CAACD,WAAAA,EAAa;QAChB,OAAOC,KAAAA;AACT,IAAA;AAEA,IAAA,MAAMC,gBAAgBC,+BAAAA,CAAgBH,WAAAA,CAAAA;AAEtC,IAAA,MAAMI,YAAAA,GAAeH,KAAAA,CAAMI,MAAM,CAAC,CAACC,IAAAA,GAAAA;AACjC,QAAA,MAAMC,WAAWD,IAAAA,EAAME,IAAAA,EAAMC,KAAAA,CAAM,GAAA,CAAI,CAAC,CAAA,CAAE;AAE1C,QAAA,IAAI,CAACF,QAAAA,EAAU;YACb,OAAOL,aAAAA,CAAcQ,QAAQ,CAAC,MAAA,CAAA;AAChC,QAAA;AAEA,QAAA,IAAIR,aAAAA,CAAcQ,QAAQ,CAAC,MAAA,CAAA,IAAW,CAAC;AAAC,YAAA,OAAA;AAAS,YAAA,OAAA;AAAS,YAAA;SAAQ,CAACA,QAAQ,CAACH,QAAAA,CAAAA,EAAW;YACrF,OAAO,IAAA;AACT,QAAA;QAEA,OAAOL,aAAAA,CAAcQ,QAAQ,CAACH,QAAAA,CAAAA;AAChC,IAAA,CAAA,CAAA;IAEA,OAAOH,YAAAA;AACT;;;;"}
package/dist/admin/utils/getAllowedFiles.mjs CHANGED
@@ -8,7 +8,7 @@ const getAllowedFiles = (pluralTypes, files)=>{
8
8
  const allowedFiles = files.filter((file)=>{
9
9
  const fileType = file?.mime?.split('/')[0];
10
10
  if (!fileType) {
11
- return false;
11
+ return singularTypes.includes('file');
12
12
  }
13
13
  if (singularTypes.includes('file') && ![
14
14
  'video',
package/dist/admin/utils/getAllowedFiles.mjs.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"getAllowedFiles.mjs","sources":["../../../admin/src/utils/getAllowedFiles.ts"],"sourcesContent":["import { toSingularTypes } from './toSingularTypes';\n\nimport type { File } from '../../../shared/contracts/files';\n/**\n * Returns the files that can be added to the media field\n * @param {Object[]} pluralTypes Array of string (allowedTypes)\n * @param {Object[]} files Array of files\n * @returns Object[]\n */\n\nexport interface AllowedFiles extends File {\n documentId: string;\n isSelectable: boolean;\n locale: string | null;\n type: string;\n}\n\nexport const getAllowedFiles = (pluralTypes: string[] | null, files: AllowedFiles[]) => {\n if (!pluralTypes) {\n return files;\n }\n\n const singularTypes = toSingularTypes(pluralTypes);\n\n const allowedFiles = files.filter((file) => {\n const fileType = file?.mime?.split('/')[0];\n\n if (!fileType) {\n return false;\n }\n\n if (singularTypes.includes('file') && !['video', 'image', 'audio'].includes(fileType)) {\n return true;\n }\n\n return singularTypes.includes(fileType);\n });\n\n return allowedFiles;\n};\n"],"names":["getAllowedFiles","pluralTypes","files","singularTypes","toSingularTypes","allowedFiles","filter","file","fileType","mime","split","includes"],"mappings":";;AAiBO,MAAMA,eAAAA,GAAkB,CAACC,WAAAA,EAA8BC,KAAAA,GAAAA;AAC5D,IAAA,IAAI,CAACD,WAAAA,EAAa;QAChB,OAAOC,KAAAA;AACT,IAAA;AAEA,IAAA,MAAMC,gBAAgBC,eAAAA,CAAgBH,WAAAA,CAAAA;AAEtC,IAAA,MAAMI,YAAAA,GAAeH,KAAAA,CAAMI,MAAM,CAAC,CAACC,IAAAA,GAAAA;AACjC,QAAA,MAAMC,WAAWD,IAAAA,EAAME,IAAAA,EAAMC,KAAAA,CAAM,GAAA,CAAI,CAAC,CAAA,CAAE;AAE1C,QAAA,IAAI,CAACF,QAAAA,EAAU;YACb,OAAO,KAAA;AACT,QAAA;AAEA,QAAA,IAAIL,aAAAA,CAAcQ,QAAQ,CAAC,MAAA,CAAA,IAAW,CAAC;AAAC,YAAA,OAAA;AAAS,YAAA,OAAA;AAAS,YAAA;SAAQ,CAACA,QAAQ,CAACH,QAAAA,CAAAA,EAAW;YACrF,OAAO,IAAA;AACT,QAAA;QAEA,OAAOL,aAAAA,CAAcQ,QAAQ,CAACH,QAAAA,CAAAA;AAChC,IAAA,CAAA,CAAA;IAEA,OAAOH,YAAAA;AACT;;;;"}
1
+ {"version":3,"file":"getAllowedFiles.mjs","sources":["../../../admin/src/utils/getAllowedFiles.ts"],"sourcesContent":["import { toSingularTypes } from './toSingularTypes';\n\nimport type { File } from '../../../shared/contracts/files';\n/**\n * Returns the files that can be added to the media field\n * @param {Object[]} pluralTypes Array of string (allowedTypes)\n * @param {Object[]} files Array of files\n * @returns Object[]\n */\n\nexport interface AllowedFiles extends File {\n documentId: string;\n isSelectable: boolean;\n locale: string | null;\n type: string;\n}\n\nexport const getAllowedFiles = (pluralTypes: string[] | null, files: AllowedFiles[]) => {\n if (!pluralTypes) {\n return files;\n }\n\n const singularTypes = toSingularTypes(pluralTypes);\n\n const allowedFiles = files.filter((file) => {\n const fileType = file?.mime?.split('/')[0];\n\n if (!fileType) {\n return singularTypes.includes('file');\n }\n\n if (singularTypes.includes('file') && !['video', 'image', 'audio'].includes(fileType)) {\n return true;\n }\n\n return singularTypes.includes(fileType);\n });\n\n return allowedFiles;\n};\n"],"names":["getAllowedFiles","pluralTypes","files","singularTypes","toSingularTypes","allowedFiles","filter","file","fileType","mime","split","includes"],"mappings":";;AAiBO,MAAMA,eAAAA,GAAkB,CAACC,WAAAA,EAA8BC,KAAAA,GAAAA;AAC5D,IAAA,IAAI,CAACD,WAAAA,EAAa;QAChB,OAAOC,KAAAA;AACT,IAAA;AAEA,IAAA,MAAMC,gBAAgBC,eAAAA,CAAgBH,WAAAA,CAAAA;AAEtC,IAAA,MAAMI,YAAAA,GAAeH,KAAAA,CAAMI,MAAM,CAAC,CAACC,IAAAA,GAAAA;AACjC,QAAA,MAAMC,WAAWD,IAAAA,EAAME,IAAAA,EAAMC,KAAAA,CAAM,GAAA,CAAI,CAAC,CAAA,CAAE;AAE1C,QAAA,IAAI,CAACF,QAAAA,EAAU;YACb,OAAOL,aAAAA,CAAcQ,QAAQ,CAAC,MAAA,CAAA;AAChC,QAAA;AAEA,QAAA,IAAIR,aAAAA,CAAcQ,QAAQ,CAAC,MAAA,CAAA,IAAW,CAAC;AAAC,YAAA,OAAA;AAAS,YAAA,OAAA;AAAS,YAAA;SAAQ,CAACA,QAAQ,CAACH,QAAAA,CAAAA,EAAW;YACrF,OAAO,IAAA;AACT,QAAA;QAEA,OAAOL,aAAAA,CAAcQ,QAAQ,CAACH,QAAAA,CAAAA;AAChC,IAAA,CAAA,CAAA;IAEA,OAAOH,YAAAA;AACT;;;;"}
package/dist/server/services/file.js CHANGED
@@ -79,10 +79,11 @@ SSRF_BLOCK_LIST.addSubnet('fe80::', 10, 'ipv6'); // IPv6 link-local
79
79
  if (error instanceof ApplicationError) throw error;
80
80
  throw new ApplicationError(`Could not resolve hostname: ${parsedUrl.hostname}`);
81
81
  }
82
- // Fetch the URL with timeout
82
+ // use strapi.fetch so we can intercept requests and support proxy settings
83
+ const doFetch = typeof strapi?.fetch === 'function' ? strapi.fetch : fetch;
83
84
  let response;
84
85
  try {
85
- response = await fetch(url, {
86
+ response = await doFetch(url, {
86
87
  signal: AbortSignal.timeout(FETCH_TIMEOUT_MS)
87
88
  });
88
89
  } catch (error) {
package/dist/server/services/file.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"file.js","sources":["../../../server/src/services/file.ts"],"sourcesContent":["import path from 'path';\nimport dns from 'dns/promises';\nimport net from 'net';\nimport fse from 'fs-extra';\nimport { cloneDeep } from 'lodash/fp';\nimport { async, errors } from '@strapi/utils';\n\nimport { FOLDER_MODEL_UID, FILE_MODEL_UID } from '../constants';\nimport { getService } from '../utils';\n\nimport { Config, type File } from '../types';\n\nconst { ApplicationError } = errors;\n\nconst FETCH_TIMEOUT_MS = 60_000; // 60 seconds\n\n// Blocks loopback, link-local (cloud metadata), and RFC-1918 private ranges to prevent SSRF\nconst SSRF_BLOCK_LIST = new net.BlockList();\nSSRF_BLOCK_LIST.addSubnet('127.0.0.0', 8); // loopback\nSSRF_BLOCK_LIST.addSubnet('10.0.0.0', 8); // RFC-1918\nSSRF_BLOCK_LIST.addSubnet('172.16.0.0', 12); // RFC-1918\nSSRF_BLOCK_LIST.addSubnet('192.168.0.0', 16); // RFC-1918\nSSRF_BLOCK_LIST.addSubnet('169.254.0.0', 16); // link-local / cloud metadata (AWS, GCP, Azure)\nSSRF_BLOCK_LIST.addSubnet('::1', 128, 'ipv6'); // IPv6 loopback\nSSRF_BLOCK_LIST.addSubnet('fc00::', 7, 'ipv6'); // IPv6 unique local\nSSRF_BLOCK_LIST.addSubnet('fe80::', 10, 'ipv6'); // IPv6 link-local\n\n/**\n * Represents a file fetched from a URL, compatible with the upload pipeline\n */\ninterface UrlFetchedFile {\n filepath: string;\n originalFilename: string;\n mimetype: string;\n size: number;\n tmpWorkingDirectory?: string;\n}\n\ninterface FetchUrlResult {\n file: UrlFetchedFile;\n}\n\n/**\n * Extracts filename from a URL path or Content-Disposition header\n */\nconst getFilenameFromUrl = (url: string, contentDisposition?: string | null): string => {\n // Try Content-Disposition header first\n if (contentDisposition) {\n // Extracts filename from Content-Disposition header (e.g. filename=\"photo.jpg\" or filename*=UTF-8''photo.jpg)\n const filenameMatch = contentDisposition.match(\n /filename\\*?=['\"]?(?:UTF-\\d['\"]*)?([^;\\r\\n\"']*)['\"]?/i\n );\n if (filenameMatch?.[1]) {\n // Use path.basename to prevent path traversal attacks\n return path.basename(decodeURIComponent(filenameMatch[1]));\n }\n }\n\n // Fall back to URL path\n try {\n const urlObj = new URL(url);\n const pathname = urlObj.pathname;\n const filename = pathname.split('/').pop();\n if (filename && filename.length > 0) {\n // Use path.basename to prevent path traversal attacks (e.g., URL-encoded separators)\n return path.basename(decodeURIComponent(filename));\n }\n } catch {\n // Invalid URL, use default\n }\n\n // Generate a timestamp-based default filename\n const now = new Date();\n const date = now.toISOString().split('T')[0]; // 2024-02-23\n const time = now.toTimeString().split(' ')[0].replace(/:/g, ''); // 143052\n return `untitled_${date}_${time}`;\n};\n\n/**\n * Fetches a URL and saves it as a temporary file\n * Returns an InputFile-compatible object for use with the upload pipeline\n */\nconst fetchUrlToInputFile = async (\n url: string,\n tmpWorkingDirectory: string,\n sizeLimit?: number\n): Promise<FetchUrlResult> => {\n // Validate URL protocol\n let parsedUrl: URL;\n try {\n parsedUrl = new URL(url);\n } catch {\n throw new ApplicationError(`Invalid URL: ${url}`);\n }\n\n if (!['http:', 'https:'].includes(parsedUrl.protocol)) {\n throw new ApplicationError(`Invalid URL protocol. Only http and https are allowed: ${url}`);\n }\n\n // Resolve hostname and block private/internal IP ranges to prevent SSRF\n try {\n const { address, family } = await dns.lookup(parsedUrl.hostname);\n const type = family === 6 ? 'ipv6' : 'ipv4';\n if (SSRF_BLOCK_LIST.check(address, type)) {\n throw new ApplicationError(`URL resolves to a blocked address: ${url}`);\n }\n } catch (error) {\n if (error instanceof ApplicationError) throw error;\n throw new ApplicationError(`Could not resolve hostname: ${parsedUrl.hostname}`);\n }\n\n // Fetch the URL with timeout\n let response: Response;\n try {\n response = await fetch(url, { signal: AbortSignal.timeout(FETCH_TIMEOUT_MS) });\n } catch (error) {\n if (error instanceof Error && error.name === 'TimeoutError') {\n throw new ApplicationError(`Request timed out while fetching URL: ${url}`);\n }\n throw error;\n }\n\n if (!response.ok) {\n throw new ApplicationError(\n `Failed to fetch URL: ${url} (${response.status} ${response.statusText})`\n );\n }\n\n // Check Content-Length header for early rejection of large files\n if (sizeLimit) {\n const contentLength = response.headers.get('content-length');\n if (contentLength && parseInt(contentLength, 10) > sizeLimit) {\n throw new ApplicationError(\n `File too large: maximum allowed size is ${Math.round(sizeLimit / (1024 * 1024))}MB`\n );\n }\n }\n\n // Get content type and filename\n const contentType =\n response.headers.get('content-type')?.split(';')[0] || 'application/octet-stream';\n const contentDisposition = response.headers.get('content-disposition');\n const filename = getFilenameFromUrl(response.url, contentDisposition);\n\n // Read response body\n const arrayBuffer = await response.arrayBuffer();\n const buffer = Buffer.from(arrayBuffer);\n\n // Write to temp file\n const tmpFilePath = path.join(tmpWorkingDirectory, filename);\n await fse.writeFile(tmpFilePath, buffer);\n\n // Create file object compatible with upload pipeline\n const fetchedFile: UrlFetchedFile = {\n filepath: tmpFilePath,\n originalFilename: filename,\n mimetype: contentType,\n size: buffer.length,\n tmpWorkingDirectory,\n };\n\n return { file: fetchedFile };\n};\n\nconst getFolderPath = async (folderId?: number | null) => {\n if (!folderId) return '/';\n\n const parentFolder = await strapi.db.query(FOLDER_MODEL_UID).findOne({ where: { id: folderId } });\n\n return parentFolder.path;\n};\n\nconst deleteByIds = async (ids: number[] = []) => {\n const filesToDelete = await strapi.db\n .query(FILE_MODEL_UID)\n .findMany({ where: { id: { $in: ids } } });\n\n await Promise.all(filesToDelete.map((file: File) => getService('upload').remove(file)));\n\n return filesToDelete;\n};\n\nconst signFileUrls = async (file: File) => {\n const { provider } = strapi.plugins.upload;\n const { provider: providerConfig } = strapi.config.get<Config>('plugin::upload');\n const isPrivate = await provider.isPrivate();\n file.isUrlSigned = false;\n\n // Check file provider and if provider is private\n if (file.provider !== providerConfig || !isPrivate) {\n return file;\n }\n\n const signUrl = async (file: File) => {\n const signedUrl = await provider.getSignedUrl(file);\n file.url = signedUrl.url;\n file.isUrlSigned = true;\n };\n\n const signedFile = cloneDeep(file);\n\n // Sign each file format\n await signUrl(signedFile);\n if (file.formats) {\n await async.map(Object.values(signedFile.formats ?? {}), signUrl);\n }\n\n return signedFile;\n};\n\nexport type { UrlFetchedFile, FetchUrlResult };\nexport default { getFolderPath, deleteByIds, signFileUrls, fetchUrlToInputFile };\n"],"names":["ApplicationError","errors","FETCH_TIMEOUT_MS","SSRF_BLOCK_LIST","net","BlockList","addSubnet","getFilenameFromUrl","url","contentDisposition","filenameMatch","match","path","basename","decodeURIComponent","urlObj","URL","pathname","filename","split","pop","length","now","Date","date","toISOString","time","toTimeString","replace","fetchUrlToInputFile","tmpWorkingDirectory","sizeLimit","parsedUrl","includes","protocol","address","family","dns","lookup","hostname","type","check","error","response","fetch","signal","AbortSignal","timeout","Error","name","ok","status","statusText","contentLength","headers","get","parseInt","Math","round","contentType","arrayBuffer","buffer","Buffer","from","tmpFilePath","join","fse","writeFile","fetchedFile","filepath","originalFilename","mimetype","size","file","getFolderPath","folderId","parentFolder","strapi","db","query","FOLDER_MODEL_UID","findOne","where","id","deleteByIds","ids","filesToDelete","FILE_MODEL_UID","findMany","$in","Promise","all","map","getService","remove","signFileUrls","provider","plugins","upload","providerConfig","config","isPrivate","isUrlSigned","signUrl","signedUrl","getSignedUrl","signedFile","cloneDeep","formats","async","Object","values"],"mappings":"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"}
1
+ {"version":3,"file":"file.js","sources":["../../../server/src/services/file.ts"],"sourcesContent":["import path from 'path';\nimport dns from 'dns/promises';\nimport net from 'net';\nimport fse from 'fs-extra';\nimport { cloneDeep } from 'lodash/fp';\nimport { async, errors } from '@strapi/utils';\n\nimport { FOLDER_MODEL_UID, FILE_MODEL_UID } from '../constants';\nimport { getService } from '../utils';\n\nimport { Config, type File } from '../types';\n\nconst { ApplicationError } = errors;\n\nconst FETCH_TIMEOUT_MS = 60_000; // 60 seconds\n\n// Blocks loopback, link-local (cloud metadata), and RFC-1918 private ranges to prevent SSRF\nconst SSRF_BLOCK_LIST = new net.BlockList();\nSSRF_BLOCK_LIST.addSubnet('127.0.0.0', 8); // loopback\nSSRF_BLOCK_LIST.addSubnet('10.0.0.0', 8); // RFC-1918\nSSRF_BLOCK_LIST.addSubnet('172.16.0.0', 12); // RFC-1918\nSSRF_BLOCK_LIST.addSubnet('192.168.0.0', 16); // RFC-1918\nSSRF_BLOCK_LIST.addSubnet('169.254.0.0', 16); // link-local / cloud metadata (AWS, GCP, Azure)\nSSRF_BLOCK_LIST.addSubnet('::1', 128, 'ipv6'); // IPv6 loopback\nSSRF_BLOCK_LIST.addSubnet('fc00::', 7, 'ipv6'); // IPv6 unique local\nSSRF_BLOCK_LIST.addSubnet('fe80::', 10, 'ipv6'); // IPv6 link-local\n\n/**\n * Represents a file fetched from a URL, compatible with the upload pipeline\n */\ninterface UrlFetchedFile {\n filepath: string;\n originalFilename: string;\n mimetype: string;\n size: number;\n tmpWorkingDirectory?: string;\n}\n\ninterface FetchUrlResult {\n file: UrlFetchedFile;\n}\n\n/**\n * Extracts filename from a URL path or Content-Disposition header\n */\nconst getFilenameFromUrl = (url: string, contentDisposition?: string | null): string => {\n // Try Content-Disposition header first\n if (contentDisposition) {\n // Extracts filename from Content-Disposition header (e.g. filename=\"photo.jpg\" or filename*=UTF-8''photo.jpg)\n const filenameMatch = contentDisposition.match(\n /filename\\*?=['\"]?(?:UTF-\\d['\"]*)?([^;\\r\\n\"']*)['\"]?/i\n );\n if (filenameMatch?.[1]) {\n // Use path.basename to prevent path traversal attacks\n return path.basename(decodeURIComponent(filenameMatch[1]));\n }\n }\n\n // Fall back to URL path\n try {\n const urlObj = new URL(url);\n const pathname = urlObj.pathname;\n const filename = pathname.split('/').pop();\n if (filename && filename.length > 0) {\n // Use path.basename to prevent path traversal attacks (e.g., URL-encoded separators)\n return path.basename(decodeURIComponent(filename));\n }\n } catch {\n // Invalid URL, use default\n }\n\n // Generate a timestamp-based default filename\n const now = new Date();\n const date = now.toISOString().split('T')[0]; // 2024-02-23\n const time = now.toTimeString().split(' ')[0].replace(/:/g, ''); // 143052\n return `untitled_${date}_${time}`;\n};\n\n/**\n * Fetches a URL and saves it as a temporary file\n * Returns an InputFile-compatible object for use with the upload pipeline\n */\nconst fetchUrlToInputFile = async (\n url: string,\n tmpWorkingDirectory: string,\n sizeLimit?: number\n): Promise<FetchUrlResult> => {\n // Validate URL protocol\n let parsedUrl: URL;\n try {\n parsedUrl = new URL(url);\n } catch {\n throw new ApplicationError(`Invalid URL: ${url}`);\n }\n\n if (!['http:', 'https:'].includes(parsedUrl.protocol)) {\n throw new ApplicationError(`Invalid URL protocol. Only http and https are allowed: ${url}`);\n }\n\n // Resolve hostname and block private/internal IP ranges to prevent SSRF\n try {\n const { address, family } = await dns.lookup(parsedUrl.hostname);\n const type = family === 6 ? 'ipv6' : 'ipv4';\n if (SSRF_BLOCK_LIST.check(address, type)) {\n throw new ApplicationError(`URL resolves to a blocked address: ${url}`);\n }\n } catch (error) {\n if (error instanceof ApplicationError) throw error;\n throw new ApplicationError(`Could not resolve hostname: ${parsedUrl.hostname}`);\n }\n\n // use strapi.fetch so we can intercept requests and support proxy settings\n const doFetch = typeof strapi?.fetch === 'function' ? strapi.fetch : fetch;\n let response: Response;\n try {\n response = await doFetch(url, { signal: AbortSignal.timeout(FETCH_TIMEOUT_MS) });\n } catch (error) {\n if (error instanceof Error && error.name === 'TimeoutError') {\n throw new ApplicationError(`Request timed out while fetching URL: ${url}`);\n }\n throw error;\n }\n\n if (!response.ok) {\n throw new ApplicationError(\n `Failed to fetch URL: ${url} (${response.status} ${response.statusText})`\n );\n }\n\n // Check Content-Length header for early rejection of large files\n if (sizeLimit) {\n const contentLength = response.headers.get('content-length');\n if (contentLength && parseInt(contentLength, 10) > sizeLimit) {\n throw new ApplicationError(\n `File too large: maximum allowed size is ${Math.round(sizeLimit / (1024 * 1024))}MB`\n );\n }\n }\n\n // Get content type and filename\n const contentType =\n response.headers.get('content-type')?.split(';')[0] || 'application/octet-stream';\n const contentDisposition = response.headers.get('content-disposition');\n const filename = getFilenameFromUrl(response.url, contentDisposition);\n\n // Read response body\n const arrayBuffer = await response.arrayBuffer();\n const buffer = Buffer.from(arrayBuffer);\n\n // Write to temp file\n const tmpFilePath = path.join(tmpWorkingDirectory, filename);\n await fse.writeFile(tmpFilePath, buffer);\n\n // Create file object compatible with upload pipeline\n const fetchedFile: UrlFetchedFile = {\n filepath: tmpFilePath,\n originalFilename: filename,\n mimetype: contentType,\n size: buffer.length,\n tmpWorkingDirectory,\n };\n\n return { file: fetchedFile };\n};\n\nconst getFolderPath = async (folderId?: number | null) => {\n if (!folderId) return '/';\n\n const parentFolder = await strapi.db.query(FOLDER_MODEL_UID).findOne({ where: { id: folderId } });\n\n return parentFolder.path;\n};\n\nconst deleteByIds = async (ids: number[] = []) => {\n const filesToDelete = await strapi.db\n .query(FILE_MODEL_UID)\n .findMany({ where: { id: { $in: ids } } });\n\n await Promise.all(filesToDelete.map((file: File) => getService('upload').remove(file)));\n\n return filesToDelete;\n};\n\nconst signFileUrls = async (file: File) => {\n const { provider } = strapi.plugins.upload;\n const { provider: providerConfig } = strapi.config.get<Config>('plugin::upload');\n const isPrivate = await provider.isPrivate();\n file.isUrlSigned = false;\n\n // Check file provider and if provider is private\n if (file.provider !== providerConfig || !isPrivate) {\n return file;\n }\n\n const signUrl = async (file: File) => {\n const signedUrl = await provider.getSignedUrl(file);\n file.url = signedUrl.url;\n file.isUrlSigned = true;\n };\n\n const signedFile = cloneDeep(file);\n\n // Sign each file format\n await signUrl(signedFile);\n if (file.formats) {\n await async.map(Object.values(signedFile.formats ?? {}), signUrl);\n }\n\n return signedFile;\n};\n\nexport type { UrlFetchedFile, FetchUrlResult };\nexport default { getFolderPath, deleteByIds, signFileUrls, fetchUrlToInputFile };\n"],"names":["ApplicationError","errors","FETCH_TIMEOUT_MS","SSRF_BLOCK_LIST","net","BlockList","addSubnet","getFilenameFromUrl","url","contentDisposition","filenameMatch","match","path","basename","decodeURIComponent","urlObj","URL","pathname","filename","split","pop","length","now","Date","date","toISOString","time","toTimeString","replace","fetchUrlToInputFile","tmpWorkingDirectory","sizeLimit","parsedUrl","includes","protocol","address","family","dns","lookup","hostname","type","check","error","doFetch","strapi","fetch","response","signal","AbortSignal","timeout","Error","name","ok","status","statusText","contentLength","headers","get","parseInt","Math","round","contentType","arrayBuffer","buffer","Buffer","from","tmpFilePath","join","fse","writeFile","fetchedFile","filepath","originalFilename","mimetype","size","file","getFolderPath","folderId","parentFolder","db","query","FOLDER_MODEL_UID","findOne","where","id","deleteByIds","ids","filesToDelete","FILE_MODEL_UID","findMany","$in","Promise","all","map","getService","remove","signFileUrls","provider","plugins","upload","providerConfig","config","isPrivate","isUrlSigned","signUrl","signedUrl","getSignedUrl","signedFile","cloneDeep","formats","async","Object","values"],"mappings":"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"}
package/dist/server/services/file.mjs CHANGED
@@ -77,10 +77,11 @@ SSRF_BLOCK_LIST.addSubnet('fe80::', 10, 'ipv6'); // IPv6 link-local
77
77
  if (error instanceof ApplicationError) throw error;
78
78
  throw new ApplicationError(`Could not resolve hostname: ${parsedUrl.hostname}`);
79
79
  }
80
- // Fetch the URL with timeout
80
+ // use strapi.fetch so we can intercept requests and support proxy settings
81
+ const doFetch = typeof strapi?.fetch === 'function' ? strapi.fetch : fetch;
81
82
  let response;
82
83
  try {
83
- response = await fetch(url, {
84
+ response = await doFetch(url, {
84
85
  signal: AbortSignal.timeout(FETCH_TIMEOUT_MS)
85
86
  });
86
87
  } catch (error) {
package/dist/server/services/file.mjs.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"file.mjs","sources":["../../../server/src/services/file.ts"],"sourcesContent":["import path from 'path';\nimport dns from 'dns/promises';\nimport net from 'net';\nimport fse from 'fs-extra';\nimport { cloneDeep } from 'lodash/fp';\nimport { async, errors } from '@strapi/utils';\n\nimport { FOLDER_MODEL_UID, FILE_MODEL_UID } from '../constants';\nimport { getService } from '../utils';\n\nimport { Config, type File } from '../types';\n\nconst { ApplicationError } = errors;\n\nconst FETCH_TIMEOUT_MS = 60_000; // 60 seconds\n\n// Blocks loopback, link-local (cloud metadata), and RFC-1918 private ranges to prevent SSRF\nconst SSRF_BLOCK_LIST = new net.BlockList();\nSSRF_BLOCK_LIST.addSubnet('127.0.0.0', 8); // loopback\nSSRF_BLOCK_LIST.addSubnet('10.0.0.0', 8); // RFC-1918\nSSRF_BLOCK_LIST.addSubnet('172.16.0.0', 12); // RFC-1918\nSSRF_BLOCK_LIST.addSubnet('192.168.0.0', 16); // RFC-1918\nSSRF_BLOCK_LIST.addSubnet('169.254.0.0', 16); // link-local / cloud metadata (AWS, GCP, Azure)\nSSRF_BLOCK_LIST.addSubnet('::1', 128, 'ipv6'); // IPv6 loopback\nSSRF_BLOCK_LIST.addSubnet('fc00::', 7, 'ipv6'); // IPv6 unique local\nSSRF_BLOCK_LIST.addSubnet('fe80::', 10, 'ipv6'); // IPv6 link-local\n\n/**\n * Represents a file fetched from a URL, compatible with the upload pipeline\n */\ninterface UrlFetchedFile {\n filepath: string;\n originalFilename: string;\n mimetype: string;\n size: number;\n tmpWorkingDirectory?: string;\n}\n\ninterface FetchUrlResult {\n file: UrlFetchedFile;\n}\n\n/**\n * Extracts filename from a URL path or Content-Disposition header\n */\nconst getFilenameFromUrl = (url: string, contentDisposition?: string | null): string => {\n // Try Content-Disposition header first\n if (contentDisposition) {\n // Extracts filename from Content-Disposition header (e.g. filename=\"photo.jpg\" or filename*=UTF-8''photo.jpg)\n const filenameMatch = contentDisposition.match(\n /filename\\*?=['\"]?(?:UTF-\\d['\"]*)?([^;\\r\\n\"']*)['\"]?/i\n );\n if (filenameMatch?.[1]) {\n // Use path.basename to prevent path traversal attacks\n return path.basename(decodeURIComponent(filenameMatch[1]));\n }\n }\n\n // Fall back to URL path\n try {\n const urlObj = new URL(url);\n const pathname = urlObj.pathname;\n const filename = pathname.split('/').pop();\n if (filename && filename.length > 0) {\n // Use path.basename to prevent path traversal attacks (e.g., URL-encoded separators)\n return path.basename(decodeURIComponent(filename));\n }\n } catch {\n // Invalid URL, use default\n }\n\n // Generate a timestamp-based default filename\n const now = new Date();\n const date = now.toISOString().split('T')[0]; // 2024-02-23\n const time = now.toTimeString().split(' ')[0].replace(/:/g, ''); // 143052\n return `untitled_${date}_${time}`;\n};\n\n/**\n * Fetches a URL and saves it as a temporary file\n * Returns an InputFile-compatible object for use with the upload pipeline\n */\nconst fetchUrlToInputFile = async (\n url: string,\n tmpWorkingDirectory: string,\n sizeLimit?: number\n): Promise<FetchUrlResult> => {\n // Validate URL protocol\n let parsedUrl: URL;\n try {\n parsedUrl = new URL(url);\n } catch {\n throw new ApplicationError(`Invalid URL: ${url}`);\n }\n\n if (!['http:', 'https:'].includes(parsedUrl.protocol)) {\n throw new ApplicationError(`Invalid URL protocol. Only http and https are allowed: ${url}`);\n }\n\n // Resolve hostname and block private/internal IP ranges to prevent SSRF\n try {\n const { address, family } = await dns.lookup(parsedUrl.hostname);\n const type = family === 6 ? 'ipv6' : 'ipv4';\n if (SSRF_BLOCK_LIST.check(address, type)) {\n throw new ApplicationError(`URL resolves to a blocked address: ${url}`);\n }\n } catch (error) {\n if (error instanceof ApplicationError) throw error;\n throw new ApplicationError(`Could not resolve hostname: ${parsedUrl.hostname}`);\n }\n\n // Fetch the URL with timeout\n let response: Response;\n try {\n response = await fetch(url, { signal: AbortSignal.timeout(FETCH_TIMEOUT_MS) });\n } catch (error) {\n if (error instanceof Error && error.name === 'TimeoutError') {\n throw new ApplicationError(`Request timed out while fetching URL: ${url}`);\n }\n throw error;\n }\n\n if (!response.ok) {\n throw new ApplicationError(\n `Failed to fetch URL: ${url} (${response.status} ${response.statusText})`\n );\n }\n\n // Check Content-Length header for early rejection of large files\n if (sizeLimit) {\n const contentLength = response.headers.get('content-length');\n if (contentLength && parseInt(contentLength, 10) > sizeLimit) {\n throw new ApplicationError(\n `File too large: maximum allowed size is ${Math.round(sizeLimit / (1024 * 1024))}MB`\n );\n }\n }\n\n // Get content type and filename\n const contentType =\n response.headers.get('content-type')?.split(';')[0] || 'application/octet-stream';\n const contentDisposition = response.headers.get('content-disposition');\n const filename = getFilenameFromUrl(response.url, contentDisposition);\n\n // Read response body\n const arrayBuffer = await response.arrayBuffer();\n const buffer = Buffer.from(arrayBuffer);\n\n // Write to temp file\n const tmpFilePath = path.join(tmpWorkingDirectory, filename);\n await fse.writeFile(tmpFilePath, buffer);\n\n // Create file object compatible with upload pipeline\n const fetchedFile: UrlFetchedFile = {\n filepath: tmpFilePath,\n originalFilename: filename,\n mimetype: contentType,\n size: buffer.length,\n tmpWorkingDirectory,\n };\n\n return { file: fetchedFile };\n};\n\nconst getFolderPath = async (folderId?: number | null) => {\n if (!folderId) return '/';\n\n const parentFolder = await strapi.db.query(FOLDER_MODEL_UID).findOne({ where: { id: folderId } });\n\n return parentFolder.path;\n};\n\nconst deleteByIds = async (ids: number[] = []) => {\n const filesToDelete = await strapi.db\n .query(FILE_MODEL_UID)\n .findMany({ where: { id: { $in: ids } } });\n\n await Promise.all(filesToDelete.map((file: File) => getService('upload').remove(file)));\n\n return filesToDelete;\n};\n\nconst signFileUrls = async (file: File) => {\n const { provider } = strapi.plugins.upload;\n const { provider: providerConfig } = strapi.config.get<Config>('plugin::upload');\n const isPrivate = await provider.isPrivate();\n file.isUrlSigned = false;\n\n // Check file provider and if provider is private\n if (file.provider !== providerConfig || !isPrivate) {\n return file;\n }\n\n const signUrl = async (file: File) => {\n const signedUrl = await provider.getSignedUrl(file);\n file.url = signedUrl.url;\n file.isUrlSigned = true;\n };\n\n const signedFile = cloneDeep(file);\n\n // Sign each file format\n await signUrl(signedFile);\n if (file.formats) {\n await async.map(Object.values(signedFile.formats ?? {}), signUrl);\n }\n\n return signedFile;\n};\n\nexport type { UrlFetchedFile, FetchUrlResult };\nexport default { getFolderPath, deleteByIds, signFileUrls, fetchUrlToInputFile };\n"],"names":["ApplicationError","errors","FETCH_TIMEOUT_MS","SSRF_BLOCK_LIST","net","BlockList","addSubnet","getFilenameFromUrl","url","contentDisposition","filenameMatch","match","path","basename","decodeURIComponent","urlObj","URL","pathname","filename","split","pop","length","now","Date","date","toISOString","time","toTimeString","replace","fetchUrlToInputFile","tmpWorkingDirectory","sizeLimit","parsedUrl","includes","protocol","address","family","dns","lookup","hostname","type","check","error","response","fetch","signal","AbortSignal","timeout","Error","name","ok","status","statusText","contentLength","headers","get","parseInt","Math","round","contentType","arrayBuffer","buffer","Buffer","from","tmpFilePath","join","fse","writeFile","fetchedFile","filepath","originalFilename","mimetype","size","file","getFolderPath","folderId","parentFolder","strapi","db","query","FOLDER_MODEL_UID","findOne","where","id","deleteByIds","ids","filesToDelete","FILE_MODEL_UID","findMany","$in","Promise","all","map","getService","remove","signFileUrls","provider","plugins","upload","providerConfig","config","isPrivate","isUrlSigned","signUrl","signedUrl","getSignedUrl","signedFile","cloneDeep","formats","async","Object","values"],"mappings":"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"}
1
+ {"version":3,"file":"file.mjs","sources":["../../../server/src/services/file.ts"],"sourcesContent":["import path from 'path';\nimport dns from 'dns/promises';\nimport net from 'net';\nimport fse from 'fs-extra';\nimport { cloneDeep } from 'lodash/fp';\nimport { async, errors } from '@strapi/utils';\n\nimport { FOLDER_MODEL_UID, FILE_MODEL_UID } from '../constants';\nimport { getService } from '../utils';\n\nimport { Config, type File } from '../types';\n\nconst { ApplicationError } = errors;\n\nconst FETCH_TIMEOUT_MS = 60_000; // 60 seconds\n\n// Blocks loopback, link-local (cloud metadata), and RFC-1918 private ranges to prevent SSRF\nconst SSRF_BLOCK_LIST = new net.BlockList();\nSSRF_BLOCK_LIST.addSubnet('127.0.0.0', 8); // loopback\nSSRF_BLOCK_LIST.addSubnet('10.0.0.0', 8); // RFC-1918\nSSRF_BLOCK_LIST.addSubnet('172.16.0.0', 12); // RFC-1918\nSSRF_BLOCK_LIST.addSubnet('192.168.0.0', 16); // RFC-1918\nSSRF_BLOCK_LIST.addSubnet('169.254.0.0', 16); // link-local / cloud metadata (AWS, GCP, Azure)\nSSRF_BLOCK_LIST.addSubnet('::1', 128, 'ipv6'); // IPv6 loopback\nSSRF_BLOCK_LIST.addSubnet('fc00::', 7, 'ipv6'); // IPv6 unique local\nSSRF_BLOCK_LIST.addSubnet('fe80::', 10, 'ipv6'); // IPv6 link-local\n\n/**\n * Represents a file fetched from a URL, compatible with the upload pipeline\n */\ninterface UrlFetchedFile {\n filepath: string;\n originalFilename: string;\n mimetype: string;\n size: number;\n tmpWorkingDirectory?: string;\n}\n\ninterface FetchUrlResult {\n file: UrlFetchedFile;\n}\n\n/**\n * Extracts filename from a URL path or Content-Disposition header\n */\nconst getFilenameFromUrl = (url: string, contentDisposition?: string | null): string => {\n // Try Content-Disposition header first\n if (contentDisposition) {\n // Extracts filename from Content-Disposition header (e.g. filename=\"photo.jpg\" or filename*=UTF-8''photo.jpg)\n const filenameMatch = contentDisposition.match(\n /filename\\*?=['\"]?(?:UTF-\\d['\"]*)?([^;\\r\\n\"']*)['\"]?/i\n );\n if (filenameMatch?.[1]) {\n // Use path.basename to prevent path traversal attacks\n return path.basename(decodeURIComponent(filenameMatch[1]));\n }\n }\n\n // Fall back to URL path\n try {\n const urlObj = new URL(url);\n const pathname = urlObj.pathname;\n const filename = pathname.split('/').pop();\n if (filename && filename.length > 0) {\n // Use path.basename to prevent path traversal attacks (e.g., URL-encoded separators)\n return path.basename(decodeURIComponent(filename));\n }\n } catch {\n // Invalid URL, use default\n }\n\n // Generate a timestamp-based default filename\n const now = new Date();\n const date = now.toISOString().split('T')[0]; // 2024-02-23\n const time = now.toTimeString().split(' ')[0].replace(/:/g, ''); // 143052\n return `untitled_${date}_${time}`;\n};\n\n/**\n * Fetches a URL and saves it as a temporary file\n * Returns an InputFile-compatible object for use with the upload pipeline\n */\nconst fetchUrlToInputFile = async (\n url: string,\n tmpWorkingDirectory: string,\n sizeLimit?: number\n): Promise<FetchUrlResult> => {\n // Validate URL protocol\n let parsedUrl: URL;\n try {\n parsedUrl = new URL(url);\n } catch {\n throw new ApplicationError(`Invalid URL: ${url}`);\n }\n\n if (!['http:', 'https:'].includes(parsedUrl.protocol)) {\n throw new ApplicationError(`Invalid URL protocol. Only http and https are allowed: ${url}`);\n }\n\n // Resolve hostname and block private/internal IP ranges to prevent SSRF\n try {\n const { address, family } = await dns.lookup(parsedUrl.hostname);\n const type = family === 6 ? 'ipv6' : 'ipv4';\n if (SSRF_BLOCK_LIST.check(address, type)) {\n throw new ApplicationError(`URL resolves to a blocked address: ${url}`);\n }\n } catch (error) {\n if (error instanceof ApplicationError) throw error;\n throw new ApplicationError(`Could not resolve hostname: ${parsedUrl.hostname}`);\n }\n\n // use strapi.fetch so we can intercept requests and support proxy settings\n const doFetch = typeof strapi?.fetch === 'function' ? strapi.fetch : fetch;\n let response: Response;\n try {\n response = await doFetch(url, { signal: AbortSignal.timeout(FETCH_TIMEOUT_MS) });\n } catch (error) {\n if (error instanceof Error && error.name === 'TimeoutError') {\n throw new ApplicationError(`Request timed out while fetching URL: ${url}`);\n }\n throw error;\n }\n\n if (!response.ok) {\n throw new ApplicationError(\n `Failed to fetch URL: ${url} (${response.status} ${response.statusText})`\n );\n }\n\n // Check Content-Length header for early rejection of large files\n if (sizeLimit) {\n const contentLength = response.headers.get('content-length');\n if (contentLength && parseInt(contentLength, 10) > sizeLimit) {\n throw new ApplicationError(\n `File too large: maximum allowed size is ${Math.round(sizeLimit / (1024 * 1024))}MB`\n );\n }\n }\n\n // Get content type and filename\n const contentType =\n response.headers.get('content-type')?.split(';')[0] || 'application/octet-stream';\n const contentDisposition = response.headers.get('content-disposition');\n const filename = getFilenameFromUrl(response.url, contentDisposition);\n\n // Read response body\n const arrayBuffer = await response.arrayBuffer();\n const buffer = Buffer.from(arrayBuffer);\n\n // Write to temp file\n const tmpFilePath = path.join(tmpWorkingDirectory, filename);\n await fse.writeFile(tmpFilePath, buffer);\n\n // Create file object compatible with upload pipeline\n const fetchedFile: UrlFetchedFile = {\n filepath: tmpFilePath,\n originalFilename: filename,\n mimetype: contentType,\n size: buffer.length,\n tmpWorkingDirectory,\n };\n\n return { file: fetchedFile };\n};\n\nconst getFolderPath = async (folderId?: number | null) => {\n if (!folderId) return '/';\n\n const parentFolder = await strapi.db.query(FOLDER_MODEL_UID).findOne({ where: { id: folderId } });\n\n return parentFolder.path;\n};\n\nconst deleteByIds = async (ids: number[] = []) => {\n const filesToDelete = await strapi.db\n .query(FILE_MODEL_UID)\n .findMany({ where: { id: { $in: ids } } });\n\n await Promise.all(filesToDelete.map((file: File) => getService('upload').remove(file)));\n\n return filesToDelete;\n};\n\nconst signFileUrls = async (file: File) => {\n const { provider } = strapi.plugins.upload;\n const { provider: providerConfig } = strapi.config.get<Config>('plugin::upload');\n const isPrivate = await provider.isPrivate();\n file.isUrlSigned = false;\n\n // Check file provider and if provider is private\n if (file.provider !== providerConfig || !isPrivate) {\n return file;\n }\n\n const signUrl = async (file: File) => {\n const signedUrl = await provider.getSignedUrl(file);\n file.url = signedUrl.url;\n file.isUrlSigned = true;\n };\n\n const signedFile = cloneDeep(file);\n\n // Sign each file format\n await signUrl(signedFile);\n if (file.formats) {\n await async.map(Object.values(signedFile.formats ?? {}), signUrl);\n }\n\n return signedFile;\n};\n\nexport type { UrlFetchedFile, FetchUrlResult };\nexport default { getFolderPath, deleteByIds, signFileUrls, fetchUrlToInputFile };\n"],"names":["ApplicationError","errors","FETCH_TIMEOUT_MS","SSRF_BLOCK_LIST","net","BlockList","addSubnet","getFilenameFromUrl","url","contentDisposition","filenameMatch","match","path","basename","decodeURIComponent","urlObj","URL","pathname","filename","split","pop","length","now","Date","date","toISOString","time","toTimeString","replace","fetchUrlToInputFile","tmpWorkingDirectory","sizeLimit","parsedUrl","includes","protocol","address","family","dns","lookup","hostname","type","check","error","doFetch","strapi","fetch","response","signal","AbortSignal","timeout","Error","name","ok","status","statusText","contentLength","headers","get","parseInt","Math","round","contentType","arrayBuffer","buffer","Buffer","from","tmpFilePath","join","fse","writeFile","fetchedFile","filepath","originalFilename","mimetype","size","file","getFolderPath","folderId","parentFolder","db","query","FOLDER_MODEL_UID","findOne","where","id","deleteByIds","ids","filesToDelete","FILE_MODEL_UID","findMany","$in","Promise","all","map","getService","remove","signFileUrls","provider","plugins","upload","providerConfig","config","isPrivate","isUrlSigned","signUrl","signedUrl","getSignedUrl","signedFile","cloneDeep","formats","async","Object","values"],"mappings":"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"}
package/dist/server/src/services/file.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"file.d.ts","sourceRoot":"","sources":["../../../../server/src/services/file.ts"],"names":[],"mappings":"AAUA,OAAO,EAAU,KAAK,IAAI,EAAE,MAAM,UAAU,CAAC;AAiB7C;;GAEG;AACH,UAAU,cAAc;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED,UAAU,cAAc;IACtB,IAAI,EAAE,cAAc,CAAC;CACtB;AA0KD,YAAY,EAAE,cAAc,EAAE,cAAc,EAAE,CAAC;;;;;;;AAC/C,wBAAiF"}
1
+ {"version":3,"file":"file.d.ts","sourceRoot":"","sources":["../../../../server/src/services/file.ts"],"names":[],"mappings":"AAUA,OAAO,EAAU,KAAK,IAAI,EAAE,MAAM,UAAU,CAAC;AAiB7C;;GAEG;AACH,UAAU,cAAc;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED,UAAU,cAAc;IACtB,IAAI,EAAE,cAAc,CAAC;CACtB;AA2KD,YAAY,EAAE,cAAc,EAAE,cAAc,EAAE,CAAC;;;;;;;AAC/C,wBAAiF"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@strapi/upload",
3
- "version": "5.39.0",
3
+ "version": "5.41.0",
4
4
  "description": "Makes it easy to upload images and files to your Strapi Application.",
5
5
  "homepage": "https://strapi.io",
6
6
  "bugs": {
@@ -8,7 +8,7 @@
8
8
  },
9
9
  "repository": {
10
10
  "type": "git",
11
- "url": "git://github.com/strapi/strapi.git",
11
+ "url": "https://github.com/strapi/strapi.git",
12
12
  "directory": "packages/core/upload"
13
13
  },
14
14
  "license": "SEE LICENSE IN LICENSE",
@@ -73,15 +73,15 @@
73
73
  "@radix-ui/react-dialog": "1.0.5",
74
74
  "@radix-ui/react-toggle-group": "1.1.11",
75
75
  "@reduxjs/toolkit": "1.9.7",
76
- "@strapi/database": "5.39.0",
76
+ "@strapi/database": "5.41.0",
77
77
  "@strapi/design-system": "2.2.0",
78
78
  "@strapi/icons": "2.2.0",
79
- "@strapi/provider-upload-local": "5.39.0",
80
- "@strapi/utils": "5.39.0",
79
+ "@strapi/provider-upload-local": "5.41.0",
80
+ "@strapi/utils": "5.41.0",
81
81
  "byte-size": "8.1.1",
82
82
  "cropperjs": "1.6.1",
83
83
  "date-fns": "2.30.0",
84
- "file-type": "21.0.0",
84
+ "file-type": "21.3.3",
85
85
  "formik": "2.4.5",
86
86
  "fs-extra": "11.2.0",
87
87
  "immer": "9.0.21",
@@ -101,8 +101,8 @@
101
101
  "zod": "3.25.67"
102
102
  },
103
103
  "devDependencies": {
104
- "@strapi/admin": "5.39.0",
105
- "@strapi/types": "5.39.0",
104
+ "@strapi/admin": "5.41.0",
105
+ "@strapi/types": "5.41.0",
106
106
  "@testing-library/dom": "10.4.1",
107
107
  "@testing-library/react": "16.3.0",
108
108
  "@testing-library/user-event": "14.6.1",