@payloadcms/plugin-cloud-storage 3.89.0 → 3.90.0

package/dist/hooks/afterRead.js

@@ -1,13 +1,24 @@
+import { buildPrefixWithObjectKey } from '../utilities/buildPrefixWithObjectKey.js';
+// The object's folder: semantic prefix + `_objectKey` segment.
+const getObjectFolder = (data)=>{
+    const record = data ?? {};
+    return buildPrefixWithObjectKey({
+        objectKey: record._objectKey,
+        prefix: record.prefix
+    });
+};
 export const getAfterReadHook = ({ adapter, collection, disablePayloadAccessControl, generateFileURL, size })=>async ({ data, value })=>{
         const filename = size ? data?.sizes?.[size.name]?.filename : data?.filename;
         const prefix = data?.prefix;
+        // Direct-serve URLs encode the full location; the proxy resolves `_objectKey` server-side.
+        const objectFolder = getObjectFolder(data);
         let url = value;
         if (filename) {
             if (generateFileURL) {
                 url = await generateFileURL({
                     collection,
                     filename,
-                    prefix,
+                    prefix: objectFolder,
                     size
                 });
             } else if (disablePayloadAccessControl && adapter.generateURL) {
@@ -15,7 +26,7 @@ export const getAfterReadHook = ({ adapter, collection, disablePayloadAccessCont
                     collection,
                     data,
                     filename,
-                    prefix
+                    prefix: objectFolder
                 });
             } else if (url && prefix) {
                 const separator = url.includes('?') ? '&' : '?';

package/dist/hooks/afterRead.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/hooks/afterRead.ts"],"sourcesContent":["import type { CollectionConfig, FieldHook, ImageSize } from 'payload'\n\nimport type { GeneratedAdapter, GenerateFileURL } from '../types.js'\n\ninterface Args {\n  adapter: GeneratedAdapter\n  collection: CollectionConfig\n  disablePayloadAccessControl?: boolean\n  generateFileURL?: GenerateFileURL\n  size?: ImageSize\n}\n\nexport const getAfterReadHook =\n  ({ adapter, collection, disablePayloadAccessControl, generateFileURL, size }: Args): FieldHook =>\n  async ({ data, value }) => {\n    const filename = size ? data?.sizes?.[size.name]?.filename : data?.filename\n    const prefix = data?.prefix\n    let url = value\n\n    if (filename) {\n      if (generateFileURL) {\n        url = await generateFileURL({\n          collection,\n          filename,\n          prefix,\n          size,\n        })\n      } else if (disablePayloadAccessControl && adapter.generateURL) {\n        url = await adapter.generateURL({\n          collection,\n          data,\n          filename,\n          prefix,\n        })\n      } else if (url && prefix) {\n        const separator = url.includes('?') ? '&' : '?'\n        url = `${url}${separator}prefix=${encodeURIComponent(prefix)}`\n      }\n    }\n\n    return url\n  }\n"],"names":["getAfterReadHook","adapter","collection","disablePayloadAccessControl","generateFileURL","size","data","value","filename","sizes","name","prefix","url","generateURL","separator","includes","encodeURIComponent"],"mappings":"AAYA,OAAO,MAAMA,mBACX,CAAC,EAAEC,OAAO,EAAEC,UAAU,EAAEC,2BAA2B,EAAEC,eAAe,EAAEC,IAAI,EAAQ,GAClF,OAAO,EAAEC,IAAI,EAAEC,KAAK,EAAE;QACpB,MAAMC,WAAWH,OAAOC,MAAMG,OAAO,CAACJ,KAAKK,IAAI,CAAC,EAAEF,WAAWF,MAAME;QACnE,MAAMG,SAASL,MAAMK;QACrB,IAAIC,MAAML;QAEV,IAAIC,UAAU;YACZ,IAAIJ,iBAAiB;gBACnBQ,MAAM,MAAMR,gBAAgB;oBAC1BF;oBACAM;oBACAG;oBACAN;gBACF;YACF,OAAO,IAAIF,+BAA+BF,QAAQY,WAAW,EAAE;gBAC7DD,MAAM,MAAMX,QAAQY,WAAW,CAAC;oBAC9BX;oBACAI;oBACAE;oBACAG;gBACF;YACF,OAAO,IAAIC,OAAOD,QAAQ;gBACxB,MAAMG,YAAYF,IAAIG,QAAQ,CAAC,OAAO,MAAM;gBAC5CH,MAAM,GAAGA,MAAME,UAAU,OAAO,EAAEE,mBAAmBL,SAAS;YAChE;QACF;QAEA,OAAOC;IACT,EAAC"}
+{"version":3,"sources":["../../src/hooks/afterRead.ts"],"sourcesContent":["import type { CollectionConfig, FieldHook, ImageSize } from 'payload'\n\nimport type { GeneratedAdapter, GenerateFileURL } from '../types.js'\n\nimport { buildPrefixWithObjectKey } from '../utilities/buildPrefixWithObjectKey.js'\n\ninterface Args {\n  adapter: GeneratedAdapter\n  collection: CollectionConfig\n  disablePayloadAccessControl?: boolean\n  generateFileURL?: GenerateFileURL\n  size?: ImageSize\n}\n\n// The object's folder: semantic prefix + `_objectKey` segment.\nconst getObjectFolder = (data: { _objectKey?: string; prefix?: string } | undefined): string => {\n  const record = (data ?? {}) as { _objectKey?: string; prefix?: string }\n  return buildPrefixWithObjectKey({ objectKey: record._objectKey, prefix: record.prefix })\n}\n\nexport const getAfterReadHook =\n  ({ adapter, collection, disablePayloadAccessControl, generateFileURL, size }: Args): FieldHook =>\n  async ({ data, value }) => {\n    const filename = size ? data?.sizes?.[size.name]?.filename : data?.filename\n    const prefix = data?.prefix\n    // Direct-serve URLs encode the full location; the proxy resolves `_objectKey` server-side.\n    const objectFolder = getObjectFolder(data)\n    let url = value\n\n    if (filename) {\n      if (generateFileURL) {\n        url = await generateFileURL({\n          collection,\n          filename,\n          prefix: objectFolder,\n          size,\n        })\n      } else if (disablePayloadAccessControl && adapter.generateURL) {\n        url = await adapter.generateURL({\n          collection,\n          data,\n          filename,\n          prefix: objectFolder,\n        })\n      } else if (url && prefix) {\n        const separator = url.includes('?') ? '&' : '?'\n        url = `${url}${separator}prefix=${encodeURIComponent(prefix)}`\n      }\n    }\n\n    return url\n  }\n"],"names":["buildPrefixWithObjectKey","getObjectFolder","data","record","objectKey","_objectKey","prefix","getAfterReadHook","adapter","collection","disablePayloadAccessControl","generateFileURL","size","value","filename","sizes","name","objectFolder","url","generateURL","separator","includes","encodeURIComponent"],"mappings":"AAIA,SAASA,wBAAwB,QAAQ,2CAA0C;AAUnF,+DAA+D;AAC/D,MAAMC,kBAAkB,CAACC;IACvB,MAAMC,SAAUD,QAAQ,CAAC;IACzB,OAAOF,yBAAyB;QAAEI,WAAWD,OAAOE,UAAU;QAAEC,QAAQH,OAAOG,MAAM;IAAC;AACxF;AAEA,OAAO,MAAMC,mBACX,CAAC,EAAEC,OAAO,EAAEC,UAAU,EAAEC,2BAA2B,EAAEC,eAAe,EAAEC,IAAI,EAAQ,GAClF,OAAO,EAAEV,IAAI,EAAEW,KAAK,EAAE;QACpB,MAAMC,WAAWF,OAAOV,MAAMa,OAAO,CAACH,KAAKI,IAAI,CAAC,EAAEF,WAAWZ,MAAMY;QACnE,MAAMR,SAASJ,MAAMI;QACrB,2FAA2F;QAC3F,MAAMW,eAAehB,gBAAgBC;QACrC,IAAIgB,MAAML;QAEV,IAAIC,UAAU;YACZ,IAAIH,iBAAiB;gBACnBO,MAAM,MAAMP,gBAAgB;oBAC1BF;oBACAK;oBACAR,QAAQW;oBACRL;gBACF;YACF,OAAO,IAAIF,+BAA+BF,QAAQW,WAAW,EAAE;gBAC7DD,MAAM,MAAMV,QAAQW,WAAW,CAAC;oBAC9BV;oBACAP;oBACAY;oBACAR,QAAQW;gBACV;YACF,OAAO,IAAIC,OAAOZ,QAAQ;gBACxB,MAAMc,YAAYF,IAAIG,QAAQ,CAAC,OAAO,MAAM;gBAC5CH,MAAM,GAAGA,MAAME,UAAU,OAAO,EAAEE,mBAAmBhB,SAAS;YAChE;QACF;QAEA,OAAOY;IACT,EAAC"}

package/dist/hooks/beforeChange.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"beforeChange.d.ts","sourceRoot":"","sources":["../../src/hooks/beforeChange.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAErE,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAEpE,UAAU,IAAI;IACZ,OAAO,EAAE,gBAAgB,CAAA;IACzB,UAAU,EAAE,gBAAgB,CAAA;IAC5B,2BAA2B,CAAC,EAAE,OAAO,CAAA;IACrC,eAAe,CAAC,EAAE,eAAe,CAAA;IACjC,IAAI,CAAC,EAAE,SAAS,CAAA;CACjB;AAED,eAAO,MAAM,mBAAmB,gFACgD,IAAI,KAAG,SA2BpF,CAAA"}
+{"version":3,"file":"beforeChange.d.ts","sourceRoot":"","sources":["../../src/hooks/beforeChange.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAErE,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAIpE,UAAU,IAAI;IACZ,OAAO,EAAE,gBAAgB,CAAA;IACzB,UAAU,EAAE,gBAAgB,CAAA;IAC5B,2BAA2B,CAAC,EAAE,OAAO,CAAA;IACrC,eAAe,CAAC,EAAE,eAAe,CAAA;IACjC,IAAI,CAAC,EAAE,SAAS,CAAA;CACjB;AAWD,eAAO,MAAM,mBAAmB,gFACgD,IAAI,KAAG,SA2BpF,CAAA"}

package/dist/hooks/beforeChange.js

@@ -1,8 +1,17 @@
+import { buildPrefixWithObjectKey } from '../utilities/buildPrefixWithObjectKey.js';
+// The object's folder: semantic prefix + `_objectKey` segment.
+const getObjectFolder = (data, originalDoc)=>{
+    const source = data ?? originalDoc ?? {};
+    return buildPrefixWithObjectKey({
+        objectKey: source._objectKey,
+        prefix: source.prefix
+    });
+};
 export const getBeforeChangeHook = ({ adapter, collection, disablePayloadAccessControl, generateFileURL, size })=>async ({ data, originalDoc, value })=>{
         const newFilename = size ? data?.sizes?.[size.name]?.filename : data?.filename;
         const originalFilename = size ? originalDoc?.sizes?.[size.name]?.filename : originalDoc?.filename;
         const filename = newFilename || originalFilename;
-        const prefix = data?.prefix;
+        const prefix = getObjectFolder(data, originalDoc);
         let url = value;
         if (generateFileURL && filename) {
             url = await generateFileURL({

package/dist/hooks/beforeChange.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/hooks/beforeChange.ts"],"sourcesContent":["import type { CollectionConfig, FieldHook, ImageSize } from 'payload'\n\nimport type { GeneratedAdapter, GenerateFileURL } from '../types.js'\n\ninterface Args {\n  adapter: GeneratedAdapter\n  collection: CollectionConfig\n  disablePayloadAccessControl?: boolean\n  generateFileURL?: GenerateFileURL\n  size?: ImageSize\n}\n\nexport const getBeforeChangeHook =\n  ({ adapter, collection, disablePayloadAccessControl, generateFileURL, size }: Args): FieldHook =>\n  async ({ data, originalDoc, value }) => {\n    const newFilename = size ? data?.sizes?.[size.name]?.filename : data?.filename\n    const originalFilename = size\n      ? originalDoc?.sizes?.[size.name]?.filename\n      : originalDoc?.filename\n    const filename = newFilename || originalFilename\n    const prefix = data?.prefix\n    let url = value\n\n    if (generateFileURL && filename) {\n      url = await generateFileURL({\n        collection,\n        filename,\n        prefix,\n        size,\n      })\n    } else if (disablePayloadAccessControl && filename && adapter.generateURL) {\n      url = await adapter.generateURL({\n        collection,\n        data: data || originalDoc,\n        filename,\n        prefix,\n      })\n    }\n\n    return url\n  }\n"],"names":["getBeforeChangeHook","adapter","collection","disablePayloadAccessControl","generateFileURL","size","data","originalDoc","value","newFilename","sizes","name","filename","originalFilename","prefix","url","generateURL"],"mappings":"AAYA,OAAO,MAAMA,sBACX,CAAC,EAAEC,OAAO,EAAEC,UAAU,EAAEC,2BAA2B,EAAEC,eAAe,EAAEC,IAAI,EAAQ,GAClF,OAAO,EAAEC,IAAI,EAAEC,WAAW,EAAEC,KAAK,EAAE;QACjC,MAAMC,cAAcJ,OAAOC,MAAMI,OAAO,CAACL,KAAKM,IAAI,CAAC,EAAEC,WAAWN,MAAMM;QACtE,MAAMC,mBAAmBR,OACrBE,aAAaG,OAAO,CAACL,KAAKM,IAAI,CAAC,EAAEC,WACjCL,aAAaK;QACjB,MAAMA,WAAWH,eAAeI;QAChC,MAAMC,SAASR,MAAMQ;QACrB,IAAIC,MAAMP;QAEV,IAAIJ,mBAAmBQ,UAAU;YAC/BG,MAAM,MAAMX,gBAAgB;gBAC1BF;gBACAU;gBACAE;gBACAT;YACF;QACF,OAAO,IAAIF,+BAA+BS,YAAYX,QAAQe,WAAW,EAAE;YACzED,MAAM,MAAMd,QAAQe,WAAW,CAAC;gBAC9Bd;gBACAI,MAAMA,QAAQC;gBACdK;gBACAE;YACF;QACF;QAEA,OAAOC;IACT,EAAC"}
+{"version":3,"sources":["../../src/hooks/beforeChange.ts"],"sourcesContent":["import type { CollectionConfig, FieldHook, ImageSize } from 'payload'\n\nimport type { GeneratedAdapter, GenerateFileURL } from '../types.js'\n\nimport { buildPrefixWithObjectKey } from '../utilities/buildPrefixWithObjectKey.js'\n\ninterface Args {\n  adapter: GeneratedAdapter\n  collection: CollectionConfig\n  disablePayloadAccessControl?: boolean\n  generateFileURL?: GenerateFileURL\n  size?: ImageSize\n}\n\n// The object's folder: semantic prefix + `_objectKey` segment.\nconst getObjectFolder = (data: unknown, originalDoc: unknown): string => {\n  const source = (data ?? originalDoc ?? {}) as { _objectKey?: string; prefix?: string }\n  return buildPrefixWithObjectKey({\n    objectKey: source._objectKey,\n    prefix: source.prefix,\n  })\n}\n\nexport const getBeforeChangeHook =\n  ({ adapter, collection, disablePayloadAccessControl, generateFileURL, size }: Args): FieldHook =>\n  async ({ data, originalDoc, value }) => {\n    const newFilename = size ? data?.sizes?.[size.name]?.filename : data?.filename\n    const originalFilename = size\n      ? originalDoc?.sizes?.[size.name]?.filename\n      : originalDoc?.filename\n    const filename = newFilename || originalFilename\n    const prefix = getObjectFolder(data, originalDoc)\n    let url = value\n\n    if (generateFileURL && filename) {\n      url = await generateFileURL({\n        collection,\n        filename,\n        prefix,\n        size,\n      })\n    } else if (disablePayloadAccessControl && filename && adapter.generateURL) {\n      url = await adapter.generateURL({\n        collection,\n        data: data || originalDoc,\n        filename,\n        prefix,\n      })\n    }\n\n    return url\n  }\n"],"names":["buildPrefixWithObjectKey","getObjectFolder","data","originalDoc","source","objectKey","_objectKey","prefix","getBeforeChangeHook","adapter","collection","disablePayloadAccessControl","generateFileURL","size","value","newFilename","sizes","name","filename","originalFilename","url","generateURL"],"mappings":"AAIA,SAASA,wBAAwB,QAAQ,2CAA0C;AAUnF,+DAA+D;AAC/D,MAAMC,kBAAkB,CAACC,MAAeC;IACtC,MAAMC,SAAUF,QAAQC,eAAe,CAAC;IACxC,OAAOH,yBAAyB;QAC9BK,WAAWD,OAAOE,UAAU;QAC5BC,QAAQH,OAAOG,MAAM;IACvB;AACF;AAEA,OAAO,MAAMC,sBACX,CAAC,EAAEC,OAAO,EAAEC,UAAU,EAAEC,2BAA2B,EAAEC,eAAe,EAAEC,IAAI,EAAQ,GAClF,OAAO,EAAEX,IAAI,EAAEC,WAAW,EAAEW,KAAK,EAAE;QACjC,MAAMC,cAAcF,OAAOX,MAAMc,OAAO,CAACH,KAAKI,IAAI,CAAC,EAAEC,WAAWhB,MAAMgB;QACtE,MAAMC,mBAAmBN,OACrBV,aAAaa,OAAO,CAACH,KAAKI,IAAI,CAAC,EAAEC,WACjCf,aAAae;QACjB,MAAMA,WAAWH,eAAeI;QAChC,MAAMZ,SAASN,gBAAgBC,MAAMC;QACrC,IAAIiB,MAAMN;QAEV,IAAIF,mBAAmBM,UAAU;YAC/BE,MAAM,MAAMR,gBAAgB;gBAC1BF;gBACAQ;gBACAX;gBACAM;YACF;QACF,OAAO,IAAIF,+BAA+BO,YAAYT,QAAQY,WAAW,EAAE;YACzED,MAAM,MAAMX,QAAQY,WAAW,CAAC;gBAC9BX;gBACAR,MAAMA,QAAQC;gBACde;gBACAX;YACF;QACF;QAEA,OAAOa;IACT,EAAC"}

package/dist/hooks/normalizeUploadPrefix.d.ts

@@ -0,0 +1,11 @@
+import type { CollectionBeforeChangeHook, FieldHook } from 'payload';
+type Args = {
+    collectionPrefix?: string;
+    useCompositePrefixes?: boolean;
+};
+/** Persist new upload destinations without reinterpreting metadata-only updates. */
+export declare const getNormalizeUploadPrefixHook: ({ collectionPrefix, useCompositePrefixes }: Args) => CollectionBeforeChangeHook;
+/** Run last on the prefix field so user hooks cannot leave stale storage coordinates. */
+export declare const getNormalizeUploadPrefixFieldHook: ({ collectionPrefix, useCompositePrefixes }: Args) => FieldHook;
+export {};
+//# sourceMappingURL=normalizeUploadPrefix.d.ts.map

package/dist/hooks/normalizeUploadPrefix.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"normalizeUploadPrefix.d.ts","sourceRoot":"","sources":["../../src/hooks/normalizeUploadPrefix.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,0BAA0B,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAIpE,KAAK,IAAI,GAAG;IACV,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B,CAAA;AAiBD,oFAAoF;AACpF,eAAO,MAAM,4BAA4B,+CACM,IAAI,KAAG,0BAiBnD,CAAA;AAEH,yFAAyF;AACzF,eAAO,MAAM,iCAAiC,+CACC,IAAI,KAAG,SAenD,CAAA"}

package/dist/hooks/normalizeUploadPrefix.js

@@ -0,0 +1,42 @@
+import { buildUploadPrefix } from '../utilities/buildStoragePathData.js';
+/**
+ * A prefix the caller did not supply, or supplied unchanged, is left as stored so
+ * pre-upgrade files keep resolving to their original object keys. Anything the caller
+ * chooses is contained, because `prefix` is writable through the REST, GraphQL and
+ * Local APIs and the read path trusts whatever is persisted.
+ */ const isPrefixSupplied = ({ storedPrefix, value })=>typeof value === 'string' && value !== (typeof storedPrefix === 'string' ? storedPrefix : '');
+/** Persist new upload destinations without reinterpreting metadata-only updates. */ export const getNormalizeUploadPrefixHook = ({ collectionPrefix, useCompositePrefixes })=>({ data, originalDoc, req })=>{
+        if (req.context?.skipCloudStorage) {
+            return data;
+        }
+        if (!req.file && !isPrefixSupplied({
+            storedPrefix: originalDoc?.prefix,
+            value: data.prefix
+        })) {
+            return data;
+        }
+        data.prefix = buildUploadPrefix({
+            collectionPrefix,
+            docPrefix: typeof data.prefix === 'string' ? data.prefix : '',
+            useCompositePrefixes
+        }).sanitizedDocPrefix;
+        return data;
+    };
+/** Run last on the prefix field so user hooks cannot leave stale storage coordinates. */ export const getNormalizeUploadPrefixFieldHook = ({ collectionPrefix, useCompositePrefixes })=>({ previousValue, req, value })=>{
+        if (req.context?.skipCloudStorage) {
+            return value;
+        }
+        if (!req.file && !isPrefixSupplied({
+            storedPrefix: previousValue,
+            value
+        })) {
+            return value;
+        }
+        return buildUploadPrefix({
+            collectionPrefix,
+            docPrefix: typeof value === 'string' ? value : '',
+            useCompositePrefixes
+        }).sanitizedDocPrefix;
+    };
+
+//# sourceMappingURL=normalizeUploadPrefix.js.map

package/dist/hooks/normalizeUploadPrefix.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/hooks/normalizeUploadPrefix.ts"],"sourcesContent":["import type { CollectionBeforeChangeHook, FieldHook } from 'payload'\n\nimport { buildUploadPrefix } from '../utilities/buildStoragePathData.js'\n\ntype Args = {\n  collectionPrefix?: string\n  useCompositePrefixes?: boolean\n}\n\n/**\n * A prefix the caller did not supply, or supplied unchanged, is left as stored so\n * pre-upgrade files keep resolving to their original object keys. Anything the caller\n * chooses is contained, because `prefix` is writable through the REST, GraphQL and\n * Local APIs and the read path trusts whatever is persisted.\n */\nconst isPrefixSupplied = ({\n  storedPrefix,\n  value,\n}: {\n  storedPrefix: unknown\n  value: unknown\n}): boolean =>\n  typeof value === 'string' && value !== (typeof storedPrefix === 'string' ? storedPrefix : '')\n\n/** Persist new upload destinations without reinterpreting metadata-only updates. */\nexport const getNormalizeUploadPrefixHook =\n  ({ collectionPrefix, useCompositePrefixes }: Args): CollectionBeforeChangeHook =>\n  ({ data, originalDoc, req }) => {\n    if (req.context?.skipCloudStorage) {\n      return data\n    }\n\n    if (!req.file && !isPrefixSupplied({ storedPrefix: originalDoc?.prefix, value: data.prefix })) {\n      return data\n    }\n\n    data.prefix = buildUploadPrefix({\n      collectionPrefix,\n      docPrefix: typeof data.prefix === 'string' ? data.prefix : '',\n      useCompositePrefixes,\n    }).sanitizedDocPrefix\n\n    return data\n  }\n\n/** Run last on the prefix field so user hooks cannot leave stale storage coordinates. */\nexport const getNormalizeUploadPrefixFieldHook =\n  ({ collectionPrefix, useCompositePrefixes }: Args): FieldHook =>\n  ({ previousValue, req, value }) => {\n    if (req.context?.skipCloudStorage) {\n      return value\n    }\n\n    if (!req.file && !isPrefixSupplied({ storedPrefix: previousValue, value })) {\n      return value\n    }\n\n    return buildUploadPrefix({\n      collectionPrefix,\n      docPrefix: typeof value === 'string' ? value : '',\n      useCompositePrefixes,\n    }).sanitizedDocPrefix\n  }\n"],"names":["buildUploadPrefix","isPrefixSupplied","storedPrefix","value","getNormalizeUploadPrefixHook","collectionPrefix","useCompositePrefixes","data","originalDoc","req","context","skipCloudStorage","file","prefix","docPrefix","sanitizedDocPrefix","getNormalizeUploadPrefixFieldHook","previousValue"],"mappings":"AAEA,SAASA,iBAAiB,QAAQ,uCAAsC;AAOxE;;;;;CAKC,GACD,MAAMC,mBAAmB,CAAC,EACxBC,YAAY,EACZC,KAAK,EAIN,GACC,OAAOA,UAAU,YAAYA,UAAW,CAAA,OAAOD,iBAAiB,WAAWA,eAAe,EAAC;AAE7F,kFAAkF,GAClF,OAAO,MAAME,+BACX,CAAC,EAAEC,gBAAgB,EAAEC,oBAAoB,EAAQ,GACjD,CAAC,EAAEC,IAAI,EAAEC,WAAW,EAAEC,GAAG,EAAE;QACzB,IAAIA,IAAIC,OAAO,EAAEC,kBAAkB;YACjC,OAAOJ;QACT;QAEA,IAAI,CAACE,IAAIG,IAAI,IAAI,CAACX,iBAAiB;YAAEC,cAAcM,aAAaK;YAAQV,OAAOI,KAAKM,MAAM;QAAC,IAAI;YAC7F,OAAON;QACT;QAEAA,KAAKM,MAAM,GAAGb,kBAAkB;YAC9BK;YACAS,WAAW,OAAOP,KAAKM,MAAM,KAAK,WAAWN,KAAKM,MAAM,GAAG;YAC3DP;QACF,GAAGS,kBAAkB;QAErB,OAAOR;IACT,EAAC;AAEH,uFAAuF,GACvF,OAAO,MAAMS,oCACX,CAAC,EAAEX,gBAAgB,EAAEC,oBAAoB,EAAQ,GACjD,CAAC,EAAEW,aAAa,EAAER,GAAG,EAAEN,KAAK,EAAE;QAC5B,IAAIM,IAAIC,OAAO,EAAEC,kBAAkB;YACjC,OAAOR;QACT;QAEA,IAAI,CAACM,IAAIG,IAAI,IAAI,CAACX,iBAAiB;YAAEC,cAAce;YAAed;QAAM,IAAI;YAC1E,OAAOA;QACT;QAEA,OAAOH,kBAAkB;YACvBK;YACAS,WAAW,OAAOX,UAAU,WAAWA,QAAQ;YAC/CG;QACF,GAAGS,kBAAkB;IACvB,EAAC"}

package/dist/hooks/normalizeUploadPrefix.spec.js

@@ -0,0 +1,154 @@
+import { describe, expect, it } from 'vitest';
+import { getFields } from '../fields/getFields.js';
+import { getNormalizeUploadPrefixFieldHook, getNormalizeUploadPrefixHook } from './normalizeUploadPrefix.js';
+const runHook = ({ data, originalDoc, req = {
+    context: {},
+    file: {}
+} })=>getNormalizeUploadPrefixHook({
+        collectionPrefix: 'media'
+    })({
+        data,
+        originalDoc,
+        req
+    });
+describe('new upload prefixes', ()=>{
+    it('should normalize after custom prefix field hooks', async ()=>{
+        const fields = getFields({
+            collection: {
+                fields: [
+                    {
+                        name: 'prefix',
+                        type: 'text',
+                        hooks: {
+                            beforeChange: [
+                                ()=>'custom'
+                            ]
+                        }
+                    }
+                ]
+            },
+            prefix: 'media'
+        });
+        const field = fields.find((field)=>'name' in field && field.name === 'prefix');
+        let value = 'original';
+        for (const hook of field.hooks?.beforeChange || []){
+            value = await hook({
+                value,
+                data: {
+                    filename: 'file.png'
+                },
+                req: {
+                    file: {},
+                    context: {}
+                }
+            });
+        }
+        expect(value).toBe('media/custom');
+    });
+    it('should contain a prefix supplied with a file upload', async ()=>{
+        const result = await runHook({
+            data: {
+                filename: 'file.png',
+                prefix: 'legacy'
+            }
+        });
+        expect(result.prefix).toBe('media/legacy');
+    });
+    it('should leave internal cloud storage writes alone', async ()=>{
+        const result = await runHook({
+            data: {
+                filename: 'file.png',
+                prefix: 'legacy'
+            },
+            req: {
+                context: {
+                    skipCloudStorage: true
+                },
+                file: {}
+            }
+        });
+        expect(result.prefix).toBe('legacy');
+    });
+    /**
+   * The `prefix` field is writable through the REST/GraphQL/Local API, so a request
+   * carrying no file must not be able to point a document at a foreign object.
+   */ it('should contain a caller-supplied prefix on a metadata-only update', async ()=>{
+        const result = await runHook({
+            data: {
+                prefix: 'tenant-b/private'
+            },
+            originalDoc: {
+                prefix: 'media/legacy'
+            },
+            req: {
+                context: {}
+            }
+        });
+        expect(result.prefix).toBe('media/tenant-b/private');
+    });
+    it('should contain a caller-supplied prefix on a create without a file', async ()=>{
+        const result = await runHook({
+            data: {
+                prefix: 'tenant-b/private'
+            },
+            req: {
+                context: {}
+            }
+        });
+        expect(result.prefix).toBe('media/tenant-b/private');
+    });
+    it('should leave a stored prefix alone when the request omits it', async ()=>{
+        const result = await runHook({
+            data: {
+                filename: 'legacy.png'
+            },
+            originalDoc: {
+                prefix: 'legacy-invoices'
+            },
+            req: {
+                context: {}
+            }
+        });
+        expect(result.prefix).toBeUndefined();
+    });
+    it('should leave a stored prefix alone when the request repeats it unchanged', async ()=>{
+        const result = await runHook({
+            data: {
+                prefix: 'legacy-invoices'
+            },
+            originalDoc: {
+                prefix: 'legacy-invoices'
+            },
+            req: {
+                context: {}
+            }
+        });
+        expect(result.prefix).toBe('legacy-invoices');
+    });
+    describe('prefix field hook', ()=>{
+        const runFieldHook = ({ previousValue, req = {
+            context: {}
+        }, value })=>getNormalizeUploadPrefixFieldHook({
+                collectionPrefix: 'media'
+            })({
+                data: {},
+                previousValue,
+                req,
+                value
+            });
+        it('should contain a caller-supplied value without a file', async ()=>{
+            expect(await runFieldHook({
+                previousValue: 'media/legacy',
+                value: 'tenant-b/private'
+            })).toBe('media/tenant-b/private');
+        });
+        it('should leave an unchanged value alone', async ()=>{
+            expect(await runFieldHook({
+                previousValue: 'legacy-invoices',
+                value: 'legacy-invoices'
+            })).toBe('legacy-invoices');
+        });
+    });
+});
+
+//# sourceMappingURL=normalizeUploadPrefix.spec.js.map

package/dist/hooks/normalizeUploadPrefix.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/hooks/normalizeUploadPrefix.spec.ts"],"sourcesContent":["import type { CollectionConfig, TextField } from 'payload'\n\nimport { describe, expect, it } from 'vitest'\n\nimport { getFields } from '../fields/getFields.js'\nimport {\n  getNormalizeUploadPrefixFieldHook,\n  getNormalizeUploadPrefixHook,\n} from './normalizeUploadPrefix.js'\n\nconst runHook = ({\n  data,\n  originalDoc,\n  req = { context: {}, file: {} },\n}: {\n  data: Record<string, unknown>\n  originalDoc?: Record<string, unknown>\n  req?: Record<string, unknown>\n}) =>\n  getNormalizeUploadPrefixHook({ collectionPrefix: 'media' })({\n    data,\n    originalDoc,\n    req,\n  } as never)\n\ndescribe('new upload prefixes', () => {\n  it('should normalize after custom prefix field hooks', async () => {\n    const fields = getFields({\n      collection: {\n        fields: [{ name: 'prefix', type: 'text', hooks: { beforeChange: [() => 'custom'] } }],\n      } as CollectionConfig,\n      prefix: 'media',\n    })\n    const field = fields.find((field) => 'name' in field && field.name === 'prefix') as TextField\n    let value = 'original'\n\n    for (const hook of field.hooks?.beforeChange || []) {\n      value = await hook({\n        value,\n        data: { filename: 'file.png' },\n        req: { file: {}, context: {} },\n      } as never)\n    }\n\n    expect(value).toBe('media/custom')\n  })\n\n  it('should contain a prefix supplied with a file upload', async () => {\n    const result = await runHook({ data: { filename: 'file.png', prefix: 'legacy' } })\n\n    expect(result.prefix).toBe('media/legacy')\n  })\n\n  it('should leave internal cloud storage writes alone', async () => {\n    const result = await runHook({\n      data: { filename: 'file.png', prefix: 'legacy' },\n      req: { context: { skipCloudStorage: true }, file: {} },\n    })\n\n    expect(result.prefix).toBe('legacy')\n  })\n\n  /**\n   * The `prefix` field is writable through the REST/GraphQL/Local API, so a request\n   * carrying no file must not be able to point a document at a foreign object.\n   */\n  it('should contain a caller-supplied prefix on a metadata-only update', async () => {\n    const result = await runHook({\n      data: { prefix: 'tenant-b/private' },\n      originalDoc: { prefix: 'media/legacy' },\n      req: { context: {} },\n    })\n\n    expect(result.prefix).toBe('media/tenant-b/private')\n  })\n\n  it('should contain a caller-supplied prefix on a create without a file', async () => {\n    const result = await runHook({\n      data: { prefix: 'tenant-b/private' },\n      req: { context: {} },\n    })\n\n    expect(result.prefix).toBe('media/tenant-b/private')\n  })\n\n  it('should leave a stored prefix alone when the request omits it', async () => {\n    const result = await runHook({\n      data: { filename: 'legacy.png' },\n      originalDoc: { prefix: 'legacy-invoices' },\n      req: { context: {} },\n    })\n\n    expect(result.prefix).toBeUndefined()\n  })\n\n  it('should leave a stored prefix alone when the request repeats it unchanged', async () => {\n    const result = await runHook({\n      data: { prefix: 'legacy-invoices' },\n      originalDoc: { prefix: 'legacy-invoices' },\n      req: { context: {} },\n    })\n\n    expect(result.prefix).toBe('legacy-invoices')\n  })\n\n  describe('prefix field hook', () => {\n    const runFieldHook = ({\n      previousValue,\n      req = { context: {} },\n      value,\n    }: {\n      previousValue?: string\n      req?: Record<string, unknown>\n      value: unknown\n    }) =>\n      getNormalizeUploadPrefixFieldHook({ collectionPrefix: 'media' })({\n        data: {},\n        previousValue,\n        req,\n        value,\n      } as never)\n\n    it('should contain a caller-supplied value without a file', async () => {\n      expect(await runFieldHook({ previousValue: 'media/legacy', value: 'tenant-b/private' })).toBe(\n        'media/tenant-b/private',\n      )\n    })\n\n    it('should leave an unchanged value alone', async () => {\n      expect(\n        await runFieldHook({ previousValue: 'legacy-invoices', value: 'legacy-invoices' }),\n      ).toBe('legacy-invoices')\n    })\n  })\n})\n"],"names":["describe","expect","it","getFields","getNormalizeUploadPrefixFieldHook","getNormalizeUploadPrefixHook","runHook","data","originalDoc","req","context","file","collectionPrefix","fields","collection","name","type","hooks","beforeChange","prefix","field","find","value","hook","filename","toBe","result","skipCloudStorage","toBeUndefined","runFieldHook","previousValue"],"mappings":"AAEA,SAASA,QAAQ,EAAEC,MAAM,EAAEC,EAAE,QAAQ,SAAQ;AAE7C,SAASC,SAAS,QAAQ,yBAAwB;AAClD,SACEC,iCAAiC,EACjCC,4BAA4B,QACvB,6BAA4B;AAEnC,MAAMC,UAAU,CAAC,EACfC,IAAI,EACJC,WAAW,EACXC,MAAM;IAAEC,SAAS,CAAC;IAAGC,MAAM,CAAC;AAAE,CAAC,EAKhC,GACCN,6BAA6B;QAAEO,kBAAkB;IAAQ,GAAG;QAC1DL;QACAC;QACAC;IACF;AAEFT,SAAS,uBAAuB;IAC9BE,GAAG,oDAAoD;QACrD,MAAMW,SAASV,UAAU;YACvBW,YAAY;gBACVD,QAAQ;oBAAC;wBAAEE,MAAM;wBAAUC,MAAM;wBAAQC,OAAO;4BAAEC,cAAc;gCAAC,IAAM;6BAAS;wBAAC;oBAAE;iBAAE;YACvF;YACAC,QAAQ;QACV;QACA,MAAMC,QAAQP,OAAOQ,IAAI,CAAC,CAACD,QAAU,UAAUA,SAASA,MAAML,IAAI,KAAK;QACvE,IAAIO,QAAQ;QAEZ,KAAK,MAAMC,QAAQH,MAAMH,KAAK,EAAEC,gBAAgB,EAAE,CAAE;YAClDI,QAAQ,MAAMC,KAAK;gBACjBD;gBACAf,MAAM;oBAAEiB,UAAU;gBAAW;gBAC7Bf,KAAK;oBAAEE,MAAM,CAAC;oBAAGD,SAAS,CAAC;gBAAE;YAC/B;QACF;QAEAT,OAAOqB,OAAOG,IAAI,CAAC;IACrB;IAEAvB,GAAG,uDAAuD;QACxD,MAAMwB,SAAS,MAAMpB,QAAQ;YAAEC,MAAM;gBAAEiB,UAAU;gBAAYL,QAAQ;YAAS;QAAE;QAEhFlB,OAAOyB,OAAOP,MAAM,EAAEM,IAAI,CAAC;IAC7B;IAEAvB,GAAG,oDAAoD;QACrD,MAAMwB,SAAS,MAAMpB,QAAQ;YAC3BC,MAAM;gBAAEiB,UAAU;gBAAYL,QAAQ;YAAS;YAC/CV,KAAK;gBAAEC,SAAS;oBAAEiB,kBAAkB;gBAAK;gBAAGhB,MAAM,CAAC;YAAE;QACvD;QAEAV,OAAOyB,OAAOP,MAAM,EAAEM,IAAI,CAAC;IAC7B;IAEA;;;GAGC,GACDvB,GAAG,qEAAqE;QACtE,MAAMwB,SAAS,MAAMpB,QAAQ;YAC3BC,MAAM;gBAAEY,QAAQ;YAAmB;YACnCX,aAAa;gBAAEW,QAAQ;YAAe;YACtCV,KAAK;gBAAEC,SAAS,CAAC;YAAE;QACrB;QAEAT,OAAOyB,OAAOP,MAAM,EAAEM,IAAI,CAAC;IAC7B;IAEAvB,GAAG,sEAAsE;QACvE,MAAMwB,SAAS,MAAMpB,QAAQ;YAC3BC,MAAM;gBAAEY,QAAQ;YAAmB;YACnCV,KAAK;gBAAEC,SAAS,CAAC;YAAE;QACrB;QAEAT,OAAOyB,OAAOP,MAAM,EAAEM,IAAI,CAAC;IAC7B;IAEAvB,GAAG,gEAAgE;QACjE,MAAMwB,SAAS,MAAMpB,QAAQ;YAC3BC,MAAM;gBAAEiB,UAAU;YAAa;YAC/BhB,aAAa;gBAAEW,QAAQ;YAAkB;YACzCV,KAAK;gBAAEC,SAAS,CAAC;YAAE;QACrB;QAEAT,OAAOyB,OAAOP,MAAM,EAAES,aAAa;IACrC;IAEA1B,GAAG,4EAA4E;QAC7E,MAAMwB,SAAS,MAAMpB,QAAQ;YAC3BC,MAAM;gBAAEY,QAAQ;YAAkB;YAClCX,aAAa;gBAAEW,QAAQ;YAAkB;YACzCV,KAAK;gBAAEC,SAAS,CAAC;YAAE;QACrB;QAEAT,OAAOyB,OAAOP,MAAM,EAAEM,IAAI,CAAC;IAC7B;IAEAzB,SAAS,qBAAqB;QAC5B,MAAM6B,eAAe,CAAC,EACpBC,aAAa,EACbrB,MAAM;YAAEC,SAAS,CAAC;QAAE,CAAC,EACrBY,KAAK,EAKN,GACClB,kCAAkC;gBAAEQ,kBAAkB;YAAQ,GAAG;gBAC/DL,MAAM,CAAC;gBACPuB;gBACArB;gBACAa;YACF;QAEFpB,GAAG,yDAAyD;YAC1DD,OAAO,MAAM4B,aAAa;gBAAEC,eAAe;gBAAgBR,OAAO;YAAmB,IAAIG,IAAI,CAC3F;QAEJ;QAEAvB,GAAG,yCAAyC;YAC1CD,OACE,MAAM4B,aAAa;gBAAEC,eAAe;gBAAmBR,OAAO;YAAkB,IAChFG,IAAI,CAAC;QACT;IACF;AACF"}

package/dist/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAErC,OAAO,KAAK,EAAa,aAAa,EAAE,MAAM,YAAY,CAAA;AAgB1D,eAAO,MAAM,kBAAkB,kBACb,aAAa,sBACZ,MAAM,KAAG,MAgLzB,CAAA"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAErC,OAAO,KAAK,EAAa,aAAa,EAAE,MAAM,YAAY,CAAA;AAiB1D,eAAO,MAAM,kBAAkB,kBACb,aAAa,sBACZ,MAAM,KAAG,MA8LzB,CAAA"}

package/dist/plugin.js

@@ -1,6 +1,7 @@
 import { getFields } from './fields/getFields.js';
 import { getAfterChangeHook } from './hooks/afterChange.js';
 import { getAfterDeleteHook } from './hooks/afterDelete.js';
+import { getNormalizeUploadPrefixHook } from './hooks/normalizeUploadPrefix.js';
 import { getPreserveFileDataHook } from './hooks/preserveFileData.js';
 // This plugin extends all targeted collections by offloading uploaded files
 // to cloud storage instead of solely storing files locally.
@@ -82,9 +83,6 @@ export const cloudStoragePlugin = (pluginOptions)=>(incomingConfig)=>{
                         });
                     }
                     const getSkipSafeFetchSetting = ()=>{
-                        if (options.disablePayloadAccessControl) {
-                            return true;
-                        }
                         const isBooleanTrueSkipSafeFetch = typeof existingCollection.upload === 'object' && existingCollection.upload.skipSafeFetch === true;
                         const isAllowListSkipSafeFetch = typeof existingCollection.upload === 'object' && Array.isArray(existingCollection.upload.skipSafeFetch);
                         if (isBooleanTrueSkipSafeFetch) {
@@ -123,18 +121,26 @@ export const cloudStoragePlugin = (pluginOptions)=>(incomingConfig)=>{
                                 ...existingCollection.hooks?.afterChange || [],
                                 getAfterChangeHook({
                                     adapter,
-                                    collection: existingCollection
+                                    collection: existingCollection,
+                                    collectionPrefix: options.prefix,
+                                    useCompositePrefixes
                                 })
                             ],
                             afterDelete: [
                                 ...existingCollection.hooks?.afterDelete || [],
                                 getAfterDeleteHook({
                                     adapter,
-                                    collection: existingCollection
+                                    collection: existingCollection,
+                                    collectionPrefix: options.prefix,
+                                    useCompositePrefixes
                                 })
                             ],
                             beforeChange: [
                                 ...existingCollection.hooks?.beforeChange || [],
+                                getNormalizeUploadPrefixHook({
+                                    collectionPrefix: options.prefix,
+                                    useCompositePrefixes
+                                }),
                                 getPreserveFileDataHook()
                             ]
                         },
@@ -143,6 +149,7 @@ export const cloudStoragePlugin = (pluginOptions)=>(incomingConfig)=>{
                             adapter: adapter.name,
                             disableLocalStorage: typeof options.disableLocalStorage === 'boolean' ? options.disableLocalStorage : true,
                             handlers,
+                            requiresClientUploadReceipt: adapter.requiresClientUploadReceipt,
                             skipSafeFetch: getSkipSafeFetchSetting()
                         }
                     };
@@ -150,7 +157,9 @@ export const cloudStoragePlugin = (pluginOptions)=>(incomingConfig)=>{
                 return existingCollection;
             }),
             onInit: async (payload)=>{
-                initFunctions.forEach((fn)=>fn());
+                // Await each init so a provisioning failure fails Payload startup
+                // instead of becoming an unhandled rejection.
+                await Promise.all(initFunctions.map((fn)=>fn()));
                 if (config.onInit) {
                     await config.onInit(payload);
                 }

package/dist/plugin.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/plugin.ts"],"sourcesContent":["import type { Config } from 'payload'\n\nimport type { AllowList, PluginOptions } from './types.js'\n\nimport { getFields } from './fields/getFields.js'\nimport { getAfterChangeHook } from './hooks/afterChange.js'\nimport { getAfterDeleteHook } from './hooks/afterDelete.js'\nimport { getPreserveFileDataHook } from './hooks/preserveFileData.js'\n\n// This plugin extends all targeted collections by offloading uploaded files\n// to cloud storage instead of solely storing files locally.\n\n// It is based on an adapter approach, where adapters can be written for any cloud provider.\n// Adapters are responsible for providing four actions that this plugin will use:\n// 1. handleUpload, 2. handleDelete, 3. generateURL, 4. staticHandler\n\n// Optionally, the adapter can specify any Webpack config overrides if they are necessary.\n\nexport const cloudStoragePlugin =\n  (pluginOptions: PluginOptions) =>\n  (incomingConfig: Config): Config => {\n    const {\n      alwaysInsertFields,\n      collections: allCollectionOptions,\n      enabled,\n      useCompositePrefixes,\n    } = pluginOptions\n    const config = { ...incomingConfig }\n\n    // If disabled but alwaysInsertFields is true, only insert fields without full plugin functionality\n    if (enabled === false) {\n      if (alwaysInsertFields) {\n        return {\n          ...config,\n          collections: (config.collections || []).map((existingCollection) => {\n            const options = allCollectionOptions[existingCollection.slug]\n\n            if (options) {\n              // If adapter is provided, use it to get fields\n              const adapter = options.adapter\n                ? options.adapter({\n                    collection: existingCollection,\n                    prefix: options.prefix,\n                  })\n                : undefined\n\n              const fields = getFields({\n                adapter,\n                alwaysInsertFields: true,\n                collection: existingCollection,\n                disablePayloadAccessControl: options.disablePayloadAccessControl,\n                generateFileURL: options.generateFileURL,\n                prefix: options.prefix,\n                useCompositePrefixes,\n              })\n\n              return {\n                ...existingCollection,\n                fields,\n              }\n            }\n\n            return existingCollection\n          }),\n        }\n      }\n\n      return config\n    }\n\n    const initFunctions: Array<() => void> = []\n\n    return {\n      ...config,\n      collections: (config.collections || []).map((existingCollection) => {\n        const options = allCollectionOptions[existingCollection.slug]\n\n        if (options?.adapter) {\n          const adapter = options.adapter({\n            collection: existingCollection,\n            prefix: options.prefix,\n          })\n\n          if (adapter.onInit) {\n            initFunctions.push(adapter.onInit)\n          }\n\n          const fields = getFields({\n            adapter,\n            collection: existingCollection,\n            disablePayloadAccessControl: options.disablePayloadAccessControl,\n            generateFileURL: options.generateFileURL,\n            prefix: options.prefix,\n            useCompositePrefixes,\n          })\n\n          const handlers = [\n            ...(typeof existingCollection.upload === 'object' &&\n            Array.isArray(existingCollection.upload.handlers)\n              ? existingCollection.upload.handlers\n              : []),\n          ]\n\n          if (!options.disablePayloadAccessControl) {\n            handlers.push(adapter.staticHandler)\n            // Else if disablePayloadAccessControl: true and clientUploads is used\n            // Build the \"proxied\" handler that responses only when the file was requested by client upload in addDataAndFileToRequest\n          } else if (adapter.clientUploads) {\n            handlers.push((req, args) => {\n              if ('clientUploadContext' in args.params) {\n                return adapter.staticHandler(req, args)\n              }\n            })\n          }\n\n          const getSkipSafeFetchSetting = (): AllowList | boolean => {\n            if (options.disablePayloadAccessControl) {\n              return true\n            }\n            const isBooleanTrueSkipSafeFetch =\n              typeof existingCollection.upload === 'object' &&\n              existingCollection.upload.skipSafeFetch === true\n\n            const isAllowListSkipSafeFetch =\n              typeof existingCollection.upload === 'object' &&\n              Array.isArray(existingCollection.upload.skipSafeFetch)\n\n            if (isBooleanTrueSkipSafeFetch) {\n              return true\n            } else if (isAllowListSkipSafeFetch) {\n              const existingSkipSafeFetch =\n                typeof existingCollection.upload === 'object' &&\n                Array.isArray(existingCollection.upload.skipSafeFetch)\n                  ? existingCollection.upload.skipSafeFetch\n                  : []\n\n              const hasExactLocalhostMatch = existingSkipSafeFetch.some((entry) => {\n                const entryKeys = Object.keys(entry)\n                return entryKeys.length === 1 && entry.hostname === 'localhost'\n              })\n\n              const localhostEntry =\n                process.env.NODE_ENV !== 'production' && !hasExactLocalhostMatch\n                  ? [{ hostname: 'localhost' }]\n                  : []\n\n              return [...existingSkipSafeFetch, ...localhostEntry]\n            }\n\n            if (process.env.NODE_ENV !== 'production') {\n              return [{ hostname: 'localhost' }]\n            }\n\n            return false\n          }\n\n          return {\n            ...existingCollection,\n            fields,\n            hooks: {\n              ...(existingCollection.hooks || {}),\n              afterChange: [\n                ...(existingCollection.hooks?.afterChange || []),\n                getAfterChangeHook({ adapter, collection: existingCollection }),\n              ],\n              afterDelete: [\n                ...(existingCollection.hooks?.afterDelete || []),\n                getAfterDeleteHook({ adapter, collection: existingCollection }),\n              ],\n              beforeChange: [\n                ...(existingCollection.hooks?.beforeChange || []),\n                getPreserveFileDataHook(),\n              ],\n            },\n            upload: {\n              ...(typeof existingCollection.upload === 'object' ? existingCollection.upload : {}),\n              adapter: adapter.name,\n              disableLocalStorage:\n                typeof options.disableLocalStorage === 'boolean'\n                  ? options.disableLocalStorage\n                  : true,\n              handlers,\n              skipSafeFetch: getSkipSafeFetchSetting(),\n            },\n          }\n        }\n\n        return existingCollection\n      }),\n      onInit: async (payload) => {\n        initFunctions.forEach((fn) => fn())\n        if (config.onInit) {\n          await config.onInit(payload)\n        }\n      },\n    }\n  }\n"],"names":["getFields","getAfterChangeHook","getAfterDeleteHook","getPreserveFileDataHook","cloudStoragePlugin","pluginOptions","incomingConfig","alwaysInsertFields","collections","allCollectionOptions","enabled","useCompositePrefixes","config","map","existingCollection","options","slug","adapter","collection","prefix","undefined","fields","disablePayloadAccessControl","generateFileURL","initFunctions","onInit","push","handlers","upload","Array","isArray","staticHandler","clientUploads","req","args","params","getSkipSafeFetchSetting","isBooleanTrueSkipSafeFetch","skipSafeFetch","isAllowListSkipSafeFetch","existingSkipSafeFetch","hasExactLocalhostMatch","some","entry","entryKeys","Object","keys","length","hostname","localhostEntry","process","env","NODE_ENV","hooks","afterChange","afterDelete","beforeChange","name","disableLocalStorage","payload","forEach","fn"],"mappings":"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"}
+{"version":3,"sources":["../src/plugin.ts"],"sourcesContent":["import type { Config } from 'payload'\n\nimport type { AllowList, PluginOptions } from './types.js'\n\nimport { getFields } from './fields/getFields.js'\nimport { getAfterChangeHook } from './hooks/afterChange.js'\nimport { getAfterDeleteHook } from './hooks/afterDelete.js'\nimport { getNormalizeUploadPrefixHook } from './hooks/normalizeUploadPrefix.js'\nimport { getPreserveFileDataHook } from './hooks/preserveFileData.js'\n\n// This plugin extends all targeted collections by offloading uploaded files\n// to cloud storage instead of solely storing files locally.\n\n// It is based on an adapter approach, where adapters can be written for any cloud provider.\n// Adapters are responsible for providing four actions that this plugin will use:\n// 1. handleUpload, 2. handleDelete, 3. generateURL, 4. staticHandler\n\n// Optionally, the adapter can specify any Webpack config overrides if they are necessary.\n\nexport const cloudStoragePlugin =\n  (pluginOptions: PluginOptions) =>\n  (incomingConfig: Config): Config => {\n    const {\n      alwaysInsertFields,\n      collections: allCollectionOptions,\n      enabled,\n      useCompositePrefixes,\n    } = pluginOptions\n    const config = { ...incomingConfig }\n\n    // If disabled but alwaysInsertFields is true, only insert fields without full plugin functionality\n    if (enabled === false) {\n      if (alwaysInsertFields) {\n        return {\n          ...config,\n          collections: (config.collections || []).map((existingCollection) => {\n            const options = allCollectionOptions[existingCollection.slug]\n\n            if (options) {\n              // If adapter is provided, use it to get fields\n              const adapter = options.adapter\n                ? options.adapter({\n                    collection: existingCollection,\n                    prefix: options.prefix,\n                  })\n                : undefined\n\n              const fields = getFields({\n                adapter,\n                alwaysInsertFields: true,\n                collection: existingCollection,\n                disablePayloadAccessControl: options.disablePayloadAccessControl,\n                generateFileURL: options.generateFileURL,\n                prefix: options.prefix,\n                useCompositePrefixes,\n              })\n\n              return {\n                ...existingCollection,\n                fields,\n              }\n            }\n\n            return existingCollection\n          }),\n        }\n      }\n\n      return config\n    }\n\n    const initFunctions: Array<() => Promise<void> | void> = []\n\n    return {\n      ...config,\n      collections: (config.collections || []).map((existingCollection) => {\n        const options = allCollectionOptions[existingCollection.slug]\n\n        if (options?.adapter) {\n          const adapter = options.adapter({\n            collection: existingCollection,\n            prefix: options.prefix,\n          })\n\n          if (adapter.onInit) {\n            initFunctions.push(adapter.onInit)\n          }\n\n          const fields = getFields({\n            adapter,\n            collection: existingCollection,\n            disablePayloadAccessControl: options.disablePayloadAccessControl,\n            generateFileURL: options.generateFileURL,\n            prefix: options.prefix,\n            useCompositePrefixes,\n          })\n\n          const handlers = [\n            ...(typeof existingCollection.upload === 'object' &&\n            Array.isArray(existingCollection.upload.handlers)\n              ? existingCollection.upload.handlers\n              : []),\n          ]\n\n          if (!options.disablePayloadAccessControl) {\n            handlers.push(adapter.staticHandler)\n            // Else if disablePayloadAccessControl: true and clientUploads is used\n            // Build the \"proxied\" handler that responses only when the file was requested by client upload in addDataAndFileToRequest\n          } else if (adapter.clientUploads) {\n            handlers.push((req, args) => {\n              if ('clientUploadContext' in args.params) {\n                return adapter.staticHandler(req, args)\n              }\n            })\n          }\n\n          const getSkipSafeFetchSetting = (): AllowList | boolean => {\n            const isBooleanTrueSkipSafeFetch =\n              typeof existingCollection.upload === 'object' &&\n              existingCollection.upload.skipSafeFetch === true\n\n            const isAllowListSkipSafeFetch =\n              typeof existingCollection.upload === 'object' &&\n              Array.isArray(existingCollection.upload.skipSafeFetch)\n\n            if (isBooleanTrueSkipSafeFetch) {\n              return true\n            } else if (isAllowListSkipSafeFetch) {\n              const existingSkipSafeFetch =\n                typeof existingCollection.upload === 'object' &&\n                Array.isArray(existingCollection.upload.skipSafeFetch)\n                  ? existingCollection.upload.skipSafeFetch\n                  : []\n\n              const hasExactLocalhostMatch = existingSkipSafeFetch.some((entry) => {\n                const entryKeys = Object.keys(entry)\n                return entryKeys.length === 1 && entry.hostname === 'localhost'\n              })\n\n              const localhostEntry =\n                process.env.NODE_ENV !== 'production' && !hasExactLocalhostMatch\n                  ? [{ hostname: 'localhost' }]\n                  : []\n\n              return [...existingSkipSafeFetch, ...localhostEntry]\n            }\n\n            if (process.env.NODE_ENV !== 'production') {\n              return [{ hostname: 'localhost' }]\n            }\n\n            return false\n          }\n\n          return {\n            ...existingCollection,\n            fields,\n            hooks: {\n              ...(existingCollection.hooks || {}),\n              afterChange: [\n                ...(existingCollection.hooks?.afterChange || []),\n                getAfterChangeHook({\n                  adapter,\n                  collection: existingCollection,\n                  collectionPrefix: options.prefix,\n                  useCompositePrefixes,\n                }),\n              ],\n              afterDelete: [\n                ...(existingCollection.hooks?.afterDelete || []),\n                getAfterDeleteHook({\n                  adapter,\n                  collection: existingCollection,\n                  collectionPrefix: options.prefix,\n                  useCompositePrefixes,\n                }),\n              ],\n              beforeChange: [\n                ...(existingCollection.hooks?.beforeChange || []),\n                getNormalizeUploadPrefixHook({\n                  collectionPrefix: options.prefix,\n                  useCompositePrefixes,\n                }),\n                getPreserveFileDataHook(),\n              ],\n            },\n            upload: {\n              ...(typeof existingCollection.upload === 'object' ? existingCollection.upload : {}),\n              adapter: adapter.name,\n              disableLocalStorage:\n                typeof options.disableLocalStorage === 'boolean'\n                  ? options.disableLocalStorage\n                  : true,\n              handlers,\n              requiresClientUploadReceipt: adapter.requiresClientUploadReceipt,\n              skipSafeFetch: getSkipSafeFetchSetting(),\n            },\n          }\n        }\n\n        return existingCollection\n      }),\n      onInit: async (payload) => {\n        // Await each init so a provisioning failure fails Payload startup\n        // instead of becoming an unhandled rejection.\n        await Promise.all(initFunctions.map((fn) => fn()))\n        if (config.onInit) {\n          await config.onInit(payload)\n        }\n      },\n    }\n  }\n"],"names":["getFields","getAfterChangeHook","getAfterDeleteHook","getNormalizeUploadPrefixHook","getPreserveFileDataHook","cloudStoragePlugin","pluginOptions","incomingConfig","alwaysInsertFields","collections","allCollectionOptions","enabled","useCompositePrefixes","config","map","existingCollection","options","slug","adapter","collection","prefix","undefined","fields","disablePayloadAccessControl","generateFileURL","initFunctions","onInit","push","handlers","upload","Array","isArray","staticHandler","clientUploads","req","args","params","getSkipSafeFetchSetting","isBooleanTrueSkipSafeFetch","skipSafeFetch","isAllowListSkipSafeFetch","existingSkipSafeFetch","hasExactLocalhostMatch","some","entry","entryKeys","Object","keys","length","hostname","localhostEntry","process","env","NODE_ENV","hooks","afterChange","collectionPrefix","afterDelete","beforeChange","name","disableLocalStorage","requiresClientUploadReceipt","payload","Promise","all","fn"],"mappings":"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"}

package/dist/plugin.spec.js

@@ -0,0 +1,166 @@
+import { createServer } from 'node:http';
+import { getExternalFile } from 'payload/internal';
+import { afterAll, afterEach, beforeAll, describe, expect, it, vi } from 'vitest';
+import { cloudStoragePlugin } from './plugin.js';
+const collectionSlug = 'media';
+describe('cloudStoragePlugin external file fetching', ()=>{
+    const server = createServer((_req, res)=>{
+        res.writeHead(200, {
+            'Content-Length': '12',
+            'Content-Type': 'text/plain'
+        });
+        res.end('stored file\n');
+    });
+    let port;
+    beforeAll(async ()=>{
+        await new Promise((resolve)=>server.listen(0, resolve));
+        port = server.address().port;
+    });
+    afterEach(()=>{
+        vi.unstubAllEnvs();
+    });
+    afterAll(async ()=>{
+        await new Promise((resolve, reject)=>{
+            server.close((error)=>error ? reject(error) : resolve());
+        });
+    });
+    it('should filter private URLs when Payload file access control is disabled', async ()=>{
+        vi.stubEnv('NODE_ENV', 'production');
+        const uploadConfig = buildUploadConfig();
+        await expect(fetchExternalFile({
+            uploadConfig,
+            url: `http://127.0.0.1:${port}/file.txt`
+        })).rejects.toThrow('Blocked unsafe attempt to 127.0.0.1');
+    });
+    it('should allow private URLs when skipSafeFetch is explicitly true', async ()=>{
+        vi.stubEnv('NODE_ENV', 'production');
+        const uploadConfig = buildUploadConfig(true);
+        const file = await fetchExternalFile({
+            uploadConfig,
+            url: `http://127.0.0.1:${port}/file.txt`
+        });
+        expect(file.data.toString()).toBe('stored file\n');
+    });
+    it('should allow private URLs that match an explicit skipSafeFetch allowlist', async ()=>{
+        vi.stubEnv('NODE_ENV', 'production');
+        const uploadConfig = buildUploadConfig([
+            {
+                hostname: '127.0.0.1',
+                port: String(port),
+                protocol: 'http'
+            }
+        ]);
+        const file = await fetchExternalFile({
+            uploadConfig,
+            url: `http://127.0.0.1:${port}/file.txt`
+        });
+        expect(file.data.toString()).toBe('stored file\n');
+    });
+    it('should allow localhost URLs outside production', async ()=>{
+        vi.stubEnv('NODE_ENV', 'development');
+        const uploadConfig = buildUploadConfig();
+        const file = await fetchExternalFile({
+            uploadConfig,
+            url: `http://localhost:${port}/file.txt`
+        });
+        expect(file.data.toString()).toBe('stored file\n');
+    });
+});
+function buildUploadConfig(skipSafeFetch) {
+    const config = cloudStoragePlugin({
+        collections: {
+            [collectionSlug]: {
+                adapter: ()=>({
+                        handleDelete: async ()=>undefined,
+                        handleUpload: async ()=>undefined,
+                        name: 'test-adapter',
+                        staticHandler: async ()=>new Response(null, {
+                                status: 404
+                            })
+                    }),
+                disablePayloadAccessControl: true
+            }
+        }
+    })({
+        collections: [
+            {
+                fields: [],
+                slug: collectionSlug,
+                upload: typeof skipSafeFetch === 'undefined' ? true : {
+                    skipSafeFetch
+                }
+            }
+        ]
+    });
+    const uploadConfig = config.collections?.[0]?.upload;
+    if (!uploadConfig || typeof uploadConfig !== 'object') {
+        throw new Error('Expected an upload configuration');
+    }
+    return uploadConfig;
+}
+async function fetchExternalFile({ uploadConfig, url }) {
+    return getExternalFile({
+        data: {
+            filename: 'file.txt',
+            url
+        },
+        req: {
+            headers: new Headers(),
+            payload: {
+                config: {
+                    cookiePrefix: 'payload'
+                }
+            }
+        },
+        uploadConfig
+    });
+}
+const adapter = ()=>({
+        handleDelete: ()=>undefined,
+        handleUpload: ()=>undefined,
+        name: 'test-adapter',
+        staticHandler: ()=>new Response()
+    });
+describe('cloudStoragePlugin', ()=>{
+    it('should normalize a stored prefix during a server-mediated upload', async ()=>{
+        const config = cloudStoragePlugin({
+            collections: {
+                media: {
+                    adapter
+                }
+            }
+        })({
+            collections: [
+                {
+                    fields: [],
+                    slug: 'media',
+                    upload: true
+                }
+            ]
+        });
+        const hooks = config.collections?.[0]?.hooks?.beforeChange || [];
+        const req = {
+            context: {},
+            file: {
+                mimetype: 'image/png',
+                name: 'photo.png',
+                size: 42
+            }
+        };
+        let data = {
+            filename: 'photo.png',
+            prefix: '/tenant/../acme'
+        };
+        for (const hook of hooks){
+            const result = await hook({
+                data,
+                operation: 'create',
+                req
+            });
+            data = result || data;
+        }
+        expect(data.prefix).toBe('tenant/acme');
+    });
+});
+
+//# sourceMappingURL=plugin.spec.js.map