@payloadcms/storage-vercel-blob 3.89.0 → 3.90.0

package/dist/adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,mBAAmB,EAEpB,MAAM,wCAAwC,CAAA;AAO/C,UAAU,2BAA2B;IACnC,MAAM,EAAE,QAAQ,CAAA;IAChB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,OAAO,EAAE,MAAM,CAAA;IACf,kBAAkB,EAAE,MAAM,CAAA;IAC1B,aAAa,CAAC,EAAE,mBAAmB,CAAA;IACnC,KAAK,EAAE,MAAM,CAAA;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,wBAAgB,uBAAuB,CAAC,EACtC,MAAM,EACN,eAAe,EACf,OAAO,EACP,kBAAkB,EAClB,aAAa,EACb,KAAK,EACL,oBAA4B,GAC7B,EAAE,2BAA2B,GAAG,OAAO,CA+DvC"}
+{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,mBAAmB,EAEpB,MAAM,wCAAwC,CAAA;AAO/C,UAAU,2BAA2B;IACnC,MAAM,EAAE,QAAQ,CAAA;IAChB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,OAAO,EAAE,MAAM,CAAA;IACf,kBAAkB,EAAE,MAAM,CAAA;IAC1B,aAAa,CAAC,EAAE,mBAAmB,CAAA;IACnC,KAAK,EAAE,MAAM,CAAA;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,wBAAgB,uBAAuB,CAAC,EACtC,MAAM,EACN,eAAe,EACf,OAAO,EACP,kBAAkB,EAClB,aAAa,EACb,KAAK,EACL,oBAA4B,GAC7B,EAAE,2BAA2B,GAAG,OAAO,CAuDvC"}

package/dist/adapter.js

@@ -6,6 +6,7 @@ export function createVercelBlobAdapter({ access, addRandomSuffix, baseUrl, cach
     return ({ collection, prefix = '' })=>({
             name: 'vercel-blob',
             clientUploads,
+            requiresClientUploadReceipt: true,
             generateURL: ({ filename, prefix: urlPrefix = '' })=>generateURL({
                     baseUrl,
                     collectionPrefix: prefix,
@@ -13,41 +14,35 @@ export function createVercelBlobAdapter({ access, addRandomSuffix, baseUrl, cach
                     prefix: urlPrefix,
                     useCompositePrefixes
                 }),
-            handleDelete: ({ doc: { prefix: docPrefix = '' }, filename })=>deleteFile({
+            handleDelete: ({ storageFilePath })=>deleteFile({
                     baseUrl,
-                    collectionPrefix: prefix,
-                    docPrefix,
-                    filename,
-                    token,
-                    useCompositePrefixes
+                    storageFilePath,
+                    token
                 }),
-            handleUpload: async ({ data, file: { buffer, filename, mimeType } })=>{
+            handleUpload: async ({ data, file: { buffer, mimeType }, storageFilePath })=>{
                 const result = await uploadFile({
                     access,
                     addRandomSuffix,
                     buffer,
                     cacheControlMaxAge,
-                    collectionPrefix: prefix,
-                    docPrefix: data.prefix,
-                    filename,
                     mimeType,
-                    token,
-                    useCompositePrefixes
+                    storageFilePath,
+                    token
                 });
                 if (result.filename) {
                     data.filename = result.filename;
                 }
                 return data;
             },
-            staticHandler: (req, { headers, params: { clientUploadContext, filename, prefix: prefixQueryParam } })=>getFile({
+            staticHandler: (req, { doc, headers, params: { clientUploadContext, filename } })=>getFile({
                     baseUrl,
                     cacheControlMaxAge,
                     clientUploadContext,
                     collection,
                     collectionPrefix: prefix,
+                    doc,
                     filename,
                     incomingHeaders: headers,
-                    prefixQueryParam,
                     req,
                     token,
                     useCompositePrefixes

package/dist/adapter.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/adapter.ts"],"sourcesContent":["import type {\n  Adapter,\n  ClientUploadsConfig,\n  GeneratedAdapter,\n} from '@payloadcms/plugin-cloud-storage/types'\n\nimport { deleteFile } from './deleteFile.js'\nimport { generateURL } from './generateURL.js'\nimport { getFile } from './getFile.js'\nimport { uploadFile } from './uploadFile.js'\n\ninterface CreateVercelBlobAdapterArgs {\n  access: 'public'\n  addRandomSuffix?: boolean\n  baseUrl: string\n  cacheControlMaxAge: number\n  clientUploads?: ClientUploadsConfig\n  token: string\n  useCompositePrefixes?: boolean\n}\n\nexport function createVercelBlobAdapter({\n  access,\n  addRandomSuffix,\n  baseUrl,\n  cacheControlMaxAge,\n  clientUploads,\n  token,\n  useCompositePrefixes = false,\n}: CreateVercelBlobAdapterArgs): Adapter {\n  return ({ collection, prefix = '' }): GeneratedAdapter => ({\n    name: 'vercel-blob',\n    clientUploads,\n\n    generateURL: ({ filename, prefix: urlPrefix = '' }) =>\n      generateURL({\n        baseUrl,\n        collectionPrefix: prefix,\n        filename,\n        prefix: urlPrefix,\n        useCompositePrefixes,\n      }),\n\n    handleDelete: ({ doc: { prefix: docPrefix = '' }, filename }) =>\n      deleteFile({\n        baseUrl,\n        collectionPrefix: prefix,\n        docPrefix,\n        filename,\n        token,\n        useCompositePrefixes,\n      }),\n\n    handleUpload: async ({ data, file: { buffer, filename, mimeType } }) => {\n      const result = await uploadFile({\n        access,\n        addRandomSuffix,\n        buffer,\n        cacheControlMaxAge,\n        collectionPrefix: prefix,\n        docPrefix: data.prefix,\n        filename,\n        mimeType,\n        token,\n        useCompositePrefixes,\n      })\n\n      if (result.filename) {\n        data.filename = result.filename\n      }\n\n      return data\n    },\n\n    staticHandler: (\n      req,\n      { headers, params: { clientUploadContext, filename, prefix: prefixQueryParam } },\n    ) =>\n      getFile({\n        baseUrl,\n        cacheControlMaxAge,\n        clientUploadContext,\n        collection,\n        collectionPrefix: prefix,\n        filename,\n        incomingHeaders: headers,\n        prefixQueryParam,\n        req,\n        token,\n        useCompositePrefixes,\n      }),\n  })\n}\n"],"names":["deleteFile","generateURL","getFile","uploadFile","createVercelBlobAdapter","access","addRandomSuffix","baseUrl","cacheControlMaxAge","clientUploads","token","useCompositePrefixes","collection","prefix","name","filename","urlPrefix","collectionPrefix","handleDelete","doc","docPrefix","handleUpload","data","file","buffer","mimeType","result","staticHandler","req","headers","params","clientUploadContext","prefixQueryParam","incomingHeaders"],"mappings":"AAMA,SAASA,UAAU,QAAQ,kBAAiB;AAC5C,SAASC,WAAW,QAAQ,mBAAkB;AAC9C,SAASC,OAAO,QAAQ,eAAc;AACtC,SAASC,UAAU,QAAQ,kBAAiB;AAY5C,OAAO,SAASC,wBAAwB,EACtCC,MAAM,EACNC,eAAe,EACfC,OAAO,EACPC,kBAAkB,EAClBC,aAAa,EACbC,KAAK,EACLC,uBAAuB,KAAK,EACA;IAC5B,OAAO,CAAC,EAAEC,UAAU,EAAEC,SAAS,EAAE,EAAE,GAAwB,CAAA;YACzDC,MAAM;YACNL;YAEAR,aAAa,CAAC,EAAEc,QAAQ,EAAEF,QAAQG,YAAY,EAAE,EAAE,GAChDf,YAAY;oBACVM;oBACAU,kBAAkBJ;oBAClBE;oBACAF,QAAQG;oBACRL;gBACF;YAEFO,cAAc,CAAC,EAAEC,KAAK,EAAEN,QAAQO,YAAY,EAAE,EAAE,EAAEL,QAAQ,EAAE,GAC1Df,WAAW;oBACTO;oBACAU,kBAAkBJ;oBAClBO;oBACAL;oBACAL;oBACAC;gBACF;YAEFU,cAAc,OAAO,EAAEC,IAAI,EAAEC,MAAM,EAAEC,MAAM,EAAET,QAAQ,EAAEU,QAAQ,EAAE,EAAE;gBACjE,MAAMC,SAAS,MAAMvB,WAAW;oBAC9BE;oBACAC;oBACAkB;oBACAhB;oBACAS,kBAAkBJ;oBAClBO,WAAWE,KAAKT,MAAM;oBACtBE;oBACAU;oBACAf;oBACAC;gBACF;gBAEA,IAAIe,OAAOX,QAAQ,EAAE;oBACnBO,KAAKP,QAAQ,GAAGW,OAAOX,QAAQ;gBACjC;gBAEA,OAAOO;YACT;YAEAK,eAAe,CACbC,KACA,EAAEC,OAAO,EAAEC,QAAQ,EAAEC,mBAAmB,EAAEhB,QAAQ,EAAEF,QAAQmB,gBAAgB,EAAE,EAAE,GAEhF9B,QAAQ;oBACNK;oBACAC;oBACAuB;oBACAnB;oBACAK,kBAAkBJ;oBAClBE;oBACAkB,iBAAiBJ;oBACjBG;oBACAJ;oBACAlB;oBACAC;gBACF;QACJ,CAAA;AACF"}
+{"version":3,"sources":["../src/adapter.ts"],"sourcesContent":["import type {\n  Adapter,\n  ClientUploadsConfig,\n  GeneratedAdapter,\n} from '@payloadcms/plugin-cloud-storage/types'\n\nimport { deleteFile } from './deleteFile.js'\nimport { generateURL } from './generateURL.js'\nimport { getFile } from './getFile.js'\nimport { uploadFile } from './uploadFile.js'\n\ninterface CreateVercelBlobAdapterArgs {\n  access: 'public'\n  addRandomSuffix?: boolean\n  baseUrl: string\n  cacheControlMaxAge: number\n  clientUploads?: ClientUploadsConfig\n  token: string\n  useCompositePrefixes?: boolean\n}\n\nexport function createVercelBlobAdapter({\n  access,\n  addRandomSuffix,\n  baseUrl,\n  cacheControlMaxAge,\n  clientUploads,\n  token,\n  useCompositePrefixes = false,\n}: CreateVercelBlobAdapterArgs): Adapter {\n  return ({ collection, prefix = '' }): GeneratedAdapter => ({\n    name: 'vercel-blob',\n    clientUploads,\n    requiresClientUploadReceipt: true,\n\n    generateURL: ({ filename, prefix: urlPrefix = '' }) =>\n      generateURL({\n        baseUrl,\n        collectionPrefix: prefix,\n        filename,\n        prefix: urlPrefix,\n        useCompositePrefixes,\n      }),\n\n    handleDelete: ({ storageFilePath }) =>\n      deleteFile({\n        baseUrl,\n        storageFilePath,\n        token,\n      }),\n\n    handleUpload: async ({ data, file: { buffer, mimeType }, storageFilePath }) => {\n      const result = await uploadFile({\n        access,\n        addRandomSuffix,\n        buffer,\n        cacheControlMaxAge,\n        mimeType,\n        storageFilePath,\n        token,\n      })\n\n      if (result.filename) {\n        data.filename = result.filename\n      }\n\n      return data\n    },\n\n    staticHandler: (req, { doc, headers, params: { clientUploadContext, filename } }) =>\n      getFile({\n        baseUrl,\n        cacheControlMaxAge,\n        clientUploadContext,\n        collection,\n        collectionPrefix: prefix,\n        doc,\n        filename,\n        incomingHeaders: headers,\n        req,\n        token,\n        useCompositePrefixes,\n      }),\n  })\n}\n"],"names":["deleteFile","generateURL","getFile","uploadFile","createVercelBlobAdapter","access","addRandomSuffix","baseUrl","cacheControlMaxAge","clientUploads","token","useCompositePrefixes","collection","prefix","name","requiresClientUploadReceipt","filename","urlPrefix","collectionPrefix","handleDelete","storageFilePath","handleUpload","data","file","buffer","mimeType","result","staticHandler","req","doc","headers","params","clientUploadContext","incomingHeaders"],"mappings":"AAMA,SAASA,UAAU,QAAQ,kBAAiB;AAC5C,SAASC,WAAW,QAAQ,mBAAkB;AAC9C,SAASC,OAAO,QAAQ,eAAc;AACtC,SAASC,UAAU,QAAQ,kBAAiB;AAY5C,OAAO,SAASC,wBAAwB,EACtCC,MAAM,EACNC,eAAe,EACfC,OAAO,EACPC,kBAAkB,EAClBC,aAAa,EACbC,KAAK,EACLC,uBAAuB,KAAK,EACA;IAC5B,OAAO,CAAC,EAAEC,UAAU,EAAEC,SAAS,EAAE,EAAE,GAAwB,CAAA;YACzDC,MAAM;YACNL;YACAM,6BAA6B;YAE7Bd,aAAa,CAAC,EAAEe,QAAQ,EAAEH,QAAQI,YAAY,EAAE,EAAE,GAChDhB,YAAY;oBACVM;oBACAW,kBAAkBL;oBAClBG;oBACAH,QAAQI;oBACRN;gBACF;YAEFQ,cAAc,CAAC,EAAEC,eAAe,EAAE,GAChCpB,WAAW;oBACTO;oBACAa;oBACAV;gBACF;YAEFW,cAAc,OAAO,EAAEC,IAAI,EAAEC,MAAM,EAAEC,MAAM,EAAEC,QAAQ,EAAE,EAAEL,eAAe,EAAE;gBACxE,MAAMM,SAAS,MAAMvB,WAAW;oBAC9BE;oBACAC;oBACAkB;oBACAhB;oBACAiB;oBACAL;oBACAV;gBACF;gBAEA,IAAIgB,OAAOV,QAAQ,EAAE;oBACnBM,KAAKN,QAAQ,GAAGU,OAAOV,QAAQ;gBACjC;gBAEA,OAAOM;YACT;YAEAK,eAAe,CAACC,KAAK,EAAEC,GAAG,EAAEC,OAAO,EAAEC,QAAQ,EAAEC,mBAAmB,EAAEhB,QAAQ,EAAE,EAAE,GAC9Ed,QAAQ;oBACNK;oBACAC;oBACAwB;oBACApB;oBACAM,kBAAkBL;oBAClBgB;oBACAb;oBACAiB,iBAAiBH;oBACjBF;oBACAlB;oBACAC;gBACF;QACJ,CAAA;AACF"}

package/dist/authorizeFileOverwrite.d.ts

@@ -0,0 +1,14 @@
+import type { PayloadRequest } from 'payload';
+export type VercelBlobCollectionOptions = Record<string, {
+    prefix?: string;
+} | true | undefined>;
+export declare function authorizeClientOverwrite({ collectionPrefix: collectionPrefixArg, collections, req, requestedCollectionSlug, requestedFilename, requestedStorageFilePath, useCompositePrefixes, }: {
+    collectionPrefix: string;
+    collections: VercelBlobCollectionOptions;
+    req: PayloadRequest;
+    requestedCollectionSlug: string;
+    requestedFilename: string;
+    requestedStorageFilePath: string;
+    useCompositePrefixes?: boolean;
+}): Promise<boolean>;
+//# sourceMappingURL=authorizeFileOverwrite.d.ts.map

package/dist/authorizeFileOverwrite.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"authorizeFileOverwrite.d.ts","sourceRoot":"","sources":["../src/authorizeFileOverwrite.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAY,cAAc,EAAqB,MAAM,SAAS,CAAA;AAQ1E,MAAM,MAAM,2BAA2B,GAAG,MAAM,CAAC,MAAM,EAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,GAAG,SAAS,CAAC,CAAA;AAqHhG,wBAAsB,wBAAwB,CAAC,EAC7C,gBAAgB,EAAE,mBAAmB,EACrC,WAAW,EACX,GAAG,EACH,uBAAuB,EACvB,iBAAiB,EACjB,wBAAwB,EACxB,oBAA4B,GAC7B,EAAE;IACD,gBAAgB,EAAE,MAAM,CAAA;IACxB,WAAW,EAAE,2BAA2B,CAAA;IACxC,GAAG,EAAE,cAAc,CAAA;IACnB,uBAAuB,EAAE,MAAM,CAAA;IAC/B,iBAAiB,EAAE,MAAM,CAAA;IACzB,wBAAwB,EAAE,MAAM,CAAA;IAChC,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B,GAAG,OAAO,CAAC,OAAO,CAAC,CA2CnB"}

package/dist/authorizeFileOverwrite.js

@@ -0,0 +1,116 @@
+import { buildStoragePathData, isStoragePathWithinCollectionPrefix } from '@payloadcms/plugin-cloud-storage/utilities';
+import { combineQueries, executeAccess, Forbidden } from 'payload';
+function getDocumentFileKeys({ collectionPrefix, doc, useCompositePrefixes }) {
+    return [
+        doc.filename,
+        ...Object.values(doc.sizes || {}).map((size)=>size?.filename)
+    ].filter((filename)=>typeof filename === 'string').map((filename)=>buildStoragePathData({
+            collectionPrefix,
+            docPrefix: doc.prefix,
+            filename,
+            useCompositePrefixes
+        }).storageFilePath);
+}
+async function findMatchingDocs({ collectionPrefix, collectionSlug, req, requestedFilename, requestedStorageFilePath, useCompositePrefixes }) {
+    const collection = req.payload.collections[collectionSlug];
+    if (!collection) {
+        return [];
+    }
+    const imageSizes = collection.config.upload && typeof collection.config.upload === 'object' ? collection.config.upload.imageSizes || [] : [];
+    const filenameQueries = [
+        {
+            filename: {
+                equals: requestedFilename
+            }
+        },
+        ...imageSizes.map(({ name })=>({
+                [`sizes.${name}.filename`]: {
+                    equals: requestedFilename
+                }
+            }))
+    ];
+    const result = await req.payload.find({
+        collection: collectionSlug,
+        depth: 0,
+        draft: true,
+        overrideAccess: true,
+        pagination: false,
+        req,
+        where: {
+            or: filenameQueries
+        }
+    });
+    return result.docs.filter((doc)=>getDocumentFileKeys({
+            collectionPrefix,
+            doc,
+            useCompositePrefixes
+        }).includes(requestedStorageFilePath));
+}
+async function canUpdateDoc({ collectionSlug, doc, req }) {
+    const collection = req.payload.collections[collectionSlug];
+    if (!collection) {
+        return false;
+    }
+    const accessResult = await executeAccess({
+        id: doc.id,
+        disableErrors: true,
+        req
+    }, collection.config.access.update);
+    if (typeof accessResult === 'boolean') {
+        return accessResult;
+    }
+    const result = await req.payload.find({
+        collection: collectionSlug,
+        depth: 0,
+        draft: true,
+        limit: 1,
+        overrideAccess: true,
+        pagination: false,
+        req,
+        where: combineQueries({
+            id: {
+                equals: doc.id
+            }
+        }, accessResult)
+    });
+    return result.docs.length === 1;
+}
+export async function authorizeClientOverwrite({ collectionPrefix: collectionPrefixArg, collections, req, requestedCollectionSlug, requestedFilename, requestedStorageFilePath, useCompositePrefixes = false }) {
+    if (!isStoragePathWithinCollectionPrefix({
+        collectionPrefix: collectionPrefixArg,
+        docPrefix: requestedStorageFilePath
+    })) {
+        throw new Forbidden(req.t);
+    }
+    const matchedDocs = (await Promise.all(Object.entries(collections).map(async ([collectionSlug, options])=>{
+        const docs = await findMatchingDocs({
+            collectionPrefix: options === true ? '' : options?.prefix || '',
+            collectionSlug,
+            req,
+            requestedFilename,
+            requestedStorageFilePath,
+            useCompositePrefixes
+        });
+        return docs.map((doc)=>({
+                collectionSlug,
+                doc
+            }));
+    }))).flat();
+    if (matchedDocs.length === 0) {
+        return false;
+    }
+    const matchedDoc = matchedDocs[0];
+    if (matchedDocs.length !== 1 || matchedDoc.collectionSlug !== requestedCollectionSlug) {
+        throw new Forbidden(req.t);
+    }
+    if (!await canUpdateDoc({
+        collectionSlug: matchedDoc.collectionSlug,
+        doc: matchedDoc.doc,
+        req
+    })) {
+        throw new Forbidden(req.t);
+    }
+    return true;
+}
+
+//# sourceMappingURL=authorizeFileOverwrite.js.map

package/dist/authorizeFileOverwrite.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/authorizeFileOverwrite.ts"],"sourcesContent":["import type { FileData, PayloadRequest, TypeWithID, Where } from 'payload'\n\nimport {\n  buildStoragePathData,\n  isStoragePathWithinCollectionPrefix,\n} from '@payloadcms/plugin-cloud-storage/utilities'\nimport { combineQueries, executeAccess, Forbidden } from 'payload'\n\nexport type VercelBlobCollectionOptions = Record<string, { prefix?: string } | true | undefined>\n\ntype OwnerDocument = { prefix?: string } & FileData & TypeWithID\n\ntype Owner = {\n  collectionSlug: string\n  doc: OwnerDocument\n}\n\nfunction getDocumentFileKeys({\n  collectionPrefix,\n  doc,\n  useCompositePrefixes,\n}: {\n  collectionPrefix: string\n  doc: OwnerDocument\n  useCompositePrefixes: boolean\n}): string[] {\n  return [doc.filename, ...Object.values(doc.sizes || {}).map((size) => size?.filename)]\n    .filter((filename): filename is string => typeof filename === 'string')\n    .map(\n      (filename) =>\n        buildStoragePathData({\n          collectionPrefix,\n          docPrefix: doc.prefix,\n          filename,\n          useCompositePrefixes,\n        }).storageFilePath,\n    )\n}\n\nasync function findMatchingDocs({\n  collectionPrefix,\n  collectionSlug,\n  req,\n  requestedFilename,\n  requestedStorageFilePath,\n  useCompositePrefixes,\n}: {\n  collectionPrefix: string\n  collectionSlug: string\n  req: PayloadRequest\n  requestedFilename: string\n  requestedStorageFilePath: string\n  useCompositePrefixes: boolean\n}): Promise<OwnerDocument[]> {\n  const collection = req.payload.collections[collectionSlug]\n\n  if (!collection) {\n    return []\n  }\n\n  const imageSizes =\n    collection.config.upload && typeof collection.config.upload === 'object'\n      ? collection.config.upload.imageSizes || []\n      : []\n  const filenameQueries: Where[] = [\n    { filename: { equals: requestedFilename } },\n    ...imageSizes.map(({ name }) => ({\n      [`sizes.${name}.filename`]: { equals: requestedFilename },\n    })),\n  ]\n  const result = await req.payload.find({\n    collection: collectionSlug,\n    depth: 0,\n    draft: true,\n    overrideAccess: true,\n    pagination: false,\n    req,\n    where: { or: filenameQueries },\n  })\n\n  return (result.docs as OwnerDocument[]).filter((doc) =>\n    getDocumentFileKeys({ collectionPrefix, doc, useCompositePrefixes }).includes(\n      requestedStorageFilePath,\n    ),\n  )\n}\n\nasync function canUpdateDoc({\n  collectionSlug,\n  doc,\n  req,\n}: {\n  collectionSlug: string\n  doc: OwnerDocument\n  req: PayloadRequest\n}): Promise<boolean> {\n  const collection = req.payload.collections[collectionSlug]\n\n  if (!collection) {\n    return false\n  }\n\n  const accessResult = await executeAccess(\n    { id: doc.id, disableErrors: true, req },\n    collection.config.access.update,\n  )\n\n  if (typeof accessResult === 'boolean') {\n    return accessResult\n  }\n\n  const result = await req.payload.find({\n    collection: collectionSlug,\n    depth: 0,\n    draft: true,\n    limit: 1,\n    overrideAccess: true,\n    pagination: false,\n    req,\n    where: combineQueries({ id: { equals: doc.id } }, accessResult),\n  })\n\n  return result.docs.length === 1\n}\n\nexport async function authorizeClientOverwrite({\n  collectionPrefix: collectionPrefixArg,\n  collections,\n  req,\n  requestedCollectionSlug,\n  requestedFilename,\n  requestedStorageFilePath,\n  useCompositePrefixes = false,\n}: {\n  collectionPrefix: string\n  collections: VercelBlobCollectionOptions\n  req: PayloadRequest\n  requestedCollectionSlug: string\n  requestedFilename: string\n  requestedStorageFilePath: string\n  useCompositePrefixes?: boolean\n}): Promise<boolean> {\n  if (\n    !isStoragePathWithinCollectionPrefix({\n      collectionPrefix: collectionPrefixArg,\n      docPrefix: requestedStorageFilePath,\n    })\n  ) {\n    throw new Forbidden(req.t)\n  }\n\n  const matchedDocs = (\n    await Promise.all(\n      Object.entries(collections).map(async ([collectionSlug, options]): Promise<Owner[]> => {\n        const docs = await findMatchingDocs({\n          collectionPrefix: options === true ? '' : options?.prefix || '',\n          collectionSlug,\n          req,\n          requestedFilename,\n          requestedStorageFilePath,\n          useCompositePrefixes,\n        })\n\n        return docs.map((doc) => ({ collectionSlug, doc }))\n      }),\n    )\n  ).flat()\n\n  if (matchedDocs.length === 0) {\n    return false\n  }\n\n  const matchedDoc = matchedDocs[0]!\n  if (matchedDocs.length !== 1 || matchedDoc.collectionSlug !== requestedCollectionSlug) {\n    throw new Forbidden(req.t)\n  }\n\n  if (\n    !(await canUpdateDoc({ collectionSlug: matchedDoc.collectionSlug, doc: matchedDoc.doc, req }))\n  ) {\n    throw new Forbidden(req.t)\n  }\n\n  return true\n}\n"],"names":["buildStoragePathData","isStoragePathWithinCollectionPrefix","combineQueries","executeAccess","Forbidden","getDocumentFileKeys","collectionPrefix","doc","useCompositePrefixes","filename","Object","values","sizes","map","size","filter","docPrefix","prefix","storageFilePath","findMatchingDocs","collectionSlug","req","requestedFilename","requestedStorageFilePath","collection","payload","collections","imageSizes","config","upload","filenameQueries","equals","name","result","find","depth","draft","overrideAccess","pagination","where","or","docs","includes","canUpdateDoc","accessResult","id","disableErrors","access","update","limit","length","authorizeClientOverwrite","collectionPrefixArg","requestedCollectionSlug","t","matchedDocs","Promise","all","entries","options","flat","matchedDoc"],"mappings":"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"}

package/dist/authorizeFileOverwrite.spec.js

@@ -0,0 +1,87 @@
+import { describe, expect, it, vi } from 'vitest';
+import { authorizeClientOverwrite } from './authorizeFileOverwrite.js';
+const owner = (id)=>({
+        filename: 'image.png',
+        id,
+        prefix: 'shared'
+    });
+const createRequest = ({ protectedOwner = false } = {})=>({
+        payload: {
+            collections: {
+                media: {
+                    config: {
+                        access: {
+                            update: async ()=>true
+                        },
+                        upload: true
+                    }
+                },
+                protected: {
+                    config: {
+                        access: {
+                            update: async ()=>false
+                        },
+                        upload: true
+                    }
+                }
+            },
+            find: vi.fn(async ({ collection })=>({
+                    docs: collection === 'media' ? [
+                        owner(1)
+                    ] : protectedOwner ? [
+                        owner(2)
+                    ] : []
+                }))
+        },
+        t: vi.fn()
+    });
+describe('authorizeClientOverwrite', ()=>{
+    it('should reject a new key outside the requested collection prefix', async ()=>{
+        await expect(authorizeClientOverwrite({
+            collections: {
+                media: {
+                    prefix: 'media'
+                }
+            },
+            requestedFilename: 'image.png',
+            requestedStorageFilePath: 'media-archive/image.png',
+            req: createRequest(),
+            requestedCollectionSlug: 'media',
+            collectionPrefix: 'media'
+        })).rejects.toMatchObject({
+            status: 403
+        });
+    });
+    it('allows an update when the requested collection is the only owner', async ()=>{
+        await expect(authorizeClientOverwrite({
+            collections: {
+                media: true,
+                protected: true
+            },
+            requestedFilename: 'image.png',
+            requestedStorageFilePath: 'shared/image.png',
+            req: createRequest(),
+            requestedCollectionSlug: 'media',
+            collectionPrefix: ''
+        })).resolves.toBe(true);
+    });
+    it('rejects an update when another collection owns the same key', async ()=>{
+        await expect(authorizeClientOverwrite({
+            collections: {
+                media: true,
+                protected: true
+            },
+            requestedFilename: 'image.png',
+            requestedStorageFilePath: 'shared/image.png',
+            req: createRequest({
+                protectedOwner: true
+            }),
+            requestedCollectionSlug: 'media',
+            collectionPrefix: ''
+        })).rejects.toMatchObject({
+            status: 403
+        });
+    });
+});
+
+//# sourceMappingURL=authorizeFileOverwrite.spec.js.map

package/dist/authorizeFileOverwrite.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/authorizeFileOverwrite.spec.ts"],"sourcesContent":["import type { PayloadRequest } from 'payload'\n\nimport { describe, expect, it, vi } from 'vitest'\n\nimport { authorizeClientOverwrite } from './authorizeFileOverwrite.js'\n\nconst owner = (id: number) => ({ filename: 'image.png', id, prefix: 'shared' })\n\nconst createRequest = ({ protectedOwner = false }: { protectedOwner?: boolean } = {}) =>\n  ({\n    payload: {\n      collections: {\n        media: {\n          config: { access: { update: async () => true }, upload: true },\n        },\n        protected: {\n          config: { access: { update: async () => false }, upload: true },\n        },\n      },\n      find: vi.fn(async ({ collection }: { collection: string }) => ({\n        docs: collection === 'media' ? [owner(1)] : protectedOwner ? [owner(2)] : [],\n      })),\n    },\n    t: vi.fn(),\n  }) as unknown as PayloadRequest\n\ndescribe('authorizeClientOverwrite', () => {\n  it('should reject a new key outside the requested collection prefix', async () => {\n    await expect(\n      authorizeClientOverwrite({\n        collections: { media: { prefix: 'media' } },\n        requestedFilename: 'image.png',\n        requestedStorageFilePath: 'media-archive/image.png',\n        req: createRequest(),\n        requestedCollectionSlug: 'media',\n        collectionPrefix: 'media',\n      }),\n    ).rejects.toMatchObject({ status: 403 })\n  })\n\n  it('allows an update when the requested collection is the only owner', async () => {\n    await expect(\n      authorizeClientOverwrite({\n        collections: { media: true, protected: true },\n        requestedFilename: 'image.png',\n        requestedStorageFilePath: 'shared/image.png',\n        req: createRequest(),\n        requestedCollectionSlug: 'media',\n        collectionPrefix: '',\n      }),\n    ).resolves.toBe(true)\n  })\n\n  it('rejects an update when another collection owns the same key', async () => {\n    await expect(\n      authorizeClientOverwrite({\n        collections: { media: true, protected: true },\n        requestedFilename: 'image.png',\n        requestedStorageFilePath: 'shared/image.png',\n        req: createRequest({ protectedOwner: true }),\n        requestedCollectionSlug: 'media',\n        collectionPrefix: '',\n      }),\n    ).rejects.toMatchObject({ status: 403 })\n  })\n})\n"],"names":["describe","expect","it","vi","authorizeClientOverwrite","owner","id","filename","prefix","createRequest","protectedOwner","payload","collections","media","config","access","update","upload","protected","find","fn","collection","docs","t","requestedFilename","requestedStorageFilePath","req","requestedCollectionSlug","collectionPrefix","rejects","toMatchObject","status","resolves","toBe"],"mappings":"AAEA,SAASA,QAAQ,EAAEC,MAAM,EAAEC,EAAE,EAAEC,EAAE,QAAQ,SAAQ;AAEjD,SAASC,wBAAwB,QAAQ,8BAA6B;AAEtE,MAAMC,QAAQ,CAACC,KAAgB,CAAA;QAAEC,UAAU;QAAaD;QAAIE,QAAQ;IAAS,CAAA;AAE7E,MAAMC,gBAAgB,CAAC,EAAEC,iBAAiB,KAAK,EAAgC,GAAG,CAAC,CAAC,GACjF,CAAA;QACCC,SAAS;YACPC,aAAa;gBACXC,OAAO;oBACLC,QAAQ;wBAAEC,QAAQ;4BAAEC,QAAQ,UAAY;wBAAK;wBAAGC,QAAQ;oBAAK;gBAC/D;gBACAC,WAAW;oBACTJ,QAAQ;wBAAEC,QAAQ;4BAAEC,QAAQ,UAAY;wBAAM;wBAAGC,QAAQ;oBAAK;gBAChE;YACF;YACAE,MAAMhB,GAAGiB,EAAE,CAAC,OAAO,EAAEC,UAAU,EAA0B,GAAM,CAAA;oBAC7DC,MAAMD,eAAe,UAAU;wBAAChB,MAAM;qBAAG,GAAGK,iBAAiB;wBAACL,MAAM;qBAAG,GAAG,EAAE;gBAC9E,CAAA;QACF;QACAkB,GAAGpB,GAAGiB,EAAE;IACV,CAAA;AAEFpB,SAAS,4BAA4B;IACnCE,GAAG,mEAAmE;QACpE,MAAMD,OACJG,yBAAyB;YACvBQ,aAAa;gBAAEC,OAAO;oBAAEL,QAAQ;gBAAQ;YAAE;YAC1CgB,mBAAmB;YACnBC,0BAA0B;YAC1BC,KAAKjB;YACLkB,yBAAyB;YACzBC,kBAAkB;QACpB,IACAC,OAAO,CAACC,aAAa,CAAC;YAAEC,QAAQ;QAAI;IACxC;IAEA7B,GAAG,oEAAoE;QACrE,MAAMD,OACJG,yBAAyB;YACvBQ,aAAa;gBAAEC,OAAO;gBAAMK,WAAW;YAAK;YAC5CM,mBAAmB;YACnBC,0BAA0B;YAC1BC,KAAKjB;YACLkB,yBAAyB;YACzBC,kBAAkB;QACpB,IACAI,QAAQ,CAACC,IAAI,CAAC;IAClB;IAEA/B,GAAG,+DAA+D;QAChE,MAAMD,OACJG,yBAAyB;YACvBQ,aAAa;gBAAEC,OAAO;gBAAMK,WAAW;YAAK;YAC5CM,mBAAmB;YACnBC,0BAA0B;YAC1BC,KAAKjB,cAAc;gBAAEC,gBAAgB;YAAK;YAC1CiB,yBAAyB;YACzBC,kBAAkB;QACpB,IACAC,OAAO,CAACC,aAAa,CAAC;YAAEC,QAAQ;QAAI;IACxC;AACF"}

package/dist/client/VercelBlobClientUploadHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"VercelBlobClientUploadHandler.d.ts","sourceRoot":"","sources":["../../src/client/VercelBlobClientUploadHandler.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,kCAAkC,GAAG;IAC/C,eAAe,EAAE,OAAO,CAAA;IACxB,oBAAoB,EAAE,OAAO,CAAA;CAC9B,CAAA;AASD,eAAO,MAAM,6BAA6B;;;;;;;aAQpC,OAAO,aAiCT,CAAA"}
+{"version":3,"file":"VercelBlobClientUploadHandler.d.ts","sourceRoot":"","sources":["../../src/client/VercelBlobClientUploadHandler.ts"],"names":[],"mappings":"AAOA,MAAM,MAAM,kCAAkC,GAAG;IAC/C,eAAe,EAAE,OAAO,CAAA;IACxB,oBAAoB,EAAE,OAAO,CAAA;CAC9B,CAAA;AAED,eAAO,MAAM,6BAA6B;;;;;;;aAgBkB,OAAO,aAsC/D,CAAA"}

package/dist/client/VercelBlobClientUploadHandler.js

@@ -1,39 +1,45 @@
 'use client';
-import { createClientUploadHandler, getFileKey } from '@payloadcms/plugin-cloud-storage/client';
+import { createClientUploadHandler } from '@payloadcms/plugin-cloud-storage/client';
 import { upload } from '@vercel/blob/client';
 import { formatAdminURL } from 'payload/shared';
-/** Last path segment only (POSIX), for keys like `folder/sub/file.png`. */ function posixBasename(key) {
-    const normalized = key.replace(/^\/+/, '');
-    const lastSlash = normalized.lastIndexOf('/');
-    return lastSlash === -1 ? normalized : normalized.slice(lastSlash + 1);
-}
 export const VercelBlobClientUploadHandler = createClientUploadHandler({
-    handler: async ({ apiRoute, collectionSlug, docPrefix, extra: { addRandomSuffix, useCompositePrefixes = false }, file, prefix, serverHandlerPath, serverURL, updateFilename })=>{
+    handler: async ({ apiRoute, collectionSlug, docPrefix, file, serverHandlerPath, serverURL, updateFilename })=>{
         const endpointRoute = formatAdminURL({
             apiRoute,
             path: serverHandlerPath,
             serverURL
         });
-        const { fileKey: pathname, sanitizedDocPrefix } = getFileKey({
-            collectionPrefix: prefix,
-            docPrefix,
-            filename: file.name,
-            useCompositePrefixes
+        const issued = await fetch(`${endpointRoute}?issue-client-upload=1`, {
+            body: JSON.stringify({
+                collectionSlug,
+                docPrefix,
+                filename: file.name,
+                mimeType: file.type
+            }),
+            credentials: 'include',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            method: 'POST'
         });
-        // upload the file directly to Vercel Blob using the signed URL
-        const result = await upload(pathname, file, {
+        if (!issued.ok) {
+            throw new Error('Failed to initialize Vercel Blob client upload');
+        }
+        const { clientUploadContext, filename, pathname } = await issued.json();
+        updateFilename(filename);
+        await upload(pathname, file, {
             access: 'public',
-            clientPayload: collectionSlug,
+            clientPayload: JSON.stringify({
+                collectionSlug,
+                mimeType: file.type,
+                signedReceipt: clientUploadContext.signedReceipt
+            }),
             contentType: file.type,
             handleUploadUrl: endpointRoute
         });
-        // Match server uploadFile: document `filename` is basename only; prefixes are separate.
-        if (addRandomSuffix) {
-            const pathname = result.pathname.replace(/^\/+/, '');
-            updateFilename(decodeURIComponent(posixBasename(pathname)));
-        }
         return {
-            prefix: sanitizedDocPrefix
+            prefix: clientUploadContext.prefix,
+            signedReceipt: clientUploadContext.signedReceipt
         };
     }
 });

package/dist/client/VercelBlobClientUploadHandler.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/client/VercelBlobClientUploadHandler.ts"],"sourcesContent":["'use client'\nimport { createClientUploadHandler, getFileKey } from '@payloadcms/plugin-cloud-storage/client'\nimport { upload } from '@vercel/blob/client'\nimport { formatAdminURL } from 'payload/shared'\n\nexport type VercelBlobClientUploadHandlerExtra = {\n  addRandomSuffix: boolean\n  useCompositePrefixes: boolean\n}\n\n/** Last path segment only (POSIX), for keys like `folder/sub/file.png`. */\nfunction posixBasename(key: string): string {\n  const normalized = key.replace(/^\\/+/, '')\n  const lastSlash = normalized.lastIndexOf('/')\n  return lastSlash === -1 ? normalized : normalized.slice(lastSlash + 1)\n}\n\nexport const VercelBlobClientUploadHandler =\n  createClientUploadHandler<VercelBlobClientUploadHandlerExtra>({\n    handler: async ({\n      apiRoute,\n      collectionSlug,\n      docPrefix,\n      extra: { addRandomSuffix, useCompositePrefixes = false },\n      file,\n      prefix,\n      serverHandlerPath,\n      serverURL,\n      updateFilename,\n    }) => {\n      const endpointRoute = formatAdminURL({\n        apiRoute,\n        path: serverHandlerPath,\n        serverURL,\n      })\n      const { fileKey: pathname, sanitizedDocPrefix } = getFileKey({\n        collectionPrefix: prefix,\n        docPrefix,\n        filename: file.name,\n        useCompositePrefixes,\n      })\n\n      // upload the file directly to Vercel Blob using the signed URL\n      const result = await upload(pathname, file, {\n        access: 'public',\n        clientPayload: collectionSlug,\n        contentType: file.type,\n        handleUploadUrl: endpointRoute,\n      })\n\n      // Match server uploadFile: document `filename` is basename only; prefixes are separate.\n      if (addRandomSuffix) {\n        const pathname = result.pathname.replace(/^\\/+/, '')\n        updateFilename(decodeURIComponent(posixBasename(pathname)))\n      }\n\n      return { prefix: sanitizedDocPrefix }\n    },\n  })\n"],"names":["createClientUploadHandler","getFileKey","upload","formatAdminURL","posixBasename","key","normalized","replace","lastSlash","lastIndexOf","slice","VercelBlobClientUploadHandler","handler","apiRoute","collectionSlug","docPrefix","extra","addRandomSuffix","useCompositePrefixes","file","prefix","serverHandlerPath","serverURL","updateFilename","endpointRoute","path","fileKey","pathname","sanitizedDocPrefix","collectionPrefix","filename","name","result","access","clientPayload","contentType","type","handleUploadUrl","decodeURIComponent"],"mappings":"AAAA;AACA,SAASA,yBAAyB,EAAEC,UAAU,QAAQ,0CAAyC;AAC/F,SAASC,MAAM,QAAQ,sBAAqB;AAC5C,SAASC,cAAc,QAAQ,iBAAgB;AAO/C,yEAAyE,GACzE,SAASC,cAAcC,GAAW;IAChC,MAAMC,aAAaD,IAAIE,OAAO,CAAC,QAAQ;IACvC,MAAMC,YAAYF,WAAWG,WAAW,CAAC;IACzC,OAAOD,cAAc,CAAC,IAAIF,aAAaA,WAAWI,KAAK,CAACF,YAAY;AACtE;AAEA,OAAO,MAAMG,gCACXX,0BAA8D;IAC5DY,SAAS,OAAO,EACdC,QAAQ,EACRC,cAAc,EACdC,SAAS,EACTC,OAAO,EAAEC,eAAe,EAAEC,uBAAuB,KAAK,EAAE,EACxDC,IAAI,EACJC,MAAM,EACNC,iBAAiB,EACjBC,SAAS,EACTC,cAAc,EACf;QACC,MAAMC,gBAAgBrB,eAAe;YACnCU;YACAY,MAAMJ;YACNC;QACF;QACA,MAAM,EAAEI,SAASC,QAAQ,EAAEC,kBAAkB,EAAE,GAAG3B,WAAW;YAC3D4B,kBAAkBT;YAClBL;YACAe,UAAUX,KAAKY,IAAI;YACnBb;QACF;QAEA,+DAA+D;QAC/D,MAAMc,SAAS,MAAM9B,OAAOyB,UAAUR,MAAM;YAC1Cc,QAAQ;YACRC,eAAepB;YACfqB,aAAahB,KAAKiB,IAAI;YACtBC,iBAAiBb;QACnB;QAEA,wFAAwF;QACxF,IAAIP,iBAAiB;YACnB,MAAMU,WAAWK,OAAOL,QAAQ,CAACpB,OAAO,CAAC,QAAQ;YACjDgB,eAAee,mBAAmBlC,cAAcuB;QAClD;QAEA,OAAO;YAAEP,QAAQQ;QAAmB;IACtC;AACF,GAAE"}
+{"version":3,"sources":["../../src/client/VercelBlobClientUploadHandler.ts"],"sourcesContent":["'use client'\nimport type { ClientUploadContext } from '@payloadcms/plugin-cloud-storage/types'\n\nimport { createClientUploadHandler } from '@payloadcms/plugin-cloud-storage/client'\nimport { upload } from '@vercel/blob/client'\nimport { formatAdminURL } from 'payload/shared'\n\nexport type VercelBlobClientUploadHandlerExtra = {\n  addRandomSuffix: boolean\n  useCompositePrefixes: boolean\n}\n\nexport const VercelBlobClientUploadHandler =\n  createClientUploadHandler<VercelBlobClientUploadHandlerExtra>({\n    handler: async ({\n      apiRoute,\n      collectionSlug,\n      docPrefix,\n      file,\n      serverHandlerPath,\n      serverURL,\n      updateFilename,\n    }): Promise<ClientUploadContext> => {\n      const endpointRoute = formatAdminURL({\n        apiRoute,\n        path: serverHandlerPath,\n        serverURL,\n      })\n      const issued = await fetch(`${endpointRoute}?issue-client-upload=1`, {\n        body: JSON.stringify({\n          collectionSlug,\n          docPrefix,\n          filename: file.name,\n          mimeType: file.type,\n        }),\n        credentials: 'include',\n        headers: { 'Content-Type': 'application/json' },\n        method: 'POST',\n      })\n      if (!issued.ok) {\n        throw new Error('Failed to initialize Vercel Blob client upload')\n      }\n\n      const { clientUploadContext, filename, pathname } = (await issued.json()) as {\n        clientUploadContext: ClientUploadContext\n        filename: string\n        pathname: string\n      }\n      updateFilename(filename)\n\n      await upload(pathname, file, {\n        access: 'public',\n        clientPayload: JSON.stringify({\n          collectionSlug,\n          mimeType: file.type,\n          signedReceipt: clientUploadContext.signedReceipt,\n        }),\n        contentType: file.type,\n        handleUploadUrl: endpointRoute,\n      })\n\n      return {\n        prefix: clientUploadContext.prefix,\n        signedReceipt: clientUploadContext.signedReceipt,\n      }\n    },\n  })\n"],"names":["createClientUploadHandler","upload","formatAdminURL","VercelBlobClientUploadHandler","handler","apiRoute","collectionSlug","docPrefix","file","serverHandlerPath","serverURL","updateFilename","endpointRoute","path","issued","fetch","body","JSON","stringify","filename","name","mimeType","type","credentials","headers","method","ok","Error","clientUploadContext","pathname","json","access","clientPayload","signedReceipt","contentType","handleUploadUrl","prefix"],"mappings":"AAAA;AAGA,SAASA,yBAAyB,QAAQ,0CAAyC;AACnF,SAASC,MAAM,QAAQ,sBAAqB;AAC5C,SAASC,cAAc,QAAQ,iBAAgB;AAO/C,OAAO,MAAMC,gCACXH,0BAA8D;IAC5DI,SAAS,OAAO,EACdC,QAAQ,EACRC,cAAc,EACdC,SAAS,EACTC,IAAI,EACJC,iBAAiB,EACjBC,SAAS,EACTC,cAAc,EACf;QACC,MAAMC,gBAAgBV,eAAe;YACnCG;YACAQ,MAAMJ;YACNC;QACF;QACA,MAAMI,SAAS,MAAMC,MAAM,GAAGH,cAAc,sBAAsB,CAAC,EAAE;YACnEI,MAAMC,KAAKC,SAAS,CAAC;gBACnBZ;gBACAC;gBACAY,UAAUX,KAAKY,IAAI;gBACnBC,UAAUb,KAAKc,IAAI;YACrB;YACAC,aAAa;YACbC,SAAS;gBAAE,gBAAgB;YAAmB;YAC9CC,QAAQ;QACV;QACA,IAAI,CAACX,OAAOY,EAAE,EAAE;YACd,MAAM,IAAIC,MAAM;QAClB;QAEA,MAAM,EAAEC,mBAAmB,EAAET,QAAQ,EAAEU,QAAQ,EAAE,GAAI,MAAMf,OAAOgB,IAAI;QAKtEnB,eAAeQ;QAEf,MAAMlB,OAAO4B,UAAUrB,MAAM;YAC3BuB,QAAQ;YACRC,eAAef,KAAKC,SAAS,CAAC;gBAC5BZ;gBACAe,UAAUb,KAAKc,IAAI;gBACnBW,eAAeL,oBAAoBK,aAAa;YAClD;YACAC,aAAa1B,KAAKc,IAAI;YACtBa,iBAAiBvB;QACnB;QAEA,OAAO;YACLwB,QAAQR,oBAAoBQ,MAAM;YAClCH,eAAeL,oBAAoBK,aAAa;QAClD;IACF;AACF,GAAE"}

package/dist/deleteFile.d.ts

@@ -1,11 +1,8 @@
 interface DeleteFileArgs {
     baseUrl: string;
-    collectionPrefix?: string;
-    docPrefix: string;
-    filename: string;
+    storageFilePath: string;
     token: string;
-    useCompositePrefixes?: boolean;
 }
-export declare function deleteFile({ baseUrl, collectionPrefix, docPrefix, filename, token, useCompositePrefixes, }: DeleteFileArgs): Promise<void>;
+export declare function deleteFile({ baseUrl, storageFilePath, token, }: DeleteFileArgs): Promise<void>;
 export {};
 //# sourceMappingURL=deleteFile.d.ts.map

package/dist/deleteFile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deleteFile.d.ts","sourceRoot":"","sources":["../src/deleteFile.ts"],"names":[],"mappings":"AAIA,UAAU,cAAc;IACtB,OAAO,EAAE,MAAM,CAAA;IACf,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,wBAAsB,UAAU,CAAC,EAC/B,OAAO,EACP,gBAAqB,EACrB,SAAS,EACT,QAAQ,EACR,KAAK,EACL,oBAA4B,GAC7B,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAUhC"}
+{"version":3,"file":"deleteFile.d.ts","sourceRoot":"","sources":["../src/deleteFile.ts"],"names":[],"mappings":"AAIA,UAAU,cAAc;IACtB,OAAO,EAAE,MAAM,CAAA;IACf,eAAe,EAAE,MAAM,CAAA;IACvB,KAAK,EAAE,MAAM,CAAA;CACd;AAED,wBAAsB,UAAU,CAAC,EAC/B,OAAO,EACP,eAAe,EACf,KAAK,GACN,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAEhC"}

package/dist/deleteFile.js

@@ -1,14 +1,7 @@
 import { del } from '@vercel/blob';
-import { generateURL } from './generateURL.js';
-export async function deleteFile({ baseUrl, collectionPrefix = '', docPrefix, filename, token, useCompositePrefixes = false }) {
-    const fileUrl = generateURL({
-        baseUrl,
-        collectionPrefix,
-        filename,
-        prefix: docPrefix,
-        useCompositePrefixes
-    });
-    await del(fileUrl, {
+import { buildBlobUrl } from './generateURL.js';
+export async function deleteFile({ baseUrl, storageFilePath, token }) {
+    await del(buildBlobUrl(baseUrl, storageFilePath), {
         token
     });
 }

package/dist/deleteFile.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/deleteFile.ts"],"sourcesContent":["import { del } from '@vercel/blob'\n\nimport { generateURL } from './generateURL.js'\n\ninterface DeleteFileArgs {\n  baseUrl: string\n  collectionPrefix?: string\n  docPrefix: string\n  filename: string\n  token: string\n  useCompositePrefixes?: boolean\n}\n\nexport async function deleteFile({\n  baseUrl,\n  collectionPrefix = '',\n  docPrefix,\n  filename,\n  token,\n  useCompositePrefixes = false,\n}: DeleteFileArgs): Promise<void> {\n  const fileUrl = generateURL({\n    baseUrl,\n    collectionPrefix,\n    filename,\n    prefix: docPrefix,\n    useCompositePrefixes,\n  })\n\n  await del(fileUrl, { token })\n}\n"],"names":["del","generateURL","deleteFile","baseUrl","collectionPrefix","docPrefix","filename","token","useCompositePrefixes","fileUrl","prefix"],"mappings":"AAAA,SAASA,GAAG,QAAQ,eAAc;AAElC,SAASC,WAAW,QAAQ,mBAAkB;AAW9C,OAAO,eAAeC,WAAW,EAC/BC,OAAO,EACPC,mBAAmB,EAAE,EACrBC,SAAS,EACTC,QAAQ,EACRC,KAAK,EACLC,uBAAuB,KAAK,EACb;IACf,MAAMC,UAAUR,YAAY;QAC1BE;QACAC;QACAE;QACAI,QAAQL;QACRG;IACF;IAEA,MAAMR,IAAIS,SAAS;QAAEF;IAAM;AAC7B"}
+{"version":3,"sources":["../src/deleteFile.ts"],"sourcesContent":["import { del } from '@vercel/blob'\n\nimport { buildBlobUrl } from './generateURL.js'\n\ninterface DeleteFileArgs {\n  baseUrl: string\n  storageFilePath: string\n  token: string\n}\n\nexport async function deleteFile({\n  baseUrl,\n  storageFilePath,\n  token,\n}: DeleteFileArgs): Promise<void> {\n  await del(buildBlobUrl(baseUrl, storageFilePath), { token })\n}\n"],"names":["del","buildBlobUrl","deleteFile","baseUrl","storageFilePath","token"],"mappings":"AAAA,SAASA,GAAG,QAAQ,eAAc;AAElC,SAASC,YAAY,QAAQ,mBAAkB;AAQ/C,OAAO,eAAeC,WAAW,EAC/BC,OAAO,EACPC,eAAe,EACfC,KAAK,EACU;IACf,MAAML,IAAIC,aAAaE,SAASC,kBAAkB;QAAEC;IAAM;AAC5D"}

package/dist/generateURL.d.ts

@@ -5,6 +5,7 @@ interface GenerateURLArgs {
     prefix: string;
     useCompositePrefixes?: boolean;
 }
+export declare function buildBlobUrl(baseUrl: string, fileKey: string): string;
 export declare function generateURL({ baseUrl, collectionPrefix, filename, prefix, useCompositePrefixes, }: GenerateURLArgs): string;
 export {};
 //# sourceMappingURL=generateURL.d.ts.map

package/dist/generateURL.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generateURL.d.ts","sourceRoot":"","sources":["../src/generateURL.ts"],"names":[],"mappings":"AAGA,UAAU,eAAe;IACvB,OAAO,EAAE,MAAM,CAAA;IACf,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,wBAAgB,WAAW,CAAC,EAC1B,OAAO,EACP,gBAAqB,EACrB,QAAQ,EACR,MAAM,EACN,oBAA4B,GAC7B,EAAE,eAAe,GAAG,MAAM,CAgB1B"}
+{"version":3,"file":"generateURL.d.ts","sourceRoot":"","sources":["../src/generateURL.ts"],"names":[],"mappings":"AAGA,UAAU,eAAe;IACvB,OAAO,EAAE,MAAM,CAAA;IACf,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAGD,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAUrE;AAED,wBAAgB,WAAW,CAAC,EAC1B,OAAO,EACP,gBAAqB,EACrB,QAAQ,EACR,MAAM,EACN,oBAA4B,GAC7B,EAAE,eAAe,GAAG,MAAM,CAS1B"}

package/dist/generateURL.js

@@ -1,19 +1,23 @@
-import { getFileKey } from '@payloadcms/plugin-cloud-storage/utilities';
+import { buildStoragePathData } from '@payloadcms/plugin-cloud-storage/utilities';
 import path from 'path';
+// Builds the public blob URL for a storage key, URL-encoding only the filename segment.
+export function buildBlobUrl(baseUrl, fileKey) {
+    // example: "my-collection/my-doc/my file.jpg" -> "my-collection/my-doc"
+    const dir = path.posix.dirname(fileKey);
+    // example: "my file.jpg" -> "my%20file.jpg"
+    const encodedFilename = encodeURIComponent(path.posix.basename(fileKey));
+    // example: "my-collection/my-doc/my%20file.jpg"
+    const fileKeyWithEncodedFilename = dir === '.' ? encodedFilename : path.posix.join(dir, encodedFilename);
+    return `${baseUrl}/${fileKeyWithEncodedFilename}`;
+}
 export function generateURL({ baseUrl, collectionPrefix = '', filename, prefix, useCompositePrefixes = false }) {
-    const { fileKey: fileKeyWithPrefix } = getFileKey({
+    const { storageFilePath } = buildStoragePathData({
         collectionPrefix,
         docPrefix: prefix,
         filename,
         useCompositePrefixes
     });
-    // example: "my-collection/my-doc/my file.jpg" -> "my-collection/my-doc"
-    const dir = path.posix.dirname(fileKeyWithPrefix);
-    // example: "my file.jpg" -> "my%20file.jpg"
-    const encodedFilename = encodeURIComponent(path.posix.basename(fileKeyWithPrefix));
-    // example: "my-collection/my-doc/my%20file.jpg"
-    const fileKeyWithEncodedFilename = dir === '.' ? encodedFilename : path.posix.join(dir, encodedFilename);
-    return `${baseUrl}/${fileKeyWithEncodedFilename}`;
+    return buildBlobUrl(baseUrl, storageFilePath);
 }
 
 //# sourceMappingURL=generateURL.js.map

package/dist/generateURL.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/generateURL.ts"],"sourcesContent":["import { getFileKey } from '@payloadcms/plugin-cloud-storage/utilities'\nimport path from 'path'\n\ninterface GenerateURLArgs {\n  baseUrl: string\n  collectionPrefix?: string\n  filename: string\n  prefix: string\n  useCompositePrefixes?: boolean\n}\n\nexport function generateURL({\n  baseUrl,\n  collectionPrefix = '',\n  filename,\n  prefix,\n  useCompositePrefixes = false,\n}: GenerateURLArgs): string {\n  const { fileKey: fileKeyWithPrefix } = getFileKey({\n    collectionPrefix,\n    docPrefix: prefix,\n    filename,\n    useCompositePrefixes,\n  })\n  // example: \"my-collection/my-doc/my file.jpg\" -> \"my-collection/my-doc\"\n  const dir = path.posix.dirname(fileKeyWithPrefix)\n  // example: \"my file.jpg\" -> \"my%20file.jpg\"\n  const encodedFilename = encodeURIComponent(path.posix.basename(fileKeyWithPrefix))\n  // example: \"my-collection/my-doc/my%20file.jpg\"\n  const fileKeyWithEncodedFilename =\n    dir === '.' ? encodedFilename : path.posix.join(dir, encodedFilename)\n\n  return `${baseUrl}/${fileKeyWithEncodedFilename}`\n}\n"],"names":["getFileKey","path","generateURL","baseUrl","collectionPrefix","filename","prefix","useCompositePrefixes","fileKey","fileKeyWithPrefix","docPrefix","dir","posix","dirname","encodedFilename","encodeURIComponent","basename","fileKeyWithEncodedFilename","join"],"mappings":"AAAA,SAASA,UAAU,QAAQ,6CAA4C;AACvE,OAAOC,UAAU,OAAM;AAUvB,OAAO,SAASC,YAAY,EAC1BC,OAAO,EACPC,mBAAmB,EAAE,EACrBC,QAAQ,EACRC,MAAM,EACNC,uBAAuB,KAAK,EACZ;IAChB,MAAM,EAAEC,SAASC,iBAAiB,EAAE,GAAGT,WAAW;QAChDI;QACAM,WAAWJ;QACXD;QACAE;IACF;IACA,wEAAwE;IACxE,MAAMI,MAAMV,KAAKW,KAAK,CAACC,OAAO,CAACJ;IAC/B,4CAA4C;IAC5C,MAAMK,kBAAkBC,mBAAmBd,KAAKW,KAAK,CAACI,QAAQ,CAACP;IAC/D,gDAAgD;IAChD,MAAMQ,6BACJN,QAAQ,MAAMG,kBAAkBb,KAAKW,KAAK,CAACM,IAAI,CAACP,KAAKG;IAEvD,OAAO,GAAGX,QAAQ,CAAC,EAAEc,4BAA4B;AACnD"}
+{"version":3,"sources":["../src/generateURL.ts"],"sourcesContent":["import { buildStoragePathData } from '@payloadcms/plugin-cloud-storage/utilities'\nimport path from 'path'\n\ninterface GenerateURLArgs {\n  baseUrl: string\n  collectionPrefix?: string\n  filename: string\n  prefix: string\n  useCompositePrefixes?: boolean\n}\n\n// Builds the public blob URL for a storage key, URL-encoding only the filename segment.\nexport function buildBlobUrl(baseUrl: string, fileKey: string): string {\n  // example: \"my-collection/my-doc/my file.jpg\" -> \"my-collection/my-doc\"\n  const dir = path.posix.dirname(fileKey)\n  // example: \"my file.jpg\" -> \"my%20file.jpg\"\n  const encodedFilename = encodeURIComponent(path.posix.basename(fileKey))\n  // example: \"my-collection/my-doc/my%20file.jpg\"\n  const fileKeyWithEncodedFilename =\n    dir === '.' ? encodedFilename : path.posix.join(dir, encodedFilename)\n\n  return `${baseUrl}/${fileKeyWithEncodedFilename}`\n}\n\nexport function generateURL({\n  baseUrl,\n  collectionPrefix = '',\n  filename,\n  prefix,\n  useCompositePrefixes = false,\n}: GenerateURLArgs): string {\n  const { storageFilePath } = buildStoragePathData({\n    collectionPrefix,\n    docPrefix: prefix,\n    filename,\n    useCompositePrefixes,\n  })\n\n  return buildBlobUrl(baseUrl, storageFilePath)\n}\n"],"names":["buildStoragePathData","path","buildBlobUrl","baseUrl","fileKey","dir","posix","dirname","encodedFilename","encodeURIComponent","basename","fileKeyWithEncodedFilename","join","generateURL","collectionPrefix","filename","prefix","useCompositePrefixes","storageFilePath","docPrefix"],"mappings":"AAAA,SAASA,oBAAoB,QAAQ,6CAA4C;AACjF,OAAOC,UAAU,OAAM;AAUvB,wFAAwF;AACxF,OAAO,SAASC,aAAaC,OAAe,EAAEC,OAAe;IAC3D,wEAAwE;IACxE,MAAMC,MAAMJ,KAAKK,KAAK,CAACC,OAAO,CAACH;IAC/B,4CAA4C;IAC5C,MAAMI,kBAAkBC,mBAAmBR,KAAKK,KAAK,CAACI,QAAQ,CAACN;IAC/D,gDAAgD;IAChD,MAAMO,6BACJN,QAAQ,MAAMG,kBAAkBP,KAAKK,KAAK,CAACM,IAAI,CAACP,KAAKG;IAEvD,OAAO,GAAGL,QAAQ,CAAC,EAAEQ,4BAA4B;AACnD;AAEA,OAAO,SAASE,YAAY,EAC1BV,OAAO,EACPW,mBAAmB,EAAE,EACrBC,QAAQ,EACRC,MAAM,EACNC,uBAAuB,KAAK,EACZ;IAChB,MAAM,EAAEC,eAAe,EAAE,GAAGlB,qBAAqB;QAC/Cc;QACAK,WAAWH;QACXD;QACAE;IACF;IAEA,OAAOf,aAAaC,SAASe;AAC/B"}

package/dist/getClientUploadRoute.d.ts

@@ -1,4 +1,5 @@
 import type { PayloadHandler, PayloadRequest, UploadCollectionSlug } from 'payload';
+import type { VercelBlobCollectionOptions } from './authorizeFileOverwrite.js';
 type Args = {
     access?: (args: {
         collectionSlug: UploadCollectionSlug;
@@ -6,8 +7,10 @@ type Args = {
     }) => boolean | Promise<boolean>;
     addRandomSuffix?: boolean;
     cacheControlMaxAge?: number;
+    collections: VercelBlobCollectionOptions;
     token: string;
+    useCompositePrefixes?: boolean;
 };
-export declare const getClientUploadRoute: ({ access, addRandomSuffix, cacheControlMaxAge, token }: Args) => PayloadHandler;
+export declare const getClientUploadRoute: ({ access, cacheControlMaxAge, collections, token, useCompositePrefixes, }: Args) => PayloadHandler;
 export {};
 //# sourceMappingURL=getClientUploadRoute.d.ts.map

package/dist/getClientUploadRoute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getClientUploadRoute.d.ts","sourceRoot":"","sources":["../src/getClientUploadRoute.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAKnF,KAAK,IAAI,GAAG;IACV,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE;QACd,cAAc,EAAE,oBAAoB,CAAA;QACpC,GAAG,EAAE,cAAc,CAAA;KACpB,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAChC,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAID,eAAO,MAAM,oBAAoB,2DAC0C,IAAI,KAAG,cAgC/E,CAAA"}
+{"version":3,"file":"getClientUploadRoute.d.ts","sourceRoot":"","sources":["../src/getClientUploadRoute.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAenF,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,6BAA6B,CAAA;AAI9E,KAAK,IAAI,GAAG;IACV,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE;QACd,cAAc,EAAE,oBAAoB,CAAA;QACpC,GAAG,EAAE,cAAc,CAAA;KACpB,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAChC,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,WAAW,EAAE,2BAA2B,CAAA;IACxC,KAAK,EAAE,MAAM,CAAA;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B,CAAA;AAID,eAAO,MAAM,oBAAoB,8EAO5B,IAAI,KAAG,cA8JT,CAAA"}

package/dist/getClientUploadRoute.js

@@ -1,26 +1,136 @@
+import { buildStoragePathData, resolveSignedURLKey, verifyClientUploadReceiptForFileKey } from '@payloadcms/plugin-cloud-storage/utilities';
 import { handleUpload } from '@vercel/blob/client';
 import { APIError, Forbidden } from 'payload';
+import { assertClientUploadAccess, assertClientUploadAllowed, createClientUploadReceipt } from 'payload/internal';
+import { authorizeClientOverwrite } from './authorizeFileOverwrite.js';
 const defaultAccess = ({ req })=>!!req.user;
-export const getClientUploadRoute = ({ access = defaultAccess, addRandomSuffix, cacheControlMaxAge, token })=>async (req)=>{
-        const body = await req.json();
+export const getClientUploadRoute = ({ access = defaultAccess, cacheControlMaxAge, collections, token, useCompositePrefixes })=>async (req)=>{
         try {
+            if (req.searchParams.get('issue-client-upload') === '1') {
+                const { collectionSlug, docPrefix, filename, mimeType } = await req.json();
+                if (typeof collectionSlug !== 'string' || typeof filename !== 'string' || typeof mimeType !== 'string' || docPrefix !== undefined && typeof docPrefix !== 'string' || !Object.hasOwn(collections, collectionSlug)) {
+                    throw new APIError('Invalid upload payload', 400);
+                }
+                await assertClientUploadAccess({
+                    collectionSlug,
+                    req
+                });
+                if (!await access({
+                    collectionSlug,
+                    req
+                })) {
+                    throw new Forbidden();
+                }
+                assertClientUploadAllowed({
+                    collection: req.payload.collections[collectionSlug]?.config,
+                    filename,
+                    mimeType
+                });
+                const collectionConfig = collections[collectionSlug];
+                const collectionPrefix = typeof collectionConfig === 'object' && collectionConfig.prefix || '';
+                const requested = buildStoragePathData({
+                    collectionPrefix,
+                    docPrefix,
+                    filename,
+                    useCompositePrefixes
+                });
+                const allowOverwrite = await authorizeClientOverwrite({
+                    collectionPrefix,
+                    collections,
+                    req,
+                    requestedCollectionSlug: collectionSlug,
+                    requestedFilename: requested.sanitizedFilename,
+                    requestedStorageFilePath: requested.storageFilePath,
+                    useCompositePrefixes
+                });
+                const resolved = allowOverwrite ? {
+                    ...requested,
+                    clientUploadContext: {
+                        allowOverwrite: true,
+                        prefix: requested.sanitizedDocPrefix,
+                        signedReceipt: createClientUploadReceipt({
+                            collectionSlug,
+                            context: {
+                                allowOverwrite: true,
+                                prefix: requested.sanitizedDocPrefix
+                            },
+                            filename: requested.sanitizedFilename,
+                            req
+                        })
+                    }
+                } : await resolveSignedURLKey({
+                    collectionPrefix,
+                    collectionSlug,
+                    docPrefix,
+                    filename,
+                    req,
+                    useCompositePrefixes
+                });
+                return Response.json({
+                    clientUploadContext: resolved.clientUploadContext,
+                    filename: resolved.sanitizedFilename,
+                    pathname: resolved.storageFilePath
+                });
+            }
+            const body = await req.json();
             const jsonResponse = await handleUpload({
                 body,
-                onBeforeGenerateToken: async (_pathname, collectionSlug)=>{
-                    if (!collectionSlug) {
+                onBeforeGenerateToken: async (pathname, clientPayload)=>{
+                    if (!clientPayload) {
                         throw new APIError('No payload was provided');
                     }
+                    let parsed;
+                    try {
+                        parsed = JSON.parse(clientPayload);
+                    } catch  {
+                        parsed = {
+                            collectionSlug: clientPayload
+                        };
+                    }
+                    if (typeof parsed.collectionSlug !== 'string' || !parsed.collectionSlug || parsed.mimeType !== undefined && typeof parsed.mimeType !== 'string' || typeof parsed.signedReceipt !== 'string') {
+                        throw new APIError('Invalid upload payload', 400);
+                    }
+                    const { collectionSlug, mimeType, signedReceipt } = parsed;
+                    await assertClientUploadAccess({
+                        collectionSlug,
+                        req
+                    });
+                    if (!Object.hasOwn(collections, collectionSlug)) {
+                        throw new APIError('Invalid upload payload', 400);
+                    }
                     if (!await access({
                         collectionSlug,
                         req
                     })) {
                         throw new Forbidden();
                     }
-                    return Promise.resolve({
-                        addRandomSuffix,
-                        allowOverwrite: true,
-                        cacheControlMaxAge
+                    const collectionConfig = collections[collectionSlug];
+                    const collectionPrefix = typeof collectionConfig === 'object' && collectionConfig.prefix || '';
+                    const receipt = verifyClientUploadReceiptForFileKey({
+                        collectionPrefix,
+                        collectionSlug,
+                        expectedFileKey: pathname,
+                        req,
+                        signedReceipt,
+                        useCompositePrefixes
+                    });
+                    assertClientUploadAllowed({
+                        collection: req.payload.collections[collectionSlug]?.config,
+                        filename: pathname,
+                        mimeType
                     });
+                    return {
+                        addRandomSuffix: false,
+                        ...mimeType ? {
+                            allowedContentTypes: [
+                                mimeType
+                            ]
+                        } : {},
+                        ...receipt.context.allowOverwrite === true && {
+                            allowOverwrite: true
+                        },
+                        cacheControlMaxAge
+                    };
                 },
                 onUploadCompleted: async ()=>{},
                 request: req,
@@ -28,6 +138,9 @@ export const getClientUploadRoute = ({ access = defaultAccess, addRandomSuffix,
             });
             return Response.json(jsonResponse);
         } catch (error) {
+            if (error instanceof APIError) {
+                throw error;
+            }
             req.payload.logger.error(error);
             throw new APIError('storage-vercel-blob client upload route error');
         }

package/dist/getClientUploadRoute.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/getClientUploadRoute.ts"],"sourcesContent":["import type { PayloadHandler, PayloadRequest, UploadCollectionSlug } from 'payload'\n\nimport { handleUpload, type HandleUploadBody } from '@vercel/blob/client'\nimport { APIError, Forbidden } from 'payload'\n\ntype Args = {\n  access?: (args: {\n    collectionSlug: UploadCollectionSlug\n    req: PayloadRequest\n  }) => boolean | Promise<boolean>\n  addRandomSuffix?: boolean\n  cacheControlMaxAge?: number\n  token: string\n}\n\nconst defaultAccess: Args['access'] = ({ req }) => !!req.user\n\nexport const getClientUploadRoute =\n  ({ access = defaultAccess, addRandomSuffix, cacheControlMaxAge, token }: Args): PayloadHandler =>\n  async (req) => {\n    const body = (await req.json!()) as HandleUploadBody\n\n    try {\n      const jsonResponse = await handleUpload({\n        body,\n        onBeforeGenerateToken: async (_pathname: string, collectionSlug: null | string) => {\n          if (!collectionSlug) {\n            throw new APIError('No payload was provided')\n          }\n\n          if (!(await access({ collectionSlug, req }))) {\n            throw new Forbidden()\n          }\n\n          return Promise.resolve({\n            addRandomSuffix,\n            allowOverwrite: true,\n            cacheControlMaxAge,\n          })\n        },\n        onUploadCompleted: async () => {},\n        request: req as Request,\n        token,\n      })\n\n      return Response.json(jsonResponse)\n    } catch (error) {\n      req.payload.logger.error(error)\n      throw new APIError('storage-vercel-blob client upload route error')\n    }\n  }\n"],"names":["handleUpload","APIError","Forbidden","defaultAccess","req","user","getClientUploadRoute","access","addRandomSuffix","cacheControlMaxAge","token","body","json","jsonResponse","onBeforeGenerateToken","_pathname","collectionSlug","Promise","resolve","allowOverwrite","onUploadCompleted","request","Response","error","payload","logger"],"mappings":"AAEA,SAASA,YAAY,QAA+B,sBAAqB;AACzE,SAASC,QAAQ,EAAEC,SAAS,QAAQ,UAAS;AAY7C,MAAMC,gBAAgC,CAAC,EAAEC,GAAG,EAAE,GAAK,CAAC,CAACA,IAAIC,IAAI;AAE7D,OAAO,MAAMC,uBACX,CAAC,EAAEC,SAASJ,aAAa,EAAEK,eAAe,EAAEC,kBAAkB,EAAEC,KAAK,EAAQ,GAC7E,OAAON;QACL,MAAMO,OAAQ,MAAMP,IAAIQ,IAAI;QAE5B,IAAI;YACF,MAAMC,eAAe,MAAMb,aAAa;gBACtCW;gBACAG,uBAAuB,OAAOC,WAAmBC;oBAC/C,IAAI,CAACA,gBAAgB;wBACnB,MAAM,IAAIf,SAAS;oBACrB;oBAEA,IAAI,CAAE,MAAMM,OAAO;wBAAES;wBAAgBZ;oBAAI,IAAK;wBAC5C,MAAM,IAAIF;oBACZ;oBAEA,OAAOe,QAAQC,OAAO,CAAC;wBACrBV;wBACAW,gBAAgB;wBAChBV;oBACF;gBACF;gBACAW,mBAAmB,WAAa;gBAChCC,SAASjB;gBACTM;YACF;YAEA,OAAOY,SAASV,IAAI,CAACC;QACvB,EAAE,OAAOU,OAAO;YACdnB,IAAIoB,OAAO,CAACC,MAAM,CAACF,KAAK,CAACA;YACzB,MAAM,IAAItB,SAAS;QACrB;IACF,EAAC"}
+{"version":3,"sources":["../src/getClientUploadRoute.ts"],"sourcesContent":["import type { PayloadHandler, PayloadRequest, UploadCollectionSlug } from 'payload'\n\nimport {\n  buildStoragePathData,\n  resolveSignedURLKey,\n  verifyClientUploadReceiptForFileKey,\n} from '@payloadcms/plugin-cloud-storage/utilities'\nimport { handleUpload, type HandleUploadBody } from '@vercel/blob/client'\nimport { APIError, Forbidden } from 'payload'\nimport {\n  assertClientUploadAccess,\n  assertClientUploadAllowed,\n  createClientUploadReceipt,\n} from 'payload/internal'\n\nimport type { VercelBlobCollectionOptions } from './authorizeFileOverwrite.js'\n\nimport { authorizeClientOverwrite } from './authorizeFileOverwrite.js'\n\ntype Args = {\n  access?: (args: {\n    collectionSlug: UploadCollectionSlug\n    req: PayloadRequest\n  }) => boolean | Promise<boolean>\n  addRandomSuffix?: boolean\n  cacheControlMaxAge?: number\n  collections: VercelBlobCollectionOptions\n  token: string\n  useCompositePrefixes?: boolean\n}\n\nconst defaultAccess: Args['access'] = ({ req }) => !!req.user\n\nexport const getClientUploadRoute =\n  ({\n    access = defaultAccess,\n    cacheControlMaxAge,\n    collections,\n    token,\n    useCompositePrefixes,\n  }: Args): PayloadHandler =>\n  async (req) => {\n    try {\n      if (req.searchParams.get('issue-client-upload') === '1') {\n        const { collectionSlug, docPrefix, filename, mimeType } = (await req.json!()) as {\n          collectionSlug?: unknown\n          docPrefix?: unknown\n          filename?: unknown\n          mimeType?: unknown\n        }\n        if (\n          typeof collectionSlug !== 'string' ||\n          typeof filename !== 'string' ||\n          typeof mimeType !== 'string' ||\n          (docPrefix !== undefined && typeof docPrefix !== 'string') ||\n          !Object.hasOwn(collections, collectionSlug)\n        ) {\n          throw new APIError('Invalid upload payload', 400)\n        }\n\n        await assertClientUploadAccess({ collectionSlug, req })\n\n        if (!(await access({ collectionSlug, req }))) {\n          throw new Forbidden()\n        }\n        assertClientUploadAllowed({\n          collection: req.payload.collections[collectionSlug]?.config,\n          filename,\n          mimeType,\n        })\n        const collectionConfig = collections[collectionSlug]\n        const collectionPrefix =\n          (typeof collectionConfig === 'object' && collectionConfig.prefix) || ''\n        const requested = buildStoragePathData({\n          collectionPrefix,\n          docPrefix,\n          filename,\n          useCompositePrefixes,\n        })\n        const allowOverwrite = await authorizeClientOverwrite({\n          collectionPrefix,\n          collections,\n          req,\n          requestedCollectionSlug: collectionSlug,\n          requestedFilename: requested.sanitizedFilename,\n          requestedStorageFilePath: requested.storageFilePath,\n          useCompositePrefixes,\n        })\n        const resolved = allowOverwrite\n          ? {\n              ...requested,\n              clientUploadContext: {\n                allowOverwrite: true,\n                prefix: requested.sanitizedDocPrefix,\n                signedReceipt: createClientUploadReceipt({\n                  collectionSlug,\n                  context: {\n                    allowOverwrite: true,\n                    prefix: requested.sanitizedDocPrefix,\n                  },\n                  filename: requested.sanitizedFilename,\n                  req,\n                }),\n              },\n            }\n          : await resolveSignedURLKey({\n              collectionPrefix,\n              collectionSlug,\n              docPrefix,\n              filename,\n              req,\n              useCompositePrefixes,\n            })\n        return Response.json({\n          clientUploadContext: resolved.clientUploadContext,\n          filename: resolved.sanitizedFilename,\n          pathname: resolved.storageFilePath,\n        })\n      }\n\n      const body = (await req.json!()) as HandleUploadBody\n      const jsonResponse = await handleUpload({\n        body,\n        onBeforeGenerateToken: async (pathname: string, clientPayload: null | string) => {\n          if (!clientPayload) {\n            throw new APIError('No payload was provided')\n          }\n\n          let parsed: { collectionSlug?: unknown; mimeType?: unknown; signedReceipt?: unknown }\n          try {\n            parsed = JSON.parse(clientPayload) as {\n              collectionSlug?: unknown\n              mimeType?: unknown\n              signedReceipt?: unknown\n            }\n          } catch {\n            parsed = { collectionSlug: clientPayload }\n          }\n\n          if (\n            typeof parsed.collectionSlug !== 'string' ||\n            !parsed.collectionSlug ||\n            (parsed.mimeType !== undefined && typeof parsed.mimeType !== 'string') ||\n            typeof parsed.signedReceipt !== 'string'\n          ) {\n            throw new APIError('Invalid upload payload', 400)\n          }\n\n          const { collectionSlug, mimeType, signedReceipt } = parsed\n\n          await assertClientUploadAccess({ collectionSlug, req })\n\n          if (!Object.hasOwn(collections, collectionSlug)) {\n            throw new APIError('Invalid upload payload', 400)\n          }\n\n          if (!(await access({ collectionSlug, req }))) {\n            throw new Forbidden()\n          }\n          const collectionConfig = collections[collectionSlug]\n          const collectionPrefix =\n            (typeof collectionConfig === 'object' && collectionConfig.prefix) || ''\n          const receipt = verifyClientUploadReceiptForFileKey({\n            collectionPrefix,\n            collectionSlug,\n            expectedFileKey: pathname,\n            req,\n            signedReceipt,\n            useCompositePrefixes,\n          })\n\n          assertClientUploadAllowed({\n            collection: req.payload.collections[collectionSlug]?.config,\n            filename: pathname,\n            mimeType,\n          })\n\n          return {\n            addRandomSuffix: false,\n            ...(mimeType ? { allowedContentTypes: [mimeType] } : {}),\n            ...(receipt.context.allowOverwrite === true && { allowOverwrite: true }),\n            cacheControlMaxAge,\n          }\n        },\n        onUploadCompleted: async () => {},\n        request: req as Request,\n        token,\n      })\n\n      return Response.json(jsonResponse)\n    } catch (error) {\n      if (error instanceof APIError) {\n        throw error\n      }\n\n      req.payload.logger.error(error)\n      throw new APIError('storage-vercel-blob client upload route error')\n    }\n  }\n"],"names":["buildStoragePathData","resolveSignedURLKey","verifyClientUploadReceiptForFileKey","handleUpload","APIError","Forbidden","assertClientUploadAccess","assertClientUploadAllowed","createClientUploadReceipt","authorizeClientOverwrite","defaultAccess","req","user","getClientUploadRoute","access","cacheControlMaxAge","collections","token","useCompositePrefixes","searchParams","get","collectionSlug","docPrefix","filename","mimeType","json","undefined","Object","hasOwn","collection","payload","config","collectionConfig","collectionPrefix","prefix","requested","allowOverwrite","requestedCollectionSlug","requestedFilename","sanitizedFilename","requestedStorageFilePath","storageFilePath","resolved","clientUploadContext","sanitizedDocPrefix","signedReceipt","context","Response","pathname","body","jsonResponse","onBeforeGenerateToken","clientPayload","parsed","JSON","parse","receipt","expectedFileKey","addRandomSuffix","allowedContentTypes","onUploadCompleted","request","error","logger"],"mappings":"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"}

package/dist/getFile.d.ts

@@ -1,17 +1,17 @@
-import type { CollectionConfig, PayloadRequest } from 'payload';
+import type { CollectionConfig, PayloadRequest, TypeWithID } from 'payload';
 interface GetFileArgs {
     baseUrl: string;
     cacheControlMaxAge: number;
     clientUploadContext?: unknown;
     collection: CollectionConfig;
     collectionPrefix?: string;
+    doc?: TypeWithID;
     filename: string;
     incomingHeaders?: Headers;
-    prefixQueryParam?: string;
     req: PayloadRequest;
     token: string;
     useCompositePrefixes?: boolean;
 }
-export declare function getFile({ baseUrl, cacheControlMaxAge, clientUploadContext, collection, collectionPrefix, filename, incomingHeaders, prefixQueryParam, req, token, useCompositePrefixes, }: GetFileArgs): Promise<Response>;
+export declare function getFile({ baseUrl, cacheControlMaxAge, clientUploadContext, collection, collectionPrefix, doc, filename, incomingHeaders, req, token, useCompositePrefixes, }: GetFileArgs): Promise<Response>;
 export {};
 //# sourceMappingURL=getFile.d.ts.map

package/dist/getFile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getFile.d.ts","sourceRoot":"","sources":["../src/getFile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAQ/D,UAAU,WAAW;IACnB,OAAO,EAAE,MAAM,CAAA;IACf,kBAAkB,EAAE,MAAM,CAAA;IAC1B,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAC7B,UAAU,EAAE,gBAAgB,CAAA;IAC5B,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,QAAQ,EAAE,MAAM,CAAA;IAChB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,GAAG,EAAE,cAAc,CAAA;IACnB,KAAK,EAAE,MAAM,CAAA;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,wBAAsB,OAAO,CAAC,EAC5B,OAAO,EACP,kBAAkB,EAClB,mBAAmB,EACnB,UAAU,EACV,gBAAqB,EACrB,QAAQ,EACR,eAAe,EACf,gBAAgB,EAChB,GAAG,EACH,KAAK,EACL,oBAA4B,GAC7B,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CA8FjC"}
+{"version":3,"file":"getFile.d.ts","sourceRoot":"","sources":["../src/getFile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAY3E,UAAU,WAAW;IACnB,OAAO,EAAE,MAAM,CAAA;IACf,kBAAkB,EAAE,MAAM,CAAA;IAC1B,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAC7B,UAAU,EAAE,gBAAgB,CAAA;IAC5B,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,GAAG,CAAC,EAAE,UAAU,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,GAAG,EAAE,cAAc,CAAA;IACnB,KAAK,EAAE,MAAM,CAAA;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,wBAAsB,OAAO,CAAC,EAC5B,OAAO,EACP,kBAAkB,EAClB,mBAAmB,EACnB,UAAU,EACV,gBAAqB,EACrB,GAAG,EACH,QAAQ,EACR,eAAe,EACf,GAAG,EACH,KAAK,EACL,oBAA4B,GAC7B,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CAgGjC"}

package/dist/getFile.js

@@ -1,15 +1,17 @@
 import { getFilePrefix as getDocPrefix } from '@payloadcms/plugin-cloud-storage/utilities';
 import { BlobNotFoundError, head } from '@vercel/blob';
-import { getRangeRequestInfo } from 'payload/internal';
+import { getRangeRequestInfo, isXmlMimeType, UPLOAD_CONTENT_SECURITY_POLICY } from 'payload/internal';
 import { generateURL } from './generateURL.js';
-export async function getFile({ baseUrl, cacheControlMaxAge, clientUploadContext, collection, collectionPrefix = '', filename, incomingHeaders, prefixQueryParam, req, token, useCompositePrefixes = false }) {
+export async function getFile({ baseUrl, cacheControlMaxAge, clientUploadContext, collection, collectionPrefix = '', doc, filename, incomingHeaders, req, token, useCompositePrefixes = false }) {
     try {
         const docPrefix = await getDocPrefix({
             clientUploadContext,
             collection,
+            collectionPrefix,
+            doc,
             filename,
-            prefixQueryParam,
-            req
+            req,
+            useCompositePrefixes
         });
         const fileUrl = generateURL({
             baseUrl,
@@ -47,9 +49,9 @@ export async function getFile({ baseUrl, cacheControlMaxAge, clientUploadContext
         headers.append('Content-Disposition', contentDisposition);
         headers.append('Content-Type', contentType);
         headers.append('ETag', ETag);
-        // Add Content-Security-Policy header for SVG files to prevent executable code
-        if (contentType === 'image/svg+xml') {
-            headers.append('Content-Security-Policy', "script-src 'none'");
+        // Add Content-Security-Policy header for XML-family files
+        if (isXmlMimeType(contentType)) {
+            headers.append('Content-Security-Policy', UPLOAD_CONTENT_SECURITY_POLICY);
         }
         if (collection.upload && typeof collection.upload === 'object' && typeof collection.upload.modifyResponseHeaders === 'function') {
             headers = collection.upload.modifyResponseHeaders({

package/dist/getFile.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/getFile.ts"],"sourcesContent":["import type { CollectionConfig, PayloadRequest } from 'payload'\n\nimport { getFilePrefix as getDocPrefix } from '@payloadcms/plugin-cloud-storage/utilities'\nimport { BlobNotFoundError, head } from '@vercel/blob'\nimport { getRangeRequestInfo } from 'payload/internal'\n\nimport { generateURL } from './generateURL.js'\n\ninterface GetFileArgs {\n  baseUrl: string\n  cacheControlMaxAge: number\n  clientUploadContext?: unknown\n  collection: CollectionConfig\n  collectionPrefix?: string\n  filename: string\n  incomingHeaders?: Headers\n  prefixQueryParam?: string\n  req: PayloadRequest\n  token: string\n  useCompositePrefixes?: boolean\n}\n\nexport async function getFile({\n  baseUrl,\n  cacheControlMaxAge,\n  clientUploadContext,\n  collection,\n  collectionPrefix = '',\n  filename,\n  incomingHeaders,\n  prefixQueryParam,\n  req,\n  token,\n  useCompositePrefixes = false,\n}: GetFileArgs): Promise<Response> {\n  try {\n    const docPrefix = await getDocPrefix({\n      clientUploadContext,\n      collection,\n      filename,\n      prefixQueryParam,\n      req,\n    })\n\n    const fileUrl = generateURL({\n      baseUrl,\n      collectionPrefix,\n      filename,\n      prefix: docPrefix,\n      useCompositePrefixes,\n    })\n    const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match')\n    const blobMetadata = await head(fileUrl, { token })\n    const { contentDisposition, contentType, size, uploadedAt } = blobMetadata\n    const uploadedAtString = uploadedAt.toISOString()\n    const fileKeyForETag = fileUrl.replace(`${baseUrl}/`, '')\n    const ETag = `\"${fileKeyForETag}-${uploadedAtString}\"`\n\n    // Handle range request\n    const rangeHeader = req.headers.get('range')\n    const rangeResult = getRangeRequestInfo({ fileSize: size, rangeHeader })\n\n    if (rangeResult.type === 'invalid') {\n      return new Response(null, {\n        headers: new Headers(rangeResult.headers),\n        status: rangeResult.status,\n      })\n    }\n\n    let headers = new Headers(incomingHeaders)\n\n    // Add range-related headers from the result\n    for (const [key, value] of Object.entries(rangeResult.headers)) {\n      headers.append(key, value)\n    }\n\n    headers.append('Cache-Control', `public, max-age=${cacheControlMaxAge}`)\n    headers.append('Content-Disposition', contentDisposition)\n    headers.append('Content-Type', contentType)\n    headers.append('ETag', ETag)\n\n    // Add Content-Security-Policy header for SVG files to prevent executable code\n    if (contentType === 'image/svg+xml') {\n      headers.append('Content-Security-Policy', \"script-src 'none'\")\n    }\n\n    if (\n      collection.upload &&\n      typeof collection.upload === 'object' &&\n      typeof collection.upload.modifyResponseHeaders === 'function'\n    ) {\n      headers = collection.upload.modifyResponseHeaders({ headers }) || headers\n    }\n\n    if (etagFromHeaders && etagFromHeaders === ETag) {\n      return new Response(null, {\n        headers,\n        status: 304,\n      })\n    }\n\n    const response = await fetch(`${fileUrl}?${uploadedAtString}`, {\n      headers: {\n        'Cache-Control': 'no-store, no-cache, must-revalidate',\n        Pragma: 'no-cache',\n        ...(rangeResult.type === 'partial' && {\n          Range: `bytes=${rangeResult.rangeStart}-${rangeResult.rangeEnd}`,\n        }),\n      },\n    })\n\n    if (!response.ok || !response.body) {\n      return new Response(null, { status: 204, statusText: 'No Content' })\n    }\n\n    headers.append('Last-Modified', uploadedAtString)\n\n    return new Response(response.body, {\n      headers,\n      status: rangeResult.status,\n    })\n  } catch (err: unknown) {\n    if (err instanceof BlobNotFoundError) {\n      return new Response(null, { status: 404, statusText: 'Not Found' })\n    }\n    req.payload.logger.error({ err, msg: 'Unexpected error in staticHandler' })\n    return new Response('Internal Server Error', { status: 500 })\n  }\n}\n"],"names":["getFilePrefix","getDocPrefix","BlobNotFoundError","head","getRangeRequestInfo","generateURL","getFile","baseUrl","cacheControlMaxAge","clientUploadContext","collection","collectionPrefix","filename","incomingHeaders","prefixQueryParam","req","token","useCompositePrefixes","docPrefix","fileUrl","prefix","etagFromHeaders","headers","get","blobMetadata","contentDisposition","contentType","size","uploadedAt","uploadedAtString","toISOString","fileKeyForETag","replace","ETag","rangeHeader","rangeResult","fileSize","type","Response","Headers","status","key","value","Object","entries","append","upload","modifyResponseHeaders","response","fetch","Pragma","Range","rangeStart","rangeEnd","ok","body","statusText","err","payload","logger","error","msg"],"mappings":"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"}
+{"version":3,"sources":["../src/getFile.ts"],"sourcesContent":["import type { CollectionConfig, PayloadRequest, TypeWithID } from 'payload'\n\nimport { getFilePrefix as getDocPrefix } from '@payloadcms/plugin-cloud-storage/utilities'\nimport { BlobNotFoundError, head } from '@vercel/blob'\nimport {\n  getRangeRequestInfo,\n  isXmlMimeType,\n  UPLOAD_CONTENT_SECURITY_POLICY,\n} from 'payload/internal'\n\nimport { generateURL } from './generateURL.js'\n\ninterface GetFileArgs {\n  baseUrl: string\n  cacheControlMaxAge: number\n  clientUploadContext?: unknown\n  collection: CollectionConfig\n  collectionPrefix?: string\n  doc?: TypeWithID\n  filename: string\n  incomingHeaders?: Headers\n  req: PayloadRequest\n  token: string\n  useCompositePrefixes?: boolean\n}\n\nexport async function getFile({\n  baseUrl,\n  cacheControlMaxAge,\n  clientUploadContext,\n  collection,\n  collectionPrefix = '',\n  doc,\n  filename,\n  incomingHeaders,\n  req,\n  token,\n  useCompositePrefixes = false,\n}: GetFileArgs): Promise<Response> {\n  try {\n    const docPrefix = await getDocPrefix({\n      clientUploadContext,\n      collection,\n      collectionPrefix,\n      doc,\n      filename,\n      req,\n      useCompositePrefixes,\n    })\n\n    const fileUrl = generateURL({\n      baseUrl,\n      collectionPrefix,\n      filename,\n      prefix: docPrefix,\n      useCompositePrefixes,\n    })\n    const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match')\n    const blobMetadata = await head(fileUrl, { token })\n    const { contentDisposition, contentType, size, uploadedAt } = blobMetadata\n    const uploadedAtString = uploadedAt.toISOString()\n    const fileKeyForETag = fileUrl.replace(`${baseUrl}/`, '')\n    const ETag = `\"${fileKeyForETag}-${uploadedAtString}\"`\n\n    // Handle range request\n    const rangeHeader = req.headers.get('range')\n    const rangeResult = getRangeRequestInfo({ fileSize: size, rangeHeader })\n\n    if (rangeResult.type === 'invalid') {\n      return new Response(null, {\n        headers: new Headers(rangeResult.headers),\n        status: rangeResult.status,\n      })\n    }\n\n    let headers = new Headers(incomingHeaders)\n\n    // Add range-related headers from the result\n    for (const [key, value] of Object.entries(rangeResult.headers)) {\n      headers.append(key, value)\n    }\n\n    headers.append('Cache-Control', `public, max-age=${cacheControlMaxAge}`)\n    headers.append('Content-Disposition', contentDisposition)\n    headers.append('Content-Type', contentType)\n    headers.append('ETag', ETag)\n\n    // Add Content-Security-Policy header for XML-family files\n    if (isXmlMimeType(contentType)) {\n      headers.append('Content-Security-Policy', UPLOAD_CONTENT_SECURITY_POLICY)\n    }\n\n    if (\n      collection.upload &&\n      typeof collection.upload === 'object' &&\n      typeof collection.upload.modifyResponseHeaders === 'function'\n    ) {\n      headers = collection.upload.modifyResponseHeaders({ headers }) || headers\n    }\n\n    if (etagFromHeaders && etagFromHeaders === ETag) {\n      return new Response(null, {\n        headers,\n        status: 304,\n      })\n    }\n\n    const response = await fetch(`${fileUrl}?${uploadedAtString}`, {\n      headers: {\n        'Cache-Control': 'no-store, no-cache, must-revalidate',\n        Pragma: 'no-cache',\n        ...(rangeResult.type === 'partial' && {\n          Range: `bytes=${rangeResult.rangeStart}-${rangeResult.rangeEnd}`,\n        }),\n      },\n    })\n\n    if (!response.ok || !response.body) {\n      return new Response(null, { status: 204, statusText: 'No Content' })\n    }\n\n    headers.append('Last-Modified', uploadedAtString)\n\n    return new Response(response.body, {\n      headers,\n      status: rangeResult.status,\n    })\n  } catch (err: unknown) {\n    if (err instanceof BlobNotFoundError) {\n      return new Response(null, { status: 404, statusText: 'Not Found' })\n    }\n    req.payload.logger.error({ err, msg: 'Unexpected error in staticHandler' })\n    return new Response('Internal Server Error', { status: 500 })\n  }\n}\n"],"names":["getFilePrefix","getDocPrefix","BlobNotFoundError","head","getRangeRequestInfo","isXmlMimeType","UPLOAD_CONTENT_SECURITY_POLICY","generateURL","getFile","baseUrl","cacheControlMaxAge","clientUploadContext","collection","collectionPrefix","doc","filename","incomingHeaders","req","token","useCompositePrefixes","docPrefix","fileUrl","prefix","etagFromHeaders","headers","get","blobMetadata","contentDisposition","contentType","size","uploadedAt","uploadedAtString","toISOString","fileKeyForETag","replace","ETag","rangeHeader","rangeResult","fileSize","type","Response","Headers","status","key","value","Object","entries","append","upload","modifyResponseHeaders","response","fetch","Pragma","Range","rangeStart","rangeEnd","ok","body","statusText","err","payload","logger","error","msg"],"mappings":"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"}

package/dist/index.d.ts

@@ -54,14 +54,15 @@ export type VercelBlobStorageOptions = {
     token: string | undefined;
     /**
      * When true, the collection-level prefix and document-level prefix are combined
-     * (compositional). When false (default), document prefix overrides collection
-     * prefix entirely.
+     * (compositional). When false (default), a document prefix already within the
+     * collection prefix is used as-is for new uploads; otherwise it is nested beneath it.
+     * Existing files retain their stored prefixes for reads, URLs, and cleanup.
      *
-     * Example:
-     * - collection prefix: `collection-prefix/`
-     * - document prefix: `document-prefix/`
-     * - resulting prefix with useCompositePrefixes=true: `collection-prefix/document-prefix/`
-     * - resulting prefix with useCompositePrefixes=false: `document-prefix/`
+     * Example with a document prefix already contained by the collection prefix:
+     * - collection prefix: `uploads/`
+     * - document prefix: `uploads/documents/`
+     * - resulting prefix with useCompositePrefixes=true: `uploads/uploads/documents/`
+     * - resulting prefix with useCompositePrefixes=false: `uploads/documents/`
      *
      * @default false
      */

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,mBAAmB,EAEnB,iBAAiB,EAClB,MAAM,wCAAwC,CAAA;AAC/C,OAAO,KAAK,EAAU,MAAM,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAUnE,MAAM,MAAM,wBAAwB,GAAG;IACrC;;;;;OAKG;IACH,MAAM,CAAC,EAAE,QAAQ,CAAA;IAEjB;;;;OAIG;IACH,eAAe,CAAC,EAAE,OAAO,CAAA;IAEzB;;;;;;;;OAQG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAE5B;;;;OAIG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAE3B;;OAEG;IACH,aAAa,CAAC,EAAE,mBAAmB,CAAA;IAEnC;;OAEG;IACH,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,oBAAoB,EAAE,IAAI,CAAC,iBAAiB,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC,CAAC,CAAA;IAE7F;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB;;;;;;OAMG;IACH,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;IAEzB;;;;;;;;;;;;OAYG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B,CAAA;AASD,KAAK,uBAAuB,GAAG,CAAC,qBAAqB,EAAE,wBAAwB,KAAK,MAAM,CAAA;AAE1F,eAAO,MAAM,iBAAiB,EAAE,uBAsH7B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,mBAAmB,EAEnB,iBAAiB,EAClB,MAAM,wCAAwC,CAAA;AAC/C,OAAO,KAAK,EAAU,MAAM,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAUnE,MAAM,MAAM,wBAAwB,GAAG;IACrC;;;;;OAKG;IACH,MAAM,CAAC,EAAE,QAAQ,CAAA;IAEjB;;;;OAIG;IACH,eAAe,CAAC,EAAE,OAAO,CAAA;IAEzB;;;;;;;;OAQG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAE5B;;;;OAIG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAE3B;;OAEG;IACH,aAAa,CAAC,EAAE,mBAAmB,CAAA;IAEnC;;OAEG;IACH,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,oBAAoB,EAAE,IAAI,CAAC,iBAAiB,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC,CAAC,CAAA;IAE7F;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB;;;;;;OAMG;IACH,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;IAEzB;;;;;;;;;;;;;OAaG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B,CAAA;AASD,KAAK,uBAAuB,GAAG,CAAC,qBAAqB,EAAE,wBAAwB,KAAK,MAAM,CAAA;AAE1F,eAAO,MAAM,iBAAiB,EAAE,uBAwH7B,CAAA"}

package/dist/index.js

@@ -35,7 +35,9 @@ export const vercelBlobStorage = (options)=>(incomingConfig)=>{
                 access: typeof options.clientUploads === 'object' ? options.clientUploads.access : undefined,
                 addRandomSuffix: optionsWithDefaults.addRandomSuffix,
                 cacheControlMaxAge: options.cacheControlMaxAge,
-                token: options.token ?? ''
+                collections: options.collections,
+                token: options.token ?? '',
+                useCompositePrefixes: optionsWithDefaults.useCompositePrefixes
             }),
             serverHandlerPath: '/vercel-blob-client-upload-route'
         });

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import type {\n  ClientUploadsConfig,\n  PluginOptions as CloudStoragePluginOptions,\n  CollectionOptions,\n} from '@payloadcms/plugin-cloud-storage/types'\nimport type { Config, Plugin, UploadCollectionSlug } from 'payload'\n\nimport { cloudStoragePlugin } from '@payloadcms/plugin-cloud-storage'\nimport { initClientUploads } from '@payloadcms/plugin-cloud-storage/utilities'\n\nimport type { VercelBlobClientUploadHandlerExtra } from './client/VercelBlobClientUploadHandler.js'\n\nimport { createVercelBlobAdapter } from './adapter.js'\nimport { getClientUploadRoute } from './getClientUploadRoute.js'\n\nexport type VercelBlobStorageOptions = {\n  /**\n   * Access control level. Currently, only 'public' is supported.\n   * Vercel plans on adding support for private blobs in the future.\n   *\n   * @default 'public'\n   */\n  access?: 'public'\n\n  /**\n   * Add a random suffix to the uploaded file name in Vercel Blob storage\n   *\n   * @default false\n   */\n  addRandomSuffix?: boolean\n\n  /**\n   * When enabled, fields (like the prefix field) will always be inserted into\n   * the collection schema regardless of whether the plugin is enabled. This\n   * ensures a consistent schema across all environments.\n   *\n   * This will be enabled by default in Payload v4.\n   *\n   * @default false\n   */\n  alwaysInsertFields?: boolean\n\n  /**\n   * Cache-Control max-age in seconds\n   *\n   * @default 365 * 24 * 60 * 60 // (1 Year)\n   */\n  cacheControlMaxAge?: number\n\n  /**\n   * Do uploads directly on the client, to bypass limits on Vercel.\n   */\n  clientUploads?: ClientUploadsConfig\n\n  /**\n   * Collections to apply the Vercel Blob adapter to\n   */\n  collections: Partial<Record<UploadCollectionSlug, Omit<CollectionOptions, 'adapter'> | true>>\n\n  /**\n   * Whether or not to enable the plugin\n   *\n   * Default: true\n   */\n  enabled?: boolean\n  /**\n   * Vercel Blob storage read/write token\n   *\n   * Usually process.env.BLOB_READ_WRITE_TOKEN set by Vercel\n   *\n   * If unset, the plugin will be disabled and will fallback to local storage\n   */\n  token: string | undefined\n\n  /**\n   * When true, the collection-level prefix and document-level prefix are combined\n   * (compositional). When false (default), document prefix overrides collection\n   * prefix entirely.\n   *\n   * Example:\n   * - collection prefix: `collection-prefix/`\n   * - document prefix: `document-prefix/`\n   * - resulting prefix with useCompositePrefixes=true: `collection-prefix/document-prefix/`\n   * - resulting prefix with useCompositePrefixes=false: `document-prefix/`\n   *\n   * @default false\n   */\n  useCompositePrefixes?: boolean\n}\n\nconst defaultUploadOptions: Partial<VercelBlobStorageOptions> = {\n  access: 'public',\n  addRandomSuffix: false,\n  cacheControlMaxAge: 60 * 60 * 24 * 365, // 1 year\n  enabled: true,\n}\n\ntype VercelBlobStoragePlugin = (vercelBlobStorageOpts: VercelBlobStorageOptions) => Plugin\n\nexport const vercelBlobStorage: VercelBlobStoragePlugin =\n  (options: VercelBlobStorageOptions) =>\n  (incomingConfig: Config): Config => {\n    // Parse storeId from token\n    const storeId = options.token\n      ?.match(/^vercel_blob_rw_([a-z\\d]+)_[a-z\\d]+$/i)?.[1]\n      ?.toLowerCase()\n\n    const isPluginDisabled = options.enabled === false || !options.token\n\n    // Don't throw if the plugin is disabled\n    if (!storeId && !isPluginDisabled) {\n      throw new Error(\n        'Invalid token format for Vercel Blob adapter. Should be vercel_blob_rw_<store_id>_<random_string>.',\n      )\n    }\n\n    const optionsWithDefaults = {\n      ...defaultUploadOptions,\n      ...options,\n    }\n\n    // support overriding the base URL for emulator https://github.com/payloadcms/vercel-blob-emulator\n    const baseUrl =\n      process.env.STORAGE_VERCEL_BLOB_BASE_URL ||\n      `https://${storeId}.${optionsWithDefaults.access}.blob.vercel-storage.com`\n\n    initClientUploads<\n      VercelBlobClientUploadHandlerExtra,\n      VercelBlobStorageOptions['collections'][string]\n    >({\n      clientHandler: '@payloadcms/storage-vercel-blob/client#VercelBlobClientUploadHandler',\n      collections: options.collections,\n      config: incomingConfig,\n      enabled: !isPluginDisabled && Boolean(options.clientUploads),\n      extraClientHandlerProps: () => ({\n        addRandomSuffix: !!optionsWithDefaults.addRandomSuffix,\n        useCompositePrefixes: !!options.useCompositePrefixes,\n      }),\n      serverHandler: getClientUploadRoute({\n        access:\n          typeof options.clientUploads === 'object' ? options.clientUploads.access : undefined,\n        addRandomSuffix: optionsWithDefaults.addRandomSuffix,\n        cacheControlMaxAge: options.cacheControlMaxAge,\n        token: options.token ?? '',\n      }),\n      serverHandlerPath: '/vercel-blob-client-upload-route',\n    })\n\n    // If the plugin is disabled or no token is provided, do not enable the plugin\n    if (isPluginDisabled) {\n      if (options.alwaysInsertFields) {\n        const collectionsWithoutAdapter: CloudStoragePluginOptions['collections'] = Object.entries(\n          options.collections,\n        ).reduce(\n          (acc, [slug, collOptions]) => ({\n            ...acc,\n            [slug]: { ...(collOptions === true ? {} : collOptions), adapter: null },\n          }),\n          {} as Record<string, CollectionOptions>,\n        )\n        return cloudStoragePlugin({\n          alwaysInsertFields: true,\n          collections: collectionsWithoutAdapter,\n          enabled: false,\n          useCompositePrefixes: options.useCompositePrefixes,\n        })(incomingConfig)\n      }\n      return incomingConfig\n    }\n\n    const adapter = createVercelBlobAdapter({\n      access: optionsWithDefaults.access ?? 'public',\n      addRandomSuffix: optionsWithDefaults.addRandomSuffix,\n      baseUrl,\n      cacheControlMaxAge: optionsWithDefaults.cacheControlMaxAge ?? 60 * 60 * 24 * 365,\n      clientUploads: optionsWithDefaults.clientUploads,\n      token: options.token!,\n      useCompositePrefixes: options.useCompositePrefixes,\n    })\n\n    // Add adapter to each collection option object\n    const collectionsWithAdapter: CloudStoragePluginOptions['collections'] = Object.entries(\n      options.collections,\n    ).reduce(\n      (acc, [slug, collOptions]) => ({\n        ...acc,\n        [slug]: {\n          ...(collOptions === true ? {} : collOptions),\n          adapter,\n        },\n      }),\n      {} as Record<string, CollectionOptions>,\n    )\n\n    // Set disableLocalStorage: true for collections specified in the plugin options\n    const config = {\n      ...incomingConfig,\n      collections: (incomingConfig.collections || []).map((collection) => {\n        if (!collectionsWithAdapter[collection.slug]) {\n          return collection\n        }\n\n        return {\n          ...collection,\n          upload: {\n            ...(typeof collection.upload === 'object' ? collection.upload : {}),\n            disableLocalStorage: true,\n          },\n        }\n      }),\n    }\n\n    return cloudStoragePlugin({\n      alwaysInsertFields: options.alwaysInsertFields,\n      collections: collectionsWithAdapter,\n      useCompositePrefixes: options.useCompositePrefixes,\n    })(config)\n  }\n"],"names":["cloudStoragePlugin","initClientUploads","createVercelBlobAdapter","getClientUploadRoute","defaultUploadOptions","access","addRandomSuffix","cacheControlMaxAge","enabled","vercelBlobStorage","options","incomingConfig","storeId","token","match","toLowerCase","isPluginDisabled","Error","optionsWithDefaults","baseUrl","process","env","STORAGE_VERCEL_BLOB_BASE_URL","clientHandler","collections","config","Boolean","clientUploads","extraClientHandlerProps","useCompositePrefixes","serverHandler","undefined","serverHandlerPath","alwaysInsertFields","collectionsWithoutAdapter","Object","entries","reduce","acc","slug","collOptions","adapter","collectionsWithAdapter","map","collection","upload","disableLocalStorage"],"mappings":"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"}
+{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import type {\n  ClientUploadsConfig,\n  PluginOptions as CloudStoragePluginOptions,\n  CollectionOptions,\n} from '@payloadcms/plugin-cloud-storage/types'\nimport type { Config, Plugin, UploadCollectionSlug } from 'payload'\n\nimport { cloudStoragePlugin } from '@payloadcms/plugin-cloud-storage'\nimport { initClientUploads } from '@payloadcms/plugin-cloud-storage/utilities'\n\nimport type { VercelBlobClientUploadHandlerExtra } from './client/VercelBlobClientUploadHandler.js'\n\nimport { createVercelBlobAdapter } from './adapter.js'\nimport { getClientUploadRoute } from './getClientUploadRoute.js'\n\nexport type VercelBlobStorageOptions = {\n  /**\n   * Access control level. Currently, only 'public' is supported.\n   * Vercel plans on adding support for private blobs in the future.\n   *\n   * @default 'public'\n   */\n  access?: 'public'\n\n  /**\n   * Add a random suffix to the uploaded file name in Vercel Blob storage\n   *\n   * @default false\n   */\n  addRandomSuffix?: boolean\n\n  /**\n   * When enabled, fields (like the prefix field) will always be inserted into\n   * the collection schema regardless of whether the plugin is enabled. This\n   * ensures a consistent schema across all environments.\n   *\n   * This will be enabled by default in Payload v4.\n   *\n   * @default false\n   */\n  alwaysInsertFields?: boolean\n\n  /**\n   * Cache-Control max-age in seconds\n   *\n   * @default 365 * 24 * 60 * 60 // (1 Year)\n   */\n  cacheControlMaxAge?: number\n\n  /**\n   * Do uploads directly on the client, to bypass limits on Vercel.\n   */\n  clientUploads?: ClientUploadsConfig\n\n  /**\n   * Collections to apply the Vercel Blob adapter to\n   */\n  collections: Partial<Record<UploadCollectionSlug, Omit<CollectionOptions, 'adapter'> | true>>\n\n  /**\n   * Whether or not to enable the plugin\n   *\n   * Default: true\n   */\n  enabled?: boolean\n  /**\n   * Vercel Blob storage read/write token\n   *\n   * Usually process.env.BLOB_READ_WRITE_TOKEN set by Vercel\n   *\n   * If unset, the plugin will be disabled and will fallback to local storage\n   */\n  token: string | undefined\n\n  /**\n   * When true, the collection-level prefix and document-level prefix are combined\n   * (compositional). When false (default), a document prefix already within the\n   * collection prefix is used as-is for new uploads; otherwise it is nested beneath it.\n   * Existing files retain their stored prefixes for reads, URLs, and cleanup.\n   *\n   * Example with a document prefix already contained by the collection prefix:\n   * - collection prefix: `uploads/`\n   * - document prefix: `uploads/documents/`\n   * - resulting prefix with useCompositePrefixes=true: `uploads/uploads/documents/`\n   * - resulting prefix with useCompositePrefixes=false: `uploads/documents/`\n   *\n   * @default false\n   */\n  useCompositePrefixes?: boolean\n}\n\nconst defaultUploadOptions: Partial<VercelBlobStorageOptions> = {\n  access: 'public',\n  addRandomSuffix: false,\n  cacheControlMaxAge: 60 * 60 * 24 * 365, // 1 year\n  enabled: true,\n}\n\ntype VercelBlobStoragePlugin = (vercelBlobStorageOpts: VercelBlobStorageOptions) => Plugin\n\nexport const vercelBlobStorage: VercelBlobStoragePlugin =\n  (options: VercelBlobStorageOptions) =>\n  (incomingConfig: Config): Config => {\n    // Parse storeId from token\n    const storeId = options.token\n      ?.match(/^vercel_blob_rw_([a-z\\d]+)_[a-z\\d]+$/i)?.[1]\n      ?.toLowerCase()\n\n    const isPluginDisabled = options.enabled === false || !options.token\n\n    // Don't throw if the plugin is disabled\n    if (!storeId && !isPluginDisabled) {\n      throw new Error(\n        'Invalid token format for Vercel Blob adapter. Should be vercel_blob_rw_<store_id>_<random_string>.',\n      )\n    }\n\n    const optionsWithDefaults = {\n      ...defaultUploadOptions,\n      ...options,\n    }\n\n    // support overriding the base URL for emulator https://github.com/payloadcms/vercel-blob-emulator\n    const baseUrl =\n      process.env.STORAGE_VERCEL_BLOB_BASE_URL ||\n      `https://${storeId}.${optionsWithDefaults.access}.blob.vercel-storage.com`\n\n    initClientUploads<\n      VercelBlobClientUploadHandlerExtra,\n      VercelBlobStorageOptions['collections'][string]\n    >({\n      clientHandler: '@payloadcms/storage-vercel-blob/client#VercelBlobClientUploadHandler',\n      collections: options.collections,\n      config: incomingConfig,\n      enabled: !isPluginDisabled && Boolean(options.clientUploads),\n      extraClientHandlerProps: () => ({\n        addRandomSuffix: !!optionsWithDefaults.addRandomSuffix,\n        useCompositePrefixes: !!options.useCompositePrefixes,\n      }),\n      serverHandler: getClientUploadRoute({\n        access:\n          typeof options.clientUploads === 'object' ? options.clientUploads.access : undefined,\n        addRandomSuffix: optionsWithDefaults.addRandomSuffix,\n        cacheControlMaxAge: options.cacheControlMaxAge,\n        collections: options.collections,\n        token: options.token ?? '',\n        useCompositePrefixes: optionsWithDefaults.useCompositePrefixes,\n      }),\n      serverHandlerPath: '/vercel-blob-client-upload-route',\n    })\n\n    // If the plugin is disabled or no token is provided, do not enable the plugin\n    if (isPluginDisabled) {\n      if (options.alwaysInsertFields) {\n        const collectionsWithoutAdapter: CloudStoragePluginOptions['collections'] = Object.entries(\n          options.collections,\n        ).reduce(\n          (acc, [slug, collOptions]) => ({\n            ...acc,\n            [slug]: { ...(collOptions === true ? {} : collOptions), adapter: null },\n          }),\n          {} as Record<string, CollectionOptions>,\n        )\n        return cloudStoragePlugin({\n          alwaysInsertFields: true,\n          collections: collectionsWithoutAdapter,\n          enabled: false,\n          useCompositePrefixes: options.useCompositePrefixes,\n        })(incomingConfig)\n      }\n      return incomingConfig\n    }\n\n    const adapter = createVercelBlobAdapter({\n      access: optionsWithDefaults.access ?? 'public',\n      addRandomSuffix: optionsWithDefaults.addRandomSuffix,\n      baseUrl,\n      cacheControlMaxAge: optionsWithDefaults.cacheControlMaxAge ?? 60 * 60 * 24 * 365,\n      clientUploads: optionsWithDefaults.clientUploads,\n      token: options.token!,\n      useCompositePrefixes: options.useCompositePrefixes,\n    })\n\n    // Add adapter to each collection option object\n    const collectionsWithAdapter: CloudStoragePluginOptions['collections'] = Object.entries(\n      options.collections,\n    ).reduce(\n      (acc, [slug, collOptions]) => ({\n        ...acc,\n        [slug]: {\n          ...(collOptions === true ? {} : collOptions),\n          adapter,\n        },\n      }),\n      {} as Record<string, CollectionOptions>,\n    )\n\n    // Set disableLocalStorage: true for collections specified in the plugin options\n    const config = {\n      ...incomingConfig,\n      collections: (incomingConfig.collections || []).map((collection) => {\n        if (!collectionsWithAdapter[collection.slug]) {\n          return collection\n        }\n\n        return {\n          ...collection,\n          upload: {\n            ...(typeof collection.upload === 'object' ? collection.upload : {}),\n            disableLocalStorage: true,\n          },\n        }\n      }),\n    }\n\n    return cloudStoragePlugin({\n      alwaysInsertFields: options.alwaysInsertFields,\n      collections: collectionsWithAdapter,\n      useCompositePrefixes: options.useCompositePrefixes,\n    })(config)\n  }\n"],"names":["cloudStoragePlugin","initClientUploads","createVercelBlobAdapter","getClientUploadRoute","defaultUploadOptions","access","addRandomSuffix","cacheControlMaxAge","enabled","vercelBlobStorage","options","incomingConfig","storeId","token","match","toLowerCase","isPluginDisabled","Error","optionsWithDefaults","baseUrl","process","env","STORAGE_VERCEL_BLOB_BASE_URL","clientHandler","collections","config","Boolean","clientUploads","extraClientHandlerProps","useCompositePrefixes","serverHandler","undefined","serverHandlerPath","alwaysInsertFields","collectionsWithoutAdapter","Object","entries","reduce","acc","slug","collOptions","adapter","collectionsWithAdapter","map","collection","upload","disableLocalStorage"],"mappings":"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"}

package/dist/staticHandler.spec.js

@@ -0,0 +1,71 @@
+import { afterEach, describe, expect, it, vi } from 'vitest';
+import { head } from '@vercel/blob';
+vi.mock('@vercel/blob', async (importOriginal)=>({
+        ...await importOriginal(),
+        head: vi.fn(async ()=>({
+                contentDisposition: 'inline',
+                contentType: 'image/png',
+                size: 4,
+                uploadedAt: new Date('2026-01-01')
+            }))
+    }));
+afterEach(()=>{
+    vi.unstubAllGlobals();
+    vi.clearAllMocks();
+});
+import { createVercelBlobAdapter } from './adapter.js';
+describe('static handler document locations', ()=>{
+    it('should read the checked document without another lookup', async ()=>{
+        const fetchMock = vi.fn(async ()=>new Response('file'));
+        vi.stubGlobal('fetch', fetchMock);
+        const adapter = createVercelBlobAdapter({
+            access: 'public',
+            baseUrl: 'https://example.com',
+            cacheControlMaxAge: 60,
+            token: 'token'
+        });
+        const find = vi.fn(async ()=>({
+                docs: [
+                    {
+                        prefix: 'database'
+                    }
+                ]
+            }));
+        const generatedAdapter = adapter({
+            collection: {
+                fields: [],
+                slug: 'media',
+                upload: {}
+            },
+            prefix: 'media'
+        });
+        const doc = {
+            id: 'authorized',
+            prefix: 'legacy'
+        };
+        const response = await generatedAdapter.staticHandler({
+            headers: new Headers(),
+            payload: {
+                find,
+                logger: {
+                    error: vi.fn()
+                }
+            }
+        }, {
+            doc,
+            params: {
+                collection: 'media',
+                filename: 'original.png'
+            }
+        });
+        expect(response.status).toBe(200);
+        expect(await response.text()).toBe('file');
+        expect(head).toHaveBeenCalledWith(`https://example.com/legacy/original.png`, {
+            token: 'token'
+        });
+        expect(fetchMock).toHaveBeenCalledWith(`https://example.com/legacy/original.png?2026-01-01T00:00:00.000Z`, expect.any(Object));
+        expect(find).not.toHaveBeenCalled();
+    });
+});
+
+//# sourceMappingURL=staticHandler.spec.js.map

package/dist/staticHandler.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/staticHandler.spec.ts"],"sourcesContent":["import { afterEach, describe, expect, it, vi } from 'vitest'\n\nimport { head } from '@vercel/blob'\n\nvi.mock('@vercel/blob', async (importOriginal) => ({\n  ...(await importOriginal<typeof import('@vercel/blob')>()),\n  head: vi.fn(async () => ({\n    contentDisposition: 'inline',\n    contentType: 'image/png',\n    size: 4,\n    uploadedAt: new Date('2026-01-01'),\n  })),\n}))\n\nafterEach(() => {\n  vi.unstubAllGlobals()\n  vi.clearAllMocks()\n})\n\nimport { createVercelBlobAdapter } from './adapter.js'\n\ndescribe('static handler document locations', () => {\n  it('should read the checked document without another lookup', async () => {\n    const fetchMock = vi.fn(async () => new Response('file'))\n\n    vi.stubGlobal('fetch', fetchMock)\n    const adapter = createVercelBlobAdapter({\n      access: 'public',\n      baseUrl: 'https://example.com',\n      cacheControlMaxAge: 60,\n      token: 'token',\n    })\n    const find = vi.fn(async () => ({ docs: [{ prefix: 'database' }] }))\n    const generatedAdapter = adapter({\n      collection: {\n        fields: [],\n        slug: 'media',\n        upload: {},\n      },\n      prefix: 'media',\n    })\n    const doc = {\n      id: 'authorized',\n      prefix: 'legacy',\n    }\n    const response = await generatedAdapter.staticHandler(\n      {\n        headers: new Headers(),\n        payload: { find, logger: { error: vi.fn() } },\n      } as never,\n      {\n        doc,\n        params: { collection: 'media', filename: 'original.png' },\n      },\n    )\n\n    expect(response.status).toBe(200)\n    expect(await response.text()).toBe('file')\n    expect(head).toHaveBeenCalledWith(`https://example.com/legacy/original.png`, { token: 'token' })\n    expect(fetchMock).toHaveBeenCalledWith(\n      `https://example.com/legacy/original.png?2026-01-01T00:00:00.000Z`,\n      expect.any(Object),\n    )\n    expect(find).not.toHaveBeenCalled()\n  })\n})\n"],"names":["afterEach","describe","expect","it","vi","head","mock","importOriginal","fn","contentDisposition","contentType","size","uploadedAt","Date","unstubAllGlobals","clearAllMocks","createVercelBlobAdapter","fetchMock","Response","stubGlobal","adapter","access","baseUrl","cacheControlMaxAge","token","find","docs","prefix","generatedAdapter","collection","fields","slug","upload","doc","id","response","staticHandler","headers","Headers","payload","logger","error","params","filename","status","toBe","text","toHaveBeenCalledWith","any","Object","not","toHaveBeenCalled"],"mappings":"AAAA,SAASA,SAAS,EAAEC,QAAQ,EAAEC,MAAM,EAAEC,EAAE,EAAEC,EAAE,QAAQ,SAAQ;AAE5D,SAASC,IAAI,QAAQ,eAAc;AAEnCD,GAAGE,IAAI,CAAC,gBAAgB,OAAOC,iBAAoB,CAAA;QACjD,GAAI,MAAMA,gBAA+C;QACzDF,MAAMD,GAAGI,EAAE,CAAC,UAAa,CAAA;gBACvBC,oBAAoB;gBACpBC,aAAa;gBACbC,MAAM;gBACNC,YAAY,IAAIC,KAAK;YACvB,CAAA;IACF,CAAA;AAEAb,UAAU;IACRI,GAAGU,gBAAgB;IACnBV,GAAGW,aAAa;AAClB;AAEA,SAASC,uBAAuB,QAAQ,eAAc;AAEtDf,SAAS,qCAAqC;IAC5CE,GAAG,2DAA2D;QAC5D,MAAMc,YAAYb,GAAGI,EAAE,CAAC,UAAY,IAAIU,SAAS;QAEjDd,GAAGe,UAAU,CAAC,SAASF;QACvB,MAAMG,UAAUJ,wBAAwB;YACtCK,QAAQ;YACRC,SAAS;YACTC,oBAAoB;YACpBC,OAAO;QACT;QACA,MAAMC,OAAOrB,GAAGI,EAAE,CAAC,UAAa,CAAA;gBAAEkB,MAAM;oBAAC;wBAAEC,QAAQ;oBAAW;iBAAE;YAAC,CAAA;QACjE,MAAMC,mBAAmBR,QAAQ;YAC/BS,YAAY;gBACVC,QAAQ,EAAE;gBACVC,MAAM;gBACNC,QAAQ,CAAC;YACX;YACAL,QAAQ;QACV;QACA,MAAMM,MAAM;YACVC,IAAI;YACJP,QAAQ;QACV;QACA,MAAMQ,WAAW,MAAMP,iBAAiBQ,aAAa,CACnD;YACEC,SAAS,IAAIC;YACbC,SAAS;gBAAEd;gBAAMe,QAAQ;oBAAEC,OAAOrC,GAAGI,EAAE;gBAAG;YAAE;QAC9C,GACA;YACEyB;YACAS,QAAQ;gBAAEb,YAAY;gBAASc,UAAU;YAAe;QAC1D;QAGFzC,OAAOiC,SAASS,MAAM,EAAEC,IAAI,CAAC;QAC7B3C,OAAO,MAAMiC,SAASW,IAAI,IAAID,IAAI,CAAC;QACnC3C,OAAOG,MAAM0C,oBAAoB,CAAC,CAAC,uCAAuC,CAAC,EAAE;YAAEvB,OAAO;QAAQ;QAC9FtB,OAAOe,WAAW8B,oBAAoB,CACpC,CAAC,gEAAgE,CAAC,EAClE7C,OAAO8C,GAAG,CAACC;QAEb/C,OAAOuB,MAAMyB,GAAG,CAACC,gBAAgB;IACnC;AACF"}

package/dist/uploadFile.d.ts

@@ -3,16 +3,13 @@ interface UploadFileArgs {
     addRandomSuffix?: boolean;
     buffer: Buffer;
     cacheControlMaxAge?: number;
-    collectionPrefix?: string;
-    docPrefix?: string;
-    filename: string;
     mimeType: string;
+    storageFilePath: string;
     token: string;
-    useCompositePrefixes?: boolean;
 }
 interface UploadFileResult {
     filename?: string;
 }
-export declare function uploadFile({ access, addRandomSuffix, buffer, cacheControlMaxAge, collectionPrefix, docPrefix, filename, mimeType, token, useCompositePrefixes, }: UploadFileArgs): Promise<UploadFileResult>;
+export declare function uploadFile({ access, addRandomSuffix, buffer, cacheControlMaxAge, mimeType, storageFilePath, token, }: UploadFileArgs): Promise<UploadFileResult>;
 export {};
 //# sourceMappingURL=uploadFile.d.ts.map

package/dist/uploadFile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"uploadFile.d.ts","sourceRoot":"","sources":["../src/uploadFile.ts"],"names":[],"mappings":"AAIA,UAAU,cAAc;IACtB,MAAM,EAAE,QAAQ,CAAA;IAChB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,MAAM,EAAE,MAAM,CAAA;IACd,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,UAAU,gBAAgB;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED,wBAAsB,UAAU,CAAC,EAC/B,MAAM,EACN,eAAe,EACf,MAAM,EACN,kBAAkB,EAClB,gBAAqB,EACrB,SAAS,EACT,QAAQ,EACR,QAAQ,EACR,KAAK,EACL,oBAA4B,GAC7B,EAAE,cAAc,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAwB5C"}
+{"version":3,"file":"uploadFile.d.ts","sourceRoot":"","sources":["../src/uploadFile.ts"],"names":[],"mappings":"AAGA,UAAU,cAAc;IACtB,MAAM,EAAE,QAAQ,CAAA;IAChB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,MAAM,EAAE,MAAM,CAAA;IACd,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,QAAQ,EAAE,MAAM,CAAA;IAChB,eAAe,EAAE,MAAM,CAAA;IACvB,KAAK,EAAE,MAAM,CAAA;CACd;AAED,UAAU,gBAAgB;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED,wBAAsB,UAAU,CAAC,EAC/B,MAAM,EACN,eAAe,EACf,MAAM,EACN,kBAAkB,EAClB,QAAQ,EACR,eAAe,EACf,KAAK,GACN,EAAE,cAAc,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAiB5C"}

package/dist/uploadFile.js

@@ -1,14 +1,7 @@
-import { getFileKey } from '@payloadcms/plugin-cloud-storage/utilities';
 import { put } from '@vercel/blob';
 import path from 'path';
-export async function uploadFile({ access, addRandomSuffix, buffer, cacheControlMaxAge, collectionPrefix = '', docPrefix, filename, mimeType, token, useCompositePrefixes = false }) {
-    const { fileKey } = getFileKey({
-        collectionPrefix,
-        docPrefix,
-        filename,
-        useCompositePrefixes
-    });
-    const result = await put(fileKey, buffer, {
+export async function uploadFile({ access, addRandomSuffix, buffer, cacheControlMaxAge, mimeType, storageFilePath, token }) {
+    const result = await put(storageFilePath, buffer, {
         access,
         addRandomSuffix,
         allowOverwrite: true,

package/dist/uploadFile.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/uploadFile.ts"],"sourcesContent":["import { getFileKey } from '@payloadcms/plugin-cloud-storage/utilities'\nimport { put } from '@vercel/blob'\nimport path from 'path'\n\ninterface UploadFileArgs {\n  access: 'public'\n  addRandomSuffix?: boolean\n  buffer: Buffer\n  cacheControlMaxAge?: number\n  collectionPrefix?: string\n  docPrefix?: string\n  filename: string\n  mimeType: string\n  token: string\n  useCompositePrefixes?: boolean\n}\n\ninterface UploadFileResult {\n  filename?: string\n}\n\nexport async function uploadFile({\n  access,\n  addRandomSuffix,\n  buffer,\n  cacheControlMaxAge,\n  collectionPrefix = '',\n  docPrefix,\n  filename,\n  mimeType,\n  token,\n  useCompositePrefixes = false,\n}: UploadFileArgs): Promise<UploadFileResult> {\n  const { fileKey } = getFileKey({\n    collectionPrefix,\n    docPrefix,\n    filename,\n    useCompositePrefixes,\n  })\n\n  const result = await put(fileKey, buffer, {\n    access,\n    addRandomSuffix,\n    allowOverwrite: true,\n    cacheControlMaxAge,\n    contentType: mimeType,\n    token,\n  })\n\n  if (addRandomSuffix) {\n    const pathname = result.pathname.replace(/^\\/+/, '')\n    const basename = path.posix.basename(pathname)\n    return { filename: decodeURIComponent(basename) }\n  }\n\n  return {}\n}\n"],"names":["getFileKey","put","path","uploadFile","access","addRandomSuffix","buffer","cacheControlMaxAge","collectionPrefix","docPrefix","filename","mimeType","token","useCompositePrefixes","fileKey","result","allowOverwrite","contentType","pathname","replace","basename","posix","decodeURIComponent"],"mappings":"AAAA,SAASA,UAAU,QAAQ,6CAA4C;AACvE,SAASC,GAAG,QAAQ,eAAc;AAClC,OAAOC,UAAU,OAAM;AAmBvB,OAAO,eAAeC,WAAW,EAC/BC,MAAM,EACNC,eAAe,EACfC,MAAM,EACNC,kBAAkB,EAClBC,mBAAmB,EAAE,EACrBC,SAAS,EACTC,QAAQ,EACRC,QAAQ,EACRC,KAAK,EACLC,uBAAuB,KAAK,EACb;IACf,MAAM,EAAEC,OAAO,EAAE,GAAGd,WAAW;QAC7BQ;QACAC;QACAC;QACAG;IACF;IAEA,MAAME,SAAS,MAAMd,IAAIa,SAASR,QAAQ;QACxCF;QACAC;QACAW,gBAAgB;QAChBT;QACAU,aAAaN;QACbC;IACF;IAEA,IAAIP,iBAAiB;QACnB,MAAMa,WAAWH,OAAOG,QAAQ,CAACC,OAAO,CAAC,QAAQ;QACjD,MAAMC,WAAWlB,KAAKmB,KAAK,CAACD,QAAQ,CAACF;QACrC,OAAO;YAAER,UAAUY,mBAAmBF;QAAU;IAClD;IAEA,OAAO,CAAC;AACV"}
+{"version":3,"sources":["../src/uploadFile.ts"],"sourcesContent":["import { put } from '@vercel/blob'\nimport path from 'path'\n\ninterface UploadFileArgs {\n  access: 'public'\n  addRandomSuffix?: boolean\n  buffer: Buffer\n  cacheControlMaxAge?: number\n  mimeType: string\n  storageFilePath: string\n  token: string\n}\n\ninterface UploadFileResult {\n  filename?: string\n}\n\nexport async function uploadFile({\n  access,\n  addRandomSuffix,\n  buffer,\n  cacheControlMaxAge,\n  mimeType,\n  storageFilePath,\n  token,\n}: UploadFileArgs): Promise<UploadFileResult> {\n  const result = await put(storageFilePath, buffer, {\n    access,\n    addRandomSuffix,\n    allowOverwrite: true,\n    cacheControlMaxAge,\n    contentType: mimeType,\n    token,\n  })\n\n  if (addRandomSuffix) {\n    const pathname = result.pathname.replace(/^\\/+/, '')\n    const basename = path.posix.basename(pathname)\n    return { filename: decodeURIComponent(basename) }\n  }\n\n  return {}\n}\n"],"names":["put","path","uploadFile","access","addRandomSuffix","buffer","cacheControlMaxAge","mimeType","storageFilePath","token","result","allowOverwrite","contentType","pathname","replace","basename","posix","filename","decodeURIComponent"],"mappings":"AAAA,SAASA,GAAG,QAAQ,eAAc;AAClC,OAAOC,UAAU,OAAM;AAgBvB,OAAO,eAAeC,WAAW,EAC/BC,MAAM,EACNC,eAAe,EACfC,MAAM,EACNC,kBAAkB,EAClBC,QAAQ,EACRC,eAAe,EACfC,KAAK,EACU;IACf,MAAMC,SAAS,MAAMV,IAAIQ,iBAAiBH,QAAQ;QAChDF;QACAC;QACAO,gBAAgB;QAChBL;QACAM,aAAaL;QACbE;IACF;IAEA,IAAIL,iBAAiB;QACnB,MAAMS,WAAWH,OAAOG,QAAQ,CAACC,OAAO,CAAC,QAAQ;QACjD,MAAMC,WAAWd,KAAKe,KAAK,CAACD,QAAQ,CAACF;QACrC,OAAO;YAAEI,UAAUC,mBAAmBH;QAAU;IAClD;IAEA,OAAO,CAAC;AACV"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/storage-vercel-blob",
-  "version": "3.89.0",
+  "version": "3.90.0",
   "description": "Payload storage adapter for Vercel Blob Storage",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -38,13 +38,13 @@
   ],
   "dependencies": {
     "@vercel/blob": "2.3.1",
-    "@payloadcms/plugin-cloud-storage": "3.89.0"
+    "@payloadcms/plugin-cloud-storage": "3.90.0"
   },
   "devDependencies": {
-    "payload": "3.89.0"
+    "payload": "3.90.0"
   },
   "peerDependencies": {
-    "payload": "3.89.0"
+    "payload": "3.90.0"
   },
   "engines": {
     "node": "^18.20.2 || >=20.9.0"