@payloadcms/storage-s3 3.89.0 → 3.90.1

package/dist/adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,oBAAoB,CAAA;AAC9C,OAAO,KAAK,EACV,OAAO,EACP,mBAAmB,EAEpB,MAAM,wCAAwC,CAAA;AAE/C,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AAOzD,UAAU,mBAAmB;IAC3B,GAAG,CAAC,EAAE,SAAS,GAAG,aAAa,CAAA;IAC/B,MAAM,EAAE,MAAM,CAAA;IACd,aAAa,CAAC,EAAE,mBAAmB,CAAA;IACnC,MAAM,EAAE,GAAG,CAAC,cAAc,CAAA;IAC1B,gBAAgB,EAAE,MAAM,GAAG,CAAC,EAAE,CAAA;IAC9B,eAAe,EAAE,qBAAqB,CAAA;IACtC,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,wBAAgB,eAAe,CAAC,EAC9B,GAAG,EACH,MAAM,EACN,aAAa,EACb,MAAM,EACN,gBAAgB,EAChB,eAAe,EACf,oBAA4B,GAC7B,EAAE,mBAAmB,GAAG,OAAO,CA4D/B"}
+{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,oBAAoB,CAAA;AAC9C,OAAO,KAAK,EACV,OAAO,EACP,mBAAmB,EAEpB,MAAM,wCAAwC,CAAA;AAE/C,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AAOzD,UAAU,mBAAmB;IAC3B,GAAG,CAAC,EAAE,SAAS,GAAG,aAAa,CAAA;IAC/B,MAAM,EAAE,MAAM,CAAA;IACd,aAAa,CAAC,EAAE,mBAAmB,CAAA;IACnC,MAAM,EAAE,GAAG,CAAC,cAAc,CAAA;IAC1B,gBAAgB,EAAE,MAAM,GAAG,CAAC,EAAE,CAAA;IAC9B,eAAe,EAAE,qBAAqB,CAAA;IACtC,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,wBAAgB,eAAe,CAAC,EAC9B,GAAG,EACH,MAAM,EACN,aAAa,EACb,MAAM,EACN,gBAAgB,EAChB,eAAe,EACf,oBAA4B,GAC7B,EAAE,mBAAmB,GAAG,OAAO,CAoD/B"}

package/dist/adapter.js

@@ -6,6 +6,7 @@ export function createS3Adapter({ acl, bucket, clientUploads, config, getStorage
     return ({ collection, prefix = '' })=>({
             name: 's3',
             clientUploads,
+            requiresClientUploadReceipt: true,
             generateURL: ({ filename, prefix: urlPrefix = '' })=>generateURL({
                     bucket,
                     collectionPrefix: prefix,
@@ -14,38 +15,32 @@ export function createS3Adapter({ acl, bucket, clientUploads, config, getStorage
                     prefix: urlPrefix,
                     useCompositePrefixes
                 }),
-            handleDelete: ({ doc: { prefix: docPrefix = '' }, filename })=>deleteFile({
+            handleDelete: ({ storageFilePath })=>deleteFile({
                     bucket,
                     client: getStorageClient(),
-                    collectionPrefix: prefix,
-                    docPrefix,
-                    filename,
-                    useCompositePrefixes
+                    storageFilePath
                 }),
-            handleUpload: async ({ data, file })=>{
+            handleUpload: async ({ data, file, storageFilePath })=>{
                 await uploadFile({
                     acl,
                     bucket,
                     buffer: file.buffer,
                     client: getStorageClient(),
-                    collectionPrefix: prefix,
-                    docPrefix: data.prefix,
-                    filename: file.filename,
                     mimeType: file.mimeType,
-                    tempFilePath: file.tempFilePath,
-                    useCompositePrefixes
+                    storageFilePath,
+                    tempFilePath: file.tempFilePath
                 });
                 return data;
             },
-            staticHandler: (req, { headers, params: { clientUploadContext, filename, prefix: prefixQueryParam } })=>getFile({
+            staticHandler: (req, { doc, headers, params: { clientUploadContext, filename } })=>getFile({
                     bucket,
                     client: getStorageClient(),
                     clientUploadContext,
                     collection,
                     collectionPrefix: prefix,
+                    doc,
                     filename,
                     incomingHeaders: headers,
-                    prefixQueryParam,
                     req,
                     signedDownloads,
                     useCompositePrefixes

package/dist/adapter.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/adapter.ts"],"sourcesContent":["import type * as AWS from '@aws-sdk/client-s3'\nimport type {\n  Adapter,\n  ClientUploadsConfig,\n  GeneratedAdapter,\n} from '@payloadcms/plugin-cloud-storage/types'\n\nimport type { SignedDownloadsConfig } from './getFile.js'\n\nimport { deleteFile } from './deleteFile.js'\nimport { generateURL } from './generateURL.js'\nimport { getFile } from './getFile.js'\nimport { uploadFile } from './uploadFile.js'\n\ninterface CreateS3AdapterArgs {\n  acl?: 'private' | 'public-read'\n  bucket: string\n  clientUploads?: ClientUploadsConfig\n  config: AWS.S3ClientConfig\n  getStorageClient: () => AWS.S3\n  signedDownloads: SignedDownloadsConfig\n  useCompositePrefixes?: boolean\n}\n\nexport function createS3Adapter({\n  acl,\n  bucket,\n  clientUploads,\n  config,\n  getStorageClient,\n  signedDownloads,\n  useCompositePrefixes = false,\n}: CreateS3AdapterArgs): Adapter {\n  return ({ collection, prefix = '' }): GeneratedAdapter => ({\n    name: 's3',\n    clientUploads,\n\n    generateURL: ({ filename, prefix: urlPrefix = '' }) =>\n      generateURL({\n        bucket,\n        collectionPrefix: prefix,\n        endpoint: config.endpoint,\n        filename,\n        prefix: urlPrefix,\n        useCompositePrefixes,\n      }),\n\n    handleDelete: ({ doc: { prefix: docPrefix = '' }, filename }) =>\n      deleteFile({\n        bucket,\n        client: getStorageClient(),\n        collectionPrefix: prefix,\n        docPrefix,\n        filename,\n        useCompositePrefixes,\n      }),\n\n    handleUpload: async ({ data, file }) => {\n      await uploadFile({\n        acl,\n        bucket,\n        buffer: file.buffer,\n        client: getStorageClient(),\n        collectionPrefix: prefix,\n        docPrefix: data.prefix,\n        filename: file.filename,\n        mimeType: file.mimeType,\n        tempFilePath: file.tempFilePath,\n        useCompositePrefixes,\n      })\n\n      return data\n    },\n\n    staticHandler: (\n      req,\n      { headers, params: { clientUploadContext, filename, prefix: prefixQueryParam } },\n    ) =>\n      getFile({\n        bucket,\n        client: getStorageClient(),\n        clientUploadContext,\n        collection,\n        collectionPrefix: prefix,\n        filename,\n        incomingHeaders: headers,\n        prefixQueryParam,\n        req,\n        signedDownloads,\n        useCompositePrefixes,\n      }),\n  })\n}\n"],"names":["deleteFile","generateURL","getFile","uploadFile","createS3Adapter","acl","bucket","clientUploads","config","getStorageClient","signedDownloads","useCompositePrefixes","collection","prefix","name","filename","urlPrefix","collectionPrefix","endpoint","handleDelete","doc","docPrefix","client","handleUpload","data","file","buffer","mimeType","tempFilePath","staticHandler","req","headers","params","clientUploadContext","prefixQueryParam","incomingHeaders"],"mappings":"AASA,SAASA,UAAU,QAAQ,kBAAiB;AAC5C,SAASC,WAAW,QAAQ,mBAAkB;AAC9C,SAASC,OAAO,QAAQ,eAAc;AACtC,SAASC,UAAU,QAAQ,kBAAiB;AAY5C,OAAO,SAASC,gBAAgB,EAC9BC,GAAG,EACHC,MAAM,EACNC,aAAa,EACbC,MAAM,EACNC,gBAAgB,EAChBC,eAAe,EACfC,uBAAuB,KAAK,EACR;IACpB,OAAO,CAAC,EAAEC,UAAU,EAAEC,SAAS,EAAE,EAAE,GAAwB,CAAA;YACzDC,MAAM;YACNP;YAEAN,aAAa,CAAC,EAAEc,QAAQ,EAAEF,QAAQG,YAAY,EAAE,EAAE,GAChDf,YAAY;oBACVK;oBACAW,kBAAkBJ;oBAClBK,UAAUV,OAAOU,QAAQ;oBACzBH;oBACAF,QAAQG;oBACRL;gBACF;YAEFQ,cAAc,CAAC,EAAEC,KAAK,EAAEP,QAAQQ,YAAY,EAAE,EAAE,EAAEN,QAAQ,EAAE,GAC1Df,WAAW;oBACTM;oBACAgB,QAAQb;oBACRQ,kBAAkBJ;oBAClBQ;oBACAN;oBACAJ;gBACF;YAEFY,cAAc,OAAO,EAAEC,IAAI,EAAEC,IAAI,EAAE;gBACjC,MAAMtB,WAAW;oBACfE;oBACAC;oBACAoB,QAAQD,KAAKC,MAAM;oBACnBJ,QAAQb;oBACRQ,kBAAkBJ;oBAClBQ,WAAWG,KAAKX,MAAM;oBACtBE,UAAUU,KAAKV,QAAQ;oBACvBY,UAAUF,KAAKE,QAAQ;oBACvBC,cAAcH,KAAKG,YAAY;oBAC/BjB;gBACF;gBAEA,OAAOa;YACT;YAEAK,eAAe,CACbC,KACA,EAAEC,OAAO,EAAEC,QAAQ,EAAEC,mBAAmB,EAAElB,QAAQ,EAAEF,QAAQqB,gBAAgB,EAAE,EAAE,GAEhFhC,QAAQ;oBACNI;oBACAgB,QAAQb;oBACRwB;oBACArB;oBACAK,kBAAkBJ;oBAClBE;oBACAoB,iBAAiBJ;oBACjBG;oBACAJ;oBACApB;oBACAC;gBACF;QACJ,CAAA;AACF"}
+{"version":3,"sources":["../src/adapter.ts"],"sourcesContent":["import type * as AWS from '@aws-sdk/client-s3'\nimport type {\n  Adapter,\n  ClientUploadsConfig,\n  GeneratedAdapter,\n} from '@payloadcms/plugin-cloud-storage/types'\n\nimport type { SignedDownloadsConfig } from './getFile.js'\n\nimport { deleteFile } from './deleteFile.js'\nimport { generateURL } from './generateURL.js'\nimport { getFile } from './getFile.js'\nimport { uploadFile } from './uploadFile.js'\n\ninterface CreateS3AdapterArgs {\n  acl?: 'private' | 'public-read'\n  bucket: string\n  clientUploads?: ClientUploadsConfig\n  config: AWS.S3ClientConfig\n  getStorageClient: () => AWS.S3\n  signedDownloads: SignedDownloadsConfig\n  useCompositePrefixes?: boolean\n}\n\nexport function createS3Adapter({\n  acl,\n  bucket,\n  clientUploads,\n  config,\n  getStorageClient,\n  signedDownloads,\n  useCompositePrefixes = false,\n}: CreateS3AdapterArgs): Adapter {\n  return ({ collection, prefix = '' }): GeneratedAdapter => ({\n    name: 's3',\n    clientUploads,\n    requiresClientUploadReceipt: true,\n\n    generateURL: ({ filename, prefix: urlPrefix = '' }) =>\n      generateURL({\n        bucket,\n        collectionPrefix: prefix,\n        endpoint: config.endpoint,\n        filename,\n        prefix: urlPrefix,\n        useCompositePrefixes,\n      }),\n\n    handleDelete: ({ storageFilePath }) =>\n      deleteFile({\n        bucket,\n        client: getStorageClient(),\n        storageFilePath,\n      }),\n\n    handleUpload: async ({ data, file, storageFilePath }) => {\n      await uploadFile({\n        acl,\n        bucket,\n        buffer: file.buffer,\n        client: getStorageClient(),\n        mimeType: file.mimeType,\n        storageFilePath,\n        tempFilePath: file.tempFilePath,\n      })\n\n      return data\n    },\n\n    staticHandler: (req, { doc, headers, params: { clientUploadContext, filename } }) =>\n      getFile({\n        bucket,\n        client: getStorageClient(),\n        clientUploadContext,\n        collection,\n        collectionPrefix: prefix,\n        doc,\n        filename,\n        incomingHeaders: headers,\n        req,\n        signedDownloads,\n        useCompositePrefixes,\n      }),\n  })\n}\n"],"names":["deleteFile","generateURL","getFile","uploadFile","createS3Adapter","acl","bucket","clientUploads","config","getStorageClient","signedDownloads","useCompositePrefixes","collection","prefix","name","requiresClientUploadReceipt","filename","urlPrefix","collectionPrefix","endpoint","handleDelete","storageFilePath","client","handleUpload","data","file","buffer","mimeType","tempFilePath","staticHandler","req","doc","headers","params","clientUploadContext","incomingHeaders"],"mappings":"AASA,SAASA,UAAU,QAAQ,kBAAiB;AAC5C,SAASC,WAAW,QAAQ,mBAAkB;AAC9C,SAASC,OAAO,QAAQ,eAAc;AACtC,SAASC,UAAU,QAAQ,kBAAiB;AAY5C,OAAO,SAASC,gBAAgB,EAC9BC,GAAG,EACHC,MAAM,EACNC,aAAa,EACbC,MAAM,EACNC,gBAAgB,EAChBC,eAAe,EACfC,uBAAuB,KAAK,EACR;IACpB,OAAO,CAAC,EAAEC,UAAU,EAAEC,SAAS,EAAE,EAAE,GAAwB,CAAA;YACzDC,MAAM;YACNP;YACAQ,6BAA6B;YAE7Bd,aAAa,CAAC,EAAEe,QAAQ,EAAEH,QAAQI,YAAY,EAAE,EAAE,GAChDhB,YAAY;oBACVK;oBACAY,kBAAkBL;oBAClBM,UAAUX,OAAOW,QAAQ;oBACzBH;oBACAH,QAAQI;oBACRN;gBACF;YAEFS,cAAc,CAAC,EAAEC,eAAe,EAAE,GAChCrB,WAAW;oBACTM;oBACAgB,QAAQb;oBACRY;gBACF;YAEFE,cAAc,OAAO,EAAEC,IAAI,EAAEC,IAAI,EAAEJ,eAAe,EAAE;gBAClD,MAAMlB,WAAW;oBACfE;oBACAC;oBACAoB,QAAQD,KAAKC,MAAM;oBACnBJ,QAAQb;oBACRkB,UAAUF,KAAKE,QAAQ;oBACvBN;oBACAO,cAAcH,KAAKG,YAAY;gBACjC;gBAEA,OAAOJ;YACT;YAEAK,eAAe,CAACC,KAAK,EAAEC,GAAG,EAAEC,OAAO,EAAEC,QAAQ,EAAEC,mBAAmB,EAAElB,QAAQ,EAAE,EAAE,GAC9Ed,QAAQ;oBACNI;oBACAgB,QAAQb;oBACRyB;oBACAtB;oBACAM,kBAAkBL;oBAClBkB;oBACAf;oBACAmB,iBAAiBH;oBACjBF;oBACApB;oBACAC;gBACF;QACJ,CAAA;AACF"}

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

@@ -1 +1 @@
-{"version":3,"file":"S3ClientUploadHandler.d.ts","sourceRoot":"","sources":["../../src/client/S3ClientUploadHandler.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,qBAAqB;;;;;;;aA+B1B,OAAI,aA8BV,CAAA"}
+{"version":3,"file":"S3ClientUploadHandler.d.ts","sourceRoot":"","sources":["../../src/client/S3ClientUploadHandler.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,qBAAqB;;;;;;;aA0B5B,OAAC,aAyCL,CAAA"}

package/dist/client/S3ClientUploadHandler.js

@@ -24,22 +24,23 @@ export const S3ClientUploadHandler = createClientUploadHandler({
             const { errors } = await response.json();
             throw new Error(errors.reduce((acc, err)=>`${acc ? `${acc}, ` : ''}${err.message}`, ''));
         }
-        const { docPrefix: sanitizedDocPrefix, filename: sanitizedFilename, url } = await response.json();
+        const { clientUploadContext, filename: sanitizedFilename, headers, url } = await response.json();
         if (sanitizedFilename && sanitizedFilename !== file.name) {
             updateFilename(sanitizedFilename);
         }
         // upload the file directly to S3 using the signed URL
-        await fetch(url, {
+        const upload = await fetch(url, {
             body: file,
-            headers: {
-                'Content-Length': file.size.toString(),
-                'Content-Type': file.type
-            },
+            headers,
             method: 'PUT'
         });
-        // return the docPrefix so the client can update the field value accordingly
+        if (!upload.ok) {
+            throw new Error(`Upload failed with status ${upload.status}`);
+        }
+        // Return the server-issued upload context for the document request.
         return {
-            prefix: sanitizedDocPrefix
+            prefix: clientUploadContext.prefix,
+            signedReceipt: clientUploadContext.signedReceipt
         };
     }
 });

package/dist/client/S3ClientUploadHandler.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/client/S3ClientUploadHandler.ts"],"sourcesContent":["'use client'\nimport { createClientUploadHandler } from '@payloadcms/plugin-cloud-storage/client'\nimport { formatAdminURL } from 'payload/shared'\n\nexport const S3ClientUploadHandler = createClientUploadHandler({\n  handler: async ({\n    apiRoute,\n    collectionSlug,\n    docPrefix,\n    file,\n    serverHandlerPath,\n    serverURL,\n    updateFilename,\n  }) => {\n    const endpointRoute = formatAdminURL({\n      apiRoute,\n      path: serverHandlerPath,\n      serverURL,\n    })\n\n    // get the signed URL from the server\n    const response = await fetch(endpointRoute, {\n      body: JSON.stringify({\n        collectionSlug,\n        docPrefix,\n        filename: file.name,\n        filesize: file.size,\n        mimeType: file.type,\n      }),\n      credentials: 'include',\n      method: 'POST',\n    })\n\n    if (!response.ok) {\n      const { errors } = (await response.json()) as {\n        errors: { message: string }[]\n      }\n\n      throw new Error(errors.reduce((acc, err) => `${acc ? `${acc}, ` : ''}${err.message}`, ''))\n    }\n\n    const {\n      docPrefix: sanitizedDocPrefix,\n      filename: sanitizedFilename,\n      url,\n    } = (await response.json()) as {\n      docPrefix: string\n      filename?: string\n      url: string\n    }\n\n    if (sanitizedFilename && sanitizedFilename !== file.name) {\n      updateFilename(sanitizedFilename)\n    }\n\n    // upload the file directly to S3 using the signed URL\n    await fetch(url, {\n      body: file,\n      headers: { 'Content-Length': file.size.toString(), 'Content-Type': file.type },\n      method: 'PUT',\n    })\n\n    // return the docPrefix so the client can update the field value accordingly\n    return { prefix: sanitizedDocPrefix }\n  },\n})\n"],"names":["createClientUploadHandler","formatAdminURL","S3ClientUploadHandler","handler","apiRoute","collectionSlug","docPrefix","file","serverHandlerPath","serverURL","updateFilename","endpointRoute","path","response","fetch","body","JSON","stringify","filename","name","filesize","size","mimeType","type","credentials","method","ok","errors","json","Error","reduce","acc","err","message","sanitizedDocPrefix","sanitizedFilename","url","headers","toString","prefix"],"mappings":"AAAA;AACA,SAASA,yBAAyB,QAAQ,0CAAyC;AACnF,SAASC,cAAc,QAAQ,iBAAgB;AAE/C,OAAO,MAAMC,wBAAwBF,0BAA0B;IAC7DG,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;QAEA,qCAAqC;QACrC,MAAMI,WAAW,MAAMC,MAAMH,eAAe;YAC1CI,MAAMC,KAAKC,SAAS,CAAC;gBACnBZ;gBACAC;gBACAY,UAAUX,KAAKY,IAAI;gBACnBC,UAAUb,KAAKc,IAAI;gBACnBC,UAAUf,KAAKgB,IAAI;YACrB;YACAC,aAAa;YACbC,QAAQ;QACV;QAEA,IAAI,CAACZ,SAASa,EAAE,EAAE;YAChB,MAAM,EAAEC,MAAM,EAAE,GAAI,MAAMd,SAASe,IAAI;YAIvC,MAAM,IAAIC,MAAMF,OAAOG,MAAM,CAAC,CAACC,KAAKC,MAAQ,GAAGD,MAAM,GAAGA,IAAI,EAAE,CAAC,GAAG,KAAKC,IAAIC,OAAO,EAAE,EAAE;QACxF;QAEA,MAAM,EACJ3B,WAAW4B,kBAAkB,EAC7BhB,UAAUiB,iBAAiB,EAC3BC,GAAG,EACJ,GAAI,MAAMvB,SAASe,IAAI;QAMxB,IAAIO,qBAAqBA,sBAAsB5B,KAAKY,IAAI,EAAE;YACxDT,eAAeyB;QACjB;QAEA,sDAAsD;QACtD,MAAMrB,MAAMsB,KAAK;YACfrB,MAAMR;YACN8B,SAAS;gBAAE,kBAAkB9B,KAAKc,IAAI,CAACiB,QAAQ;gBAAI,gBAAgB/B,KAAKgB,IAAI;YAAC;YAC7EE,QAAQ;QACV;QAEA,4EAA4E;QAC5E,OAAO;YAAEc,QAAQL;QAAmB;IACtC;AACF,GAAE"}
+{"version":3,"sources":["../../src/client/S3ClientUploadHandler.ts"],"sourcesContent":["'use client'\nimport type { ClientUploadContext } from '@payloadcms/plugin-cloud-storage/types'\n\nimport { createClientUploadHandler } from '@payloadcms/plugin-cloud-storage/client'\nimport { formatAdminURL } from 'payload/shared'\n\nexport const S3ClientUploadHandler = createClientUploadHandler({\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\n    // get the signed URL from the server\n    const response = await fetch(endpointRoute, {\n      body: JSON.stringify({\n        collectionSlug,\n        docPrefix,\n        filename: file.name,\n        filesize: file.size,\n        mimeType: file.type,\n      }),\n      credentials: 'include',\n      method: 'POST',\n    })\n\n    if (!response.ok) {\n      const { errors } = (await response.json()) as {\n        errors: { message: string }[]\n      }\n\n      throw new Error(errors.reduce((acc, err) => `${acc ? `${acc}, ` : ''}${err.message}`, ''))\n    }\n\n    const {\n      clientUploadContext,\n      filename: sanitizedFilename,\n      headers,\n      url,\n    } = (await response.json()) as {\n      clientUploadContext: ClientUploadContext\n      filename?: string\n      headers: Record<string, string>\n      url: string\n    }\n\n    if (sanitizedFilename && sanitizedFilename !== file.name) {\n      updateFilename(sanitizedFilename)\n    }\n\n    // upload the file directly to S3 using the signed URL\n    const upload = await fetch(url, {\n      body: file,\n      headers,\n      method: 'PUT',\n    })\n\n    if (!upload.ok) {\n      throw new Error(`Upload failed with status ${upload.status}`)\n    }\n\n    // Return the server-issued upload context for the document request.\n    return { prefix: clientUploadContext.prefix, signedReceipt: clientUploadContext.signedReceipt }\n  },\n})\n"],"names":["createClientUploadHandler","formatAdminURL","S3ClientUploadHandler","handler","apiRoute","collectionSlug","docPrefix","file","serverHandlerPath","serverURL","updateFilename","endpointRoute","path","response","fetch","body","JSON","stringify","filename","name","filesize","size","mimeType","type","credentials","method","ok","errors","json","Error","reduce","acc","err","message","clientUploadContext","sanitizedFilename","headers","url","upload","status","prefix","signedReceipt"],"mappings":"AAAA;AAGA,SAASA,yBAAyB,QAAQ,0CAAyC;AACnF,SAASC,cAAc,QAAQ,iBAAgB;AAE/C,OAAO,MAAMC,wBAAwBF,0BAA0B;IAC7DG,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;QAEA,qCAAqC;QACrC,MAAMI,WAAW,MAAMC,MAAMH,eAAe;YAC1CI,MAAMC,KAAKC,SAAS,CAAC;gBACnBZ;gBACAC;gBACAY,UAAUX,KAAKY,IAAI;gBACnBC,UAAUb,KAAKc,IAAI;gBACnBC,UAAUf,KAAKgB,IAAI;YACrB;YACAC,aAAa;YACbC,QAAQ;QACV;QAEA,IAAI,CAACZ,SAASa,EAAE,EAAE;YAChB,MAAM,EAAEC,MAAM,EAAE,GAAI,MAAMd,SAASe,IAAI;YAIvC,MAAM,IAAIC,MAAMF,OAAOG,MAAM,CAAC,CAACC,KAAKC,MAAQ,GAAGD,MAAM,GAAGA,IAAI,EAAE,CAAC,GAAG,KAAKC,IAAIC,OAAO,EAAE,EAAE;QACxF;QAEA,MAAM,EACJC,mBAAmB,EACnBhB,UAAUiB,iBAAiB,EAC3BC,OAAO,EACPC,GAAG,EACJ,GAAI,MAAMxB,SAASe,IAAI;QAOxB,IAAIO,qBAAqBA,sBAAsB5B,KAAKY,IAAI,EAAE;YACxDT,eAAeyB;QACjB;QAEA,sDAAsD;QACtD,MAAMG,SAAS,MAAMxB,MAAMuB,KAAK;YAC9BtB,MAAMR;YACN6B;YACAX,QAAQ;QACV;QAEA,IAAI,CAACa,OAAOZ,EAAE,EAAE;YACd,MAAM,IAAIG,MAAM,CAAC,0BAA0B,EAAES,OAAOC,MAAM,EAAE;QAC9D;QAEA,oEAAoE;QACpE,OAAO;YAAEC,QAAQN,oBAAoBM,MAAM;YAAEC,eAAeP,oBAAoBO,aAAa;QAAC;IAChG;AACF,GAAE"}

package/dist/deleteFile.d.ts

@@ -2,11 +2,8 @@ import type * as AWS from '@aws-sdk/client-s3';
 interface DeleteArgs {
     bucket: string;
     client: AWS.S3;
-    collectionPrefix?: string;
-    docPrefix: string;
-    filename: string;
-    useCompositePrefixes?: boolean;
+    storageFilePath: string;
 }
-export declare function deleteFile({ bucket, client, collectionPrefix, docPrefix, filename, useCompositePrefixes, }: DeleteArgs): Promise<void>;
+export declare function deleteFile({ bucket, client, storageFilePath }: DeleteArgs): 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":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,oBAAoB,CAAA;AAI9C,UAAU,UAAU;IAClB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,GAAG,CAAC,EAAE,CAAA;IACd,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,EAAE,MAAM,CAAA;IAChB,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,wBAAsB,UAAU,CAAC,EAC/B,MAAM,EACN,MAAM,EACN,gBAAqB,EACrB,SAAS,EACT,QAAQ,EACR,oBAA4B,GAC7B,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAY5B"}
+{"version":3,"file":"deleteFile.d.ts","sourceRoot":"","sources":["../src/deleteFile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,oBAAoB,CAAA;AAE9C,UAAU,UAAU;IAClB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,GAAG,CAAC,EAAE,CAAA;IACd,eAAe,EAAE,MAAM,CAAA;CACxB;AAED,wBAAsB,UAAU,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAK/F"}

package/dist/deleteFile.js

@@ -1,14 +1,7 @@
-import { getFileKey } from '@payloadcms/plugin-cloud-storage/utilities';
-export async function deleteFile({ bucket, client, collectionPrefix = '', docPrefix, filename, useCompositePrefixes = false }) {
-    const { fileKey } = getFileKey({
-        collectionPrefix,
-        docPrefix,
-        filename,
-        useCompositePrefixes
-    });
+export async function deleteFile({ bucket, client, storageFilePath }) {
     await client.deleteObject({
         Bucket: bucket,
-        Key: fileKey
+        Key: storageFilePath
     });
 }
 

package/dist/deleteFile.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/deleteFile.ts"],"sourcesContent":["import type * as AWS from '@aws-sdk/client-s3'\n\nimport { getFileKey } from '@payloadcms/plugin-cloud-storage/utilities'\n\ninterface DeleteArgs {\n  bucket: string\n  client: AWS.S3\n  collectionPrefix?: string\n  docPrefix: string\n  filename: string\n  useCompositePrefixes?: boolean\n}\n\nexport async function deleteFile({\n  bucket,\n  client,\n  collectionPrefix = '',\n  docPrefix,\n  filename,\n  useCompositePrefixes = false,\n}: DeleteArgs): Promise<void> {\n  const { fileKey } = getFileKey({\n    collectionPrefix,\n    docPrefix,\n    filename,\n    useCompositePrefixes,\n  })\n\n  await client.deleteObject({\n    Bucket: bucket,\n    Key: fileKey,\n  })\n}\n"],"names":["getFileKey","deleteFile","bucket","client","collectionPrefix","docPrefix","filename","useCompositePrefixes","fileKey","deleteObject","Bucket","Key"],"mappings":"AAEA,SAASA,UAAU,QAAQ,6CAA4C;AAWvE,OAAO,eAAeC,WAAW,EAC/BC,MAAM,EACNC,MAAM,EACNC,mBAAmB,EAAE,EACrBC,SAAS,EACTC,QAAQ,EACRC,uBAAuB,KAAK,EACjB;IACX,MAAM,EAAEC,OAAO,EAAE,GAAGR,WAAW;QAC7BI;QACAC;QACAC;QACAC;IACF;IAEA,MAAMJ,OAAOM,YAAY,CAAC;QACxBC,QAAQR;QACRS,KAAKH;IACP;AACF"}
+{"version":3,"sources":["../src/deleteFile.ts"],"sourcesContent":["import type * as AWS from '@aws-sdk/client-s3'\n\ninterface DeleteArgs {\n  bucket: string\n  client: AWS.S3\n  storageFilePath: string\n}\n\nexport async function deleteFile({ bucket, client, storageFilePath }: DeleteArgs): Promise<void> {\n  await client.deleteObject({\n    Bucket: bucket,\n    Key: storageFilePath,\n  })\n}\n"],"names":["deleteFile","bucket","client","storageFilePath","deleteObject","Bucket","Key"],"mappings":"AAQA,OAAO,eAAeA,WAAW,EAAEC,MAAM,EAAEC,MAAM,EAAEC,eAAe,EAAc;IAC9E,MAAMD,OAAOE,YAAY,CAAC;QACxBC,QAAQJ;QACRK,KAAKH;IACP;AACF"}

package/dist/generateSignedURL.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generateSignedURL.d.ts","sourceRoot":"","sources":["../src/generateSignedURL.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAA;AACjF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAE7C,OAAO,KAAK,GAAG,MAAM,oBAAoB,CAAA;AAKzC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAMlD,UAAU,IAAI;IACZ,MAAM,CAAC,EAAE,mBAAmB,CAAA;IAC5B,GAAG,CAAC,EAAE,SAAS,GAAG,aAAa,CAAA;IAC/B,MAAM,EAAE,MAAM,CAAA;IACd,WAAW,EAAE,gBAAgB,CAAC,aAAa,CAAC,CAAA;IAC5C,gBAAgB,EAAE,MAAM,GAAG,CAAC,EAAE,CAAA;IAC9B,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAID,eAAO,MAAM,2BAA2B,kFAOrC,IAAI,KAAG,cA4ET,CAAA"}
+{"version":3,"file":"generateSignedURL.d.ts","sourceRoot":"","sources":["../src/generateSignedURL.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAA;AACjF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAE7C,OAAO,KAAK,GAAG,MAAM,oBAAoB,CAAA;AAUzC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAMlD,UAAU,IAAI;IACZ,MAAM,CAAC,EAAE,mBAAmB,CAAA;IAC5B,GAAG,CAAC,EAAE,SAAS,GAAG,aAAa,CAAA;IAC/B,MAAM,EAAE,MAAM,CAAA;IACd,WAAW,EAAE,gBAAgB,CAAC,aAAa,CAAC,CAAA;IAC5C,gBAAgB,EAAE,MAAM,GAAG,CAAC,EAAE,CAAA;IAC9B,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAID,eAAO,MAAM,2BAA2B,kFAOrC,IAAI,KAAG,cAkGT,CAAA"}

package/dist/generateSignedURL.js

@@ -2,6 +2,7 @@ import * as AWS from '@aws-sdk/client-s3';
 import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
 import { resolveSignedURLKey } from '@payloadcms/plugin-cloud-storage/utilities';
 import { APIError, Forbidden } from 'payload';
+import { assertClientUploadAccess, assertClientUploadAllowed, assertClientUploadFileSize } from 'payload/internal';
 const bytesToMB = (bytes)=>{
     return bytes / 1024 / 1024;
 };
@@ -16,6 +17,10 @@ export const getGenerateSignedURLHandler = ({ access = defaultAccess, acl, bucke
             filesizeLimit = undefined;
         }
         const { collectionSlug, docPrefix, filename, filesize, mimeType } = await req.json();
+        await assertClientUploadAccess({
+            collectionSlug,
+            req
+        });
         const collectionS3Config = collections[collectionSlug];
         if (!collectionS3Config) {
             throw new APIError(`Collection ${collectionSlug} was not found in S3 options`);
@@ -27,7 +32,12 @@ export const getGenerateSignedURLHandler = ({ access = defaultAccess, acl, bucke
         })) {
             throw new Forbidden();
         }
-        const { fileKey, sanitizedDocPrefix, sanitizedFilename } = await resolveSignedURLKey({
+        assertClientUploadAllowed({
+            collection: req.payload.collections[collectionSlug]?.config,
+            filename,
+            mimeType
+        });
+        const { clientUploadContext, fileKey, sanitizedDocPrefix, sanitizedFilename } = await resolveSignedURLKey({
             collectionPrefix,
             collectionSlug,
             docPrefix,
@@ -36,7 +46,11 @@ export const getGenerateSignedURLHandler = ({ access = defaultAccess, acl, bucke
             useCompositePrefixes
         });
         const signableHeaders = new Set();
+        if (typeof mimeType === 'string' && mimeType) {
+            signableHeaders.add('content-type');
+        }
         if (filesizeLimit) {
+            assertClientUploadFileSize(filesize);
             if (filesize > filesizeLimit) {
                 throw new APIError(`Exceeded file size limit. Limit: ${bytesToMB(filesizeLimit).toFixed(2)}MB, got: ${bytesToMB(filesize).toFixed(2)}MB`, 400);
             }
@@ -48,14 +62,21 @@ export const getGenerateSignedURLHandler = ({ access = defaultAccess, acl, bucke
             Bucket: bucket,
             ContentLength: filesizeLimit ? Math.min(filesize, filesizeLimit) : undefined,
             ContentType: mimeType,
+            IfNoneMatch: '*',
             Key: fileKey
         }), {
             expiresIn: 600,
             signableHeaders
         });
         return Response.json({
+            clientUploadContext,
             docPrefix: sanitizedDocPrefix,
             filename: sanitizedFilename,
+            headers: {
+                'Content-Length': String(filesize),
+                'Content-Type': mimeType,
+                'If-None-Match': '*'
+            },
             url
         });
     };

package/dist/generateSignedURL.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/generateSignedURL.ts"],"sourcesContent":["import type { ClientUploadsAccess } from '@payloadcms/plugin-cloud-storage/types'\nimport type { PayloadHandler } from 'payload'\n\nimport * as AWS from '@aws-sdk/client-s3'\nimport { getSignedUrl } from '@aws-sdk/s3-request-presigner'\nimport { resolveSignedURLKey } from '@payloadcms/plugin-cloud-storage/utilities'\nimport { APIError, Forbidden } from 'payload'\n\nimport type { S3StorageOptions } from './index.js'\n\nconst bytesToMB = (bytes: number) => {\n  return bytes / 1024 / 1024\n}\n\ninterface Args {\n  access?: ClientUploadsAccess\n  acl?: 'private' | 'public-read'\n  bucket: string\n  collections: S3StorageOptions['collections']\n  getStorageClient: () => AWS.S3\n  useCompositePrefixes?: boolean\n}\n\nconst defaultAccess: Args['access'] = ({ req }) => !!req.user\n\nexport const getGenerateSignedURLHandler = ({\n  access = defaultAccess,\n  acl,\n  bucket,\n  collections,\n  getStorageClient,\n  useCompositePrefixes = false,\n}: Args): PayloadHandler => {\n  return async (req) => {\n    if (!req.json) {\n      throw new APIError('Content-Type expected to be application/json', 400)\n    }\n\n    let filesizeLimit = req.payload.config.upload.limits?.fileSize\n\n    if (filesizeLimit === Infinity) {\n      filesizeLimit = undefined\n    }\n\n    const { collectionSlug, docPrefix, filename, filesize, mimeType } = (await req.json()) as {\n      collectionSlug: string\n      docPrefix?: string\n      filename: string\n      filesize: number\n      mimeType: string\n    }\n\n    const collectionS3Config = collections[collectionSlug]\n    if (!collectionS3Config) {\n      throw new APIError(`Collection ${collectionSlug} was not found in S3 options`)\n    }\n\n    const collectionPrefix =\n      (typeof collectionS3Config === 'object' && collectionS3Config.prefix) || ''\n\n    if (!(await access({ collectionSlug, req }))) {\n      throw new Forbidden()\n    }\n\n    const { fileKey, sanitizedDocPrefix, sanitizedFilename } = await resolveSignedURLKey({\n      collectionPrefix,\n      collectionSlug,\n      docPrefix,\n      filename,\n      req,\n      useCompositePrefixes,\n    })\n\n    const signableHeaders = new Set<string>()\n\n    if (filesizeLimit) {\n      if (filesize > filesizeLimit) {\n        throw new APIError(\n          `Exceeded file size limit. Limit: ${bytesToMB(filesizeLimit).toFixed(2)}MB, got: ${bytesToMB(filesize).toFixed(2)}MB`,\n          400,\n        )\n      }\n\n      // Still force S3 to validate\n      signableHeaders.add('content-length')\n    }\n\n    const url = await getSignedUrl(\n      getStorageClient(),\n      new AWS.PutObjectCommand({\n        ACL: acl,\n        Bucket: bucket,\n        ContentLength: filesizeLimit ? Math.min(filesize, filesizeLimit) : undefined,\n        ContentType: mimeType,\n        Key: fileKey,\n      }),\n      {\n        expiresIn: 600,\n        signableHeaders,\n      },\n    )\n\n    return Response.json({\n      docPrefix: sanitizedDocPrefix,\n      filename: sanitizedFilename,\n      url,\n    })\n  }\n}\n"],"names":["AWS","getSignedUrl","resolveSignedURLKey","APIError","Forbidden","bytesToMB","bytes","defaultAccess","req","user","getGenerateSignedURLHandler","access","acl","bucket","collections","getStorageClient","useCompositePrefixes","json","filesizeLimit","payload","config","upload","limits","fileSize","Infinity","undefined","collectionSlug","docPrefix","filename","filesize","mimeType","collectionS3Config","collectionPrefix","prefix","fileKey","sanitizedDocPrefix","sanitizedFilename","signableHeaders","Set","toFixed","add","url","PutObjectCommand","ACL","Bucket","ContentLength","Math","min","ContentType","Key","expiresIn","Response"],"mappings":"AAGA,YAAYA,SAAS,qBAAoB;AACzC,SAASC,YAAY,QAAQ,gCAA+B;AAC5D,SAASC,mBAAmB,QAAQ,6CAA4C;AAChF,SAASC,QAAQ,EAAEC,SAAS,QAAQ,UAAS;AAI7C,MAAMC,YAAY,CAACC;IACjB,OAAOA,QAAQ,OAAO;AACxB;AAWA,MAAMC,gBAAgC,CAAC,EAAEC,GAAG,EAAE,GAAK,CAAC,CAACA,IAAIC,IAAI;AAE7D,OAAO,MAAMC,8BAA8B,CAAC,EAC1CC,SAASJ,aAAa,EACtBK,GAAG,EACHC,MAAM,EACNC,WAAW,EACXC,gBAAgB,EAChBC,uBAAuB,KAAK,EACvB;IACL,OAAO,OAAOR;QACZ,IAAI,CAACA,IAAIS,IAAI,EAAE;YACb,MAAM,IAAId,SAAS,gDAAgD;QACrE;QAEA,IAAIe,gBAAgBV,IAAIW,OAAO,CAACC,MAAM,CAACC,MAAM,CAACC,MAAM,EAAEC;QAEtD,IAAIL,kBAAkBM,UAAU;YAC9BN,gBAAgBO;QAClB;QAEA,MAAM,EAAEC,cAAc,EAAEC,SAAS,EAAEC,QAAQ,EAAEC,QAAQ,EAAEC,QAAQ,EAAE,GAAI,MAAMtB,IAAIS,IAAI;QAQnF,MAAMc,qBAAqBjB,WAAW,CAACY,eAAe;QACtD,IAAI,CAACK,oBAAoB;YACvB,MAAM,IAAI5B,SAAS,CAAC,WAAW,EAAEuB,eAAe,4BAA4B,CAAC;QAC/E;QAEA,MAAMM,mBACJ,AAAC,OAAOD,uBAAuB,YAAYA,mBAAmBE,MAAM,IAAK;QAE3E,IAAI,CAAE,MAAMtB,OAAO;YAAEe;YAAgBlB;QAAI,IAAK;YAC5C,MAAM,IAAIJ;QACZ;QAEA,MAAM,EAAE8B,OAAO,EAAEC,kBAAkB,EAAEC,iBAAiB,EAAE,GAAG,MAAMlC,oBAAoB;YACnF8B;YACAN;YACAC;YACAC;YACApB;YACAQ;QACF;QAEA,MAAMqB,kBAAkB,IAAIC;QAE5B,IAAIpB,eAAe;YACjB,IAAIW,WAAWX,eAAe;gBAC5B,MAAM,IAAIf,SACR,CAAC,iCAAiC,EAAEE,UAAUa,eAAeqB,OAAO,CAAC,GAAG,SAAS,EAAElC,UAAUwB,UAAUU,OAAO,CAAC,GAAG,EAAE,CAAC,EACrH;YAEJ;YAEA,6BAA6B;YAC7BF,gBAAgBG,GAAG,CAAC;QACtB;QAEA,MAAMC,MAAM,MAAMxC,aAChBc,oBACA,IAAIf,IAAI0C,gBAAgB,CAAC;YACvBC,KAAK/B;YACLgC,QAAQ/B;YACRgC,eAAe3B,gBAAgB4B,KAAKC,GAAG,CAAClB,UAAUX,iBAAiBO;YACnEuB,aAAalB;YACbmB,KAAKf;QACP,IACA;YACEgB,WAAW;YACXb;QACF;QAGF,OAAOc,SAASlC,IAAI,CAAC;YACnBU,WAAWQ;YACXP,UAAUQ;YACVK;QACF;IACF;AACF,EAAC"}
+{"version":3,"sources":["../src/generateSignedURL.ts"],"sourcesContent":["import type { ClientUploadsAccess } from '@payloadcms/plugin-cloud-storage/types'\nimport type { PayloadHandler } from 'payload'\n\nimport * as AWS from '@aws-sdk/client-s3'\nimport { getSignedUrl } from '@aws-sdk/s3-request-presigner'\nimport { resolveSignedURLKey } from '@payloadcms/plugin-cloud-storage/utilities'\nimport { APIError, Forbidden } from 'payload'\nimport {\n  assertClientUploadAccess,\n  assertClientUploadAllowed,\n  assertClientUploadFileSize,\n} from 'payload/internal'\n\nimport type { S3StorageOptions } from './index.js'\n\nconst bytesToMB = (bytes: number) => {\n  return bytes / 1024 / 1024\n}\n\ninterface Args {\n  access?: ClientUploadsAccess\n  acl?: 'private' | 'public-read'\n  bucket: string\n  collections: S3StorageOptions['collections']\n  getStorageClient: () => AWS.S3\n  useCompositePrefixes?: boolean\n}\n\nconst defaultAccess: Args['access'] = ({ req }) => !!req.user\n\nexport const getGenerateSignedURLHandler = ({\n  access = defaultAccess,\n  acl,\n  bucket,\n  collections,\n  getStorageClient,\n  useCompositePrefixes = false,\n}: Args): PayloadHandler => {\n  return async (req) => {\n    if (!req.json) {\n      throw new APIError('Content-Type expected to be application/json', 400)\n    }\n\n    let filesizeLimit = req.payload.config.upload.limits?.fileSize\n\n    if (filesizeLimit === Infinity) {\n      filesizeLimit = undefined\n    }\n\n    const { collectionSlug, docPrefix, filename, filesize, mimeType } = (await req.json()) as {\n      collectionSlug: string\n      docPrefix?: string\n      filename: string\n      filesize: number\n      mimeType: string\n    }\n\n    await assertClientUploadAccess({ collectionSlug, req })\n\n    const collectionS3Config = collections[collectionSlug]\n    if (!collectionS3Config) {\n      throw new APIError(`Collection ${collectionSlug} was not found in S3 options`)\n    }\n\n    const collectionPrefix =\n      (typeof collectionS3Config === 'object' && collectionS3Config.prefix) || ''\n\n    if (!(await access({ collectionSlug, req }))) {\n      throw new Forbidden()\n    }\n\n    assertClientUploadAllowed({\n      collection: req.payload.collections[collectionSlug]?.config,\n      filename,\n      mimeType,\n    })\n\n    const { clientUploadContext, fileKey, sanitizedDocPrefix, sanitizedFilename } =\n      await resolveSignedURLKey({\n        collectionPrefix,\n        collectionSlug,\n        docPrefix,\n        filename,\n        req,\n        useCompositePrefixes,\n      })\n\n    const signableHeaders = new Set<string>()\n\n    if (typeof mimeType === 'string' && mimeType) {\n      signableHeaders.add('content-type')\n    }\n\n    if (filesizeLimit) {\n      assertClientUploadFileSize(filesize)\n\n      if (filesize > filesizeLimit) {\n        throw new APIError(\n          `Exceeded file size limit. Limit: ${bytesToMB(filesizeLimit).toFixed(2)}MB, got: ${bytesToMB(filesize).toFixed(2)}MB`,\n          400,\n        )\n      }\n\n      // Still force S3 to validate\n      signableHeaders.add('content-length')\n    }\n\n    const url = await getSignedUrl(\n      getStorageClient(),\n      new AWS.PutObjectCommand({\n        ACL: acl,\n        Bucket: bucket,\n        ContentLength: filesizeLimit ? Math.min(filesize, filesizeLimit) : undefined,\n        ContentType: mimeType,\n        IfNoneMatch: '*',\n        Key: fileKey,\n      }),\n      {\n        expiresIn: 600,\n        signableHeaders,\n      },\n    )\n\n    return Response.json({\n      clientUploadContext,\n      docPrefix: sanitizedDocPrefix,\n      filename: sanitizedFilename,\n      headers: {\n        'Content-Length': String(filesize),\n        'Content-Type': mimeType,\n        'If-None-Match': '*',\n      },\n      url,\n    })\n  }\n}\n"],"names":["AWS","getSignedUrl","resolveSignedURLKey","APIError","Forbidden","assertClientUploadAccess","assertClientUploadAllowed","assertClientUploadFileSize","bytesToMB","bytes","defaultAccess","req","user","getGenerateSignedURLHandler","access","acl","bucket","collections","getStorageClient","useCompositePrefixes","json","filesizeLimit","payload","config","upload","limits","fileSize","Infinity","undefined","collectionSlug","docPrefix","filename","filesize","mimeType","collectionS3Config","collectionPrefix","prefix","collection","clientUploadContext","fileKey","sanitizedDocPrefix","sanitizedFilename","signableHeaders","Set","add","toFixed","url","PutObjectCommand","ACL","Bucket","ContentLength","Math","min","ContentType","IfNoneMatch","Key","expiresIn","Response","headers","String"],"mappings":"AAGA,YAAYA,SAAS,qBAAoB;AACzC,SAASC,YAAY,QAAQ,gCAA+B;AAC5D,SAASC,mBAAmB,QAAQ,6CAA4C;AAChF,SAASC,QAAQ,EAAEC,SAAS,QAAQ,UAAS;AAC7C,SACEC,wBAAwB,EACxBC,yBAAyB,EACzBC,0BAA0B,QACrB,mBAAkB;AAIzB,MAAMC,YAAY,CAACC;IACjB,OAAOA,QAAQ,OAAO;AACxB;AAWA,MAAMC,gBAAgC,CAAC,EAAEC,GAAG,EAAE,GAAK,CAAC,CAACA,IAAIC,IAAI;AAE7D,OAAO,MAAMC,8BAA8B,CAAC,EAC1CC,SAASJ,aAAa,EACtBK,GAAG,EACHC,MAAM,EACNC,WAAW,EACXC,gBAAgB,EAChBC,uBAAuB,KAAK,EACvB;IACL,OAAO,OAAOR;QACZ,IAAI,CAACA,IAAIS,IAAI,EAAE;YACb,MAAM,IAAIjB,SAAS,gDAAgD;QACrE;QAEA,IAAIkB,gBAAgBV,IAAIW,OAAO,CAACC,MAAM,CAACC,MAAM,CAACC,MAAM,EAAEC;QAEtD,IAAIL,kBAAkBM,UAAU;YAC9BN,gBAAgBO;QAClB;QAEA,MAAM,EAAEC,cAAc,EAAEC,SAAS,EAAEC,QAAQ,EAAEC,QAAQ,EAAEC,QAAQ,EAAE,GAAI,MAAMtB,IAAIS,IAAI;QAQnF,MAAMf,yBAAyB;YAAEwB;YAAgBlB;QAAI;QAErD,MAAMuB,qBAAqBjB,WAAW,CAACY,eAAe;QACtD,IAAI,CAACK,oBAAoB;YACvB,MAAM,IAAI/B,SAAS,CAAC,WAAW,EAAE0B,eAAe,4BAA4B,CAAC;QAC/E;QAEA,MAAMM,mBACJ,AAAC,OAAOD,uBAAuB,YAAYA,mBAAmBE,MAAM,IAAK;QAE3E,IAAI,CAAE,MAAMtB,OAAO;YAAEe;YAAgBlB;QAAI,IAAK;YAC5C,MAAM,IAAIP;QACZ;QAEAE,0BAA0B;YACxB+B,YAAY1B,IAAIW,OAAO,CAACL,WAAW,CAACY,eAAe,EAAEN;YACrDQ;YACAE;QACF;QAEA,MAAM,EAAEK,mBAAmB,EAAEC,OAAO,EAAEC,kBAAkB,EAAEC,iBAAiB,EAAE,GAC3E,MAAMvC,oBAAoB;YACxBiC;YACAN;YACAC;YACAC;YACApB;YACAQ;QACF;QAEF,MAAMuB,kBAAkB,IAAIC;QAE5B,IAAI,OAAOV,aAAa,YAAYA,UAAU;YAC5CS,gBAAgBE,GAAG,CAAC;QACtB;QAEA,IAAIvB,eAAe;YACjBd,2BAA2ByB;YAE3B,IAAIA,WAAWX,eAAe;gBAC5B,MAAM,IAAIlB,SACR,CAAC,iCAAiC,EAAEK,UAAUa,eAAewB,OAAO,CAAC,GAAG,SAAS,EAAErC,UAAUwB,UAAUa,OAAO,CAAC,GAAG,EAAE,CAAC,EACrH;YAEJ;YAEA,6BAA6B;YAC7BH,gBAAgBE,GAAG,CAAC;QACtB;QAEA,MAAME,MAAM,MAAM7C,aAChBiB,oBACA,IAAIlB,IAAI+C,gBAAgB,CAAC;YACvBC,KAAKjC;YACLkC,QAAQjC;YACRkC,eAAe7B,gBAAgB8B,KAAKC,GAAG,CAACpB,UAAUX,iBAAiBO;YACnEyB,aAAapB;YACbqB,aAAa;YACbC,KAAKhB;QACP,IACA;YACEiB,WAAW;YACXd;QACF;QAGF,OAAOe,SAASrC,IAAI,CAAC;YACnBkB;YACAR,WAAWU;YACXT,UAAUU;YACViB,SAAS;gBACP,kBAAkBC,OAAO3B;gBACzB,gBAAgBC;gBAChB,iBAAiB;YACnB;YACAa;QACF;IACF;AACF,EAAC"}

package/dist/generateURL.js

@@ -1,14 +1,14 @@
-import { getFileKey } from '@payloadcms/plugin-cloud-storage/utilities';
+import { buildStoragePathData } from '@payloadcms/plugin-cloud-storage/utilities';
 import path from 'path';
 export function generateURL({ bucket, collectionPrefix = '', endpoint, filename, prefix, useCompositePrefixes = false }) {
-    const { fileKey: rawFileKey } = getFileKey({
+    const { storageFilePath } = buildStoragePathData({
         collectionPrefix,
         docPrefix: prefix,
         filename,
         useCompositePrefixes
     });
-    const dir = path.posix.dirname(rawFileKey);
-    const encodedFilename = encodeURIComponent(path.posix.basename(rawFileKey));
+    const dir = path.posix.dirname(storageFilePath);
+    const encodedFilename = encodeURIComponent(path.posix.basename(storageFilePath));
     const fileKey = dir === '.' ? encodedFilename : path.posix.join(dir, encodedFilename);
     const stringifiedEndpoint = typeof endpoint === 'string' ? endpoint : endpoint?.toString();
     return `${stringifiedEndpoint}/${bucket}/${fileKey}`;

package/dist/generateURL.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/generateURL.ts"],"sourcesContent":["import type * as AWS from '@aws-sdk/client-s3'\n\nimport { getFileKey } from '@payloadcms/plugin-cloud-storage/utilities'\nimport path from 'path'\n\ninterface GenerateURLArgs {\n  bucket: string\n  collectionPrefix?: string\n  endpoint?: AWS.S3ClientConfig['endpoint']\n  filename: string\n  prefix: string\n  useCompositePrefixes?: boolean\n}\n\nexport function generateURL({\n  bucket,\n  collectionPrefix = '',\n  endpoint,\n  filename,\n  prefix,\n  useCompositePrefixes = false,\n}: GenerateURLArgs): string {\n  const { fileKey: rawFileKey } = getFileKey({\n    collectionPrefix,\n    docPrefix: prefix,\n    filename,\n    useCompositePrefixes,\n  })\n  const dir = path.posix.dirname(rawFileKey)\n  const encodedFilename = encodeURIComponent(path.posix.basename(rawFileKey))\n  const fileKey = dir === '.' ? encodedFilename : path.posix.join(dir, encodedFilename)\n\n  const stringifiedEndpoint = typeof endpoint === 'string' ? endpoint : endpoint?.toString()\n  return `${stringifiedEndpoint}/${bucket}/${fileKey}`\n}\n"],"names":["getFileKey","path","generateURL","bucket","collectionPrefix","endpoint","filename","prefix","useCompositePrefixes","fileKey","rawFileKey","docPrefix","dir","posix","dirname","encodedFilename","encodeURIComponent","basename","join","stringifiedEndpoint","toString"],"mappings":"AAEA,SAASA,UAAU,QAAQ,6CAA4C;AACvE,OAAOC,UAAU,OAAM;AAWvB,OAAO,SAASC,YAAY,EAC1BC,MAAM,EACNC,mBAAmB,EAAE,EACrBC,QAAQ,EACRC,QAAQ,EACRC,MAAM,EACNC,uBAAuB,KAAK,EACZ;IAChB,MAAM,EAAEC,SAASC,UAAU,EAAE,GAAGV,WAAW;QACzCI;QACAO,WAAWJ;QACXD;QACAE;IACF;IACA,MAAMI,MAAMX,KAAKY,KAAK,CAACC,OAAO,CAACJ;IAC/B,MAAMK,kBAAkBC,mBAAmBf,KAAKY,KAAK,CAACI,QAAQ,CAACP;IAC/D,MAAMD,UAAUG,QAAQ,MAAMG,kBAAkBd,KAAKY,KAAK,CAACK,IAAI,CAACN,KAAKG;IAErE,MAAMI,sBAAsB,OAAOd,aAAa,WAAWA,WAAWA,UAAUe;IAChF,OAAO,GAAGD,oBAAoB,CAAC,EAAEhB,OAAO,CAAC,EAAEM,SAAS;AACtD"}
+{"version":3,"sources":["../src/generateURL.ts"],"sourcesContent":["import type * as AWS from '@aws-sdk/client-s3'\n\nimport { buildStoragePathData } from '@payloadcms/plugin-cloud-storage/utilities'\nimport path from 'path'\n\ninterface GenerateURLArgs {\n  bucket: string\n  collectionPrefix?: string\n  endpoint?: AWS.S3ClientConfig['endpoint']\n  filename: string\n  prefix: string\n  useCompositePrefixes?: boolean\n}\n\nexport function generateURL({\n  bucket,\n  collectionPrefix = '',\n  endpoint,\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  const dir = path.posix.dirname(storageFilePath)\n  const encodedFilename = encodeURIComponent(path.posix.basename(storageFilePath))\n  const fileKey = dir === '.' ? encodedFilename : path.posix.join(dir, encodedFilename)\n\n  const stringifiedEndpoint = typeof endpoint === 'string' ? endpoint : endpoint?.toString()\n  return `${stringifiedEndpoint}/${bucket}/${fileKey}`\n}\n"],"names":["buildStoragePathData","path","generateURL","bucket","collectionPrefix","endpoint","filename","prefix","useCompositePrefixes","storageFilePath","docPrefix","dir","posix","dirname","encodedFilename","encodeURIComponent","basename","fileKey","join","stringifiedEndpoint","toString"],"mappings":"AAEA,SAASA,oBAAoB,QAAQ,6CAA4C;AACjF,OAAOC,UAAU,OAAM;AAWvB,OAAO,SAASC,YAAY,EAC1BC,MAAM,EACNC,mBAAmB,EAAE,EACrBC,QAAQ,EACRC,QAAQ,EACRC,MAAM,EACNC,uBAAuB,KAAK,EACZ;IAChB,MAAM,EAAEC,eAAe,EAAE,GAAGT,qBAAqB;QAC/CI;QACAM,WAAWH;QACXD;QACAE;IACF;IACA,MAAMG,MAAMV,KAAKW,KAAK,CAACC,OAAO,CAACJ;IAC/B,MAAMK,kBAAkBC,mBAAmBd,KAAKW,KAAK,CAACI,QAAQ,CAACP;IAC/D,MAAMQ,UAAUN,QAAQ,MAAMG,kBAAkBb,KAAKW,KAAK,CAACM,IAAI,CAACP,KAAKG;IAErE,MAAMK,sBAAsB,OAAOd,aAAa,WAAWA,WAAWA,UAAUe;IAChF,OAAO,GAAGD,oBAAoB,CAAC,EAAEhB,OAAO,CAAC,EAAEc,SAAS;AACtD"}

package/dist/getFile.d.ts

@@ -1,5 +1,5 @@
 import type * as AWS from '@aws-sdk/client-s3';
-import type { CollectionConfig, PayloadRequest } from 'payload';
+import type { CollectionConfig, PayloadRequest, TypeWithID } from 'payload';
 export type SignedDownloadsConfig = {
     /** @default 7200 */
     expiresIn?: number;
@@ -15,13 +15,13 @@ interface GetFileArgs {
     clientUploadContext?: unknown;
     collection: CollectionConfig;
     collectionPrefix?: string;
+    doc?: TypeWithID;
     filename: string;
     incomingHeaders?: Headers;
-    prefixQueryParam?: string;
     req: PayloadRequest;
     signedDownloads: SignedDownloadsConfig;
     useCompositePrefixes?: boolean;
 }
-export declare function getFile({ bucket, client, clientUploadContext, collection, collectionPrefix, filename, incomingHeaders, prefixQueryParam, req, signedDownloads, useCompositePrefixes, }: GetFileArgs): Promise<Response>;
+export declare function getFile({ bucket, client, clientUploadContext, collection, collectionPrefix, doc, filename, incomingHeaders, req, signedDownloads, 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,KAAK,GAAG,MAAM,oBAAoB,CAAA;AAC9C,OAAO,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAW/D,MAAM,MAAM,qBAAqB,GAC7B;IACE,oBAAoB;IACpB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,kBAAkB,CAAC,CAAC,IAAI,EAAE;QACxB,UAAU,EAAE,gBAAgB,CAAA;QAC5B,QAAQ,EAAE,MAAM,CAAA;QAChB,GAAG,EAAE,cAAc,CAAA;KACpB,GAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;CAC/B,GACD,OAAO,CAAA;AAEX,UAAU,WAAW;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,GAAG,CAAC,EAAE,CAAA;IACd,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,eAAe,EAAE,qBAAqB,CAAA;IACtC,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AA8BD,wBAAsB,OAAO,CAAC,EAC5B,MAAM,EACN,MAAM,EACN,mBAAmB,EACnB,UAAU,EACV,gBAAqB,EACrB,QAAQ,EACR,eAAe,EACf,gBAAgB,EAChB,GAAG,EACH,eAAe,EACf,oBAA4B,GAC7B,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CA8JjC"}
+{"version":3,"file":"getFile.d.ts","sourceRoot":"","sources":["../src/getFile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,oBAAoB,CAAA;AAC9C,OAAO,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAY3E,MAAM,MAAM,qBAAqB,GAC7B;IACE,oBAAoB;IACpB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,kBAAkB,CAAC,CAAC,IAAI,EAAE;QACxB,UAAU,EAAE,gBAAgB,CAAA;QAC5B,QAAQ,EAAE,MAAM,CAAA;QAChB,GAAG,EAAE,cAAc,CAAA;KACpB,GAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;CAC/B,GACD,OAAO,CAAA;AAEX,UAAU,WAAW;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,GAAG,CAAC,EAAE,CAAA;IACd,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,eAAe,EAAE,qBAAqB,CAAA;IACtC,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AA8BD,wBAAsB,OAAO,CAAC,EAC5B,MAAM,EACN,MAAM,EACN,mBAAmB,EACnB,UAAU,EACV,gBAAqB,EACrB,GAAG,EACH,QAAQ,EACR,eAAe,EACf,GAAG,EACH,eAAe,EACf,oBAA4B,GAC7B,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CAyJjC"}

package/dist/getFile.js

@@ -1,7 +1,7 @@
 import { GetObjectCommand } from '@aws-sdk/client-s3';
 import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
-import { getFilePrefix as getDocPrefix, getFileKey } from '@payloadcms/plugin-cloud-storage/utilities';
-import { getRangeRequestInfo } from 'payload/internal';
+import { getStorageFilePath } from '@payloadcms/plugin-cloud-storage/utilities';
+import { getRangeRequestInfo, isXmlMimeType, UPLOAD_CONTENT_SECURITY_POLICY } from 'payload/internal';
 const isNodeReadableStream = (body)=>{
     return typeof body === 'object' && body !== null && 'pipe' in body && typeof body.pipe === 'function' && 'destroy' in body && typeof body.destroy === 'function';
 };
@@ -14,7 +14,7 @@ const abortRequestAndDestroyStream = ({ abortController, object })=>{
         object.Body.destroy();
     }
 };
-export async function getFile({ bucket, client, clientUploadContext, collection, collectionPrefix = '', filename, incomingHeaders, prefixQueryParam, req, signedDownloads, useCompositePrefixes = false }) {
+export async function getFile({ bucket, client, clientUploadContext, collection, collectionPrefix = '', doc, filename, incomingHeaders, req, signedDownloads, useCompositePrefixes = false }) {
     let object = undefined;
     let streamed = false;
     const abortController = new AbortController();
@@ -27,17 +27,13 @@ export async function getFile({ bucket, client, clientUploadContext, collection,
         });
     }
     try {
-        const docPrefix = await getDocPrefix({
+        const filePath = await getStorageFilePath({
             clientUploadContext,
             collection,
-            filename,
-            prefixQueryParam,
-            req
-        });
-        const { fileKey: key } = getFileKey({
             collectionPrefix,
-            docPrefix,
+            doc,
             filename,
+            req,
             useCompositePrefixes
         });
         if (signedDownloads && !clientUploadContext) {
@@ -52,7 +48,7 @@ export async function getFile({ bucket, client, clientUploadContext, collection,
             if (useSignedURL) {
                 const command = new GetObjectCommand({
                     Bucket: bucket,
-                    Key: key
+                    Key: filePath
                 });
                 const signedUrl = await getSignedUrl(client, command, typeof signedDownloads === 'object' ? signedDownloads : {
                     expiresIn: 7200
@@ -63,7 +59,7 @@ export async function getFile({ bucket, client, clientUploadContext, collection,
         // Get file size first for range validation and to set Content-Length header before streaming
         const headObject = await client.headObject({
             Bucket: bucket,
-            Key: key
+            Key: filePath
         });
         const fileSize = headObject.ContentLength;
         if (!fileSize) {
@@ -93,9 +89,9 @@ export async function getFile({ bucket, client, clientUploadContext, collection,
         if (headObject.ETag) {
             headers.append('ETag', headObject.ETag);
         }
-        // Add Content-Security-Policy header for SVG files to prevent executable code
-        if (headObject.ContentType === 'image/svg+xml') {
-            headers.append('Content-Security-Policy', "script-src 'none'");
+        // Add Content-Security-Policy header for XML-family files
+        if (isXmlMimeType(headObject.ContentType)) {
+            headers.append('Content-Security-Policy', UPLOAD_CONTENT_SECURITY_POLICY);
         }
         const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match');
         const objectEtag = headObject.ETag;
@@ -112,7 +108,7 @@ export async function getFile({ bucket, client, clientUploadContext, collection,
         }
         object = await client.getObject({
             Bucket: bucket,
-            Key: key,
+            Key: filePath,
             Range: rangeForS3
         }, {
             abortSignal: abortController.signal
@@ -125,7 +121,7 @@ export async function getFile({ bucket, client, clientUploadContext, collection,
         }
         if (!isNodeReadableStream(object.Body)) {
             req.payload.logger.error({
-                key,
+                key: filePath,
                 msg: 'S3 object body is not a readable stream'
             });
             return new Response('Internal Server Error', {
@@ -136,7 +132,7 @@ export async function getFile({ bucket, client, clientUploadContext, collection,
         stream.on('error', (err)=>{
             req.payload.logger.error({
                 err,
-                key,
+                key: filePath,
                 msg: 'Error while streaming S3 object (aborting)'
             });
             abortRequestAndDestroyStream({

package/dist/getFile.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/getFile.ts"],"sourcesContent":["import type * as AWS from '@aws-sdk/client-s3'\nimport type { CollectionConfig, PayloadRequest } from 'payload'\nimport type { Readable } from 'stream'\n\nimport { GetObjectCommand } from '@aws-sdk/client-s3'\nimport { getSignedUrl } from '@aws-sdk/s3-request-presigner'\nimport {\n  getFilePrefix as getDocPrefix,\n  getFileKey,\n} from '@payloadcms/plugin-cloud-storage/utilities'\nimport { getRangeRequestInfo } from 'payload/internal'\n\nexport type SignedDownloadsConfig =\n  | {\n      /** @default 7200 */\n      expiresIn?: number\n      shouldUseSignedURL?(args: {\n        collection: CollectionConfig\n        filename: string\n        req: PayloadRequest\n      }): boolean | Promise<boolean>\n    }\n  | boolean\n\ninterface GetFileArgs {\n  bucket: string\n  client: AWS.S3\n  clientUploadContext?: unknown\n  collection: CollectionConfig\n  collectionPrefix?: string\n  filename: string\n  incomingHeaders?: Headers\n  prefixQueryParam?: string\n  req: PayloadRequest\n  signedDownloads: SignedDownloadsConfig\n  useCompositePrefixes?: boolean\n}\n\nconst isNodeReadableStream = (body: AWS.GetObjectOutput['Body']): body is Readable => {\n  return (\n    typeof body === 'object' &&\n    body !== null &&\n    'pipe' in body &&\n    typeof body.pipe === 'function' &&\n    'destroy' in body &&\n    typeof body.destroy === 'function'\n  )\n}\n\nconst abortRequestAndDestroyStream = ({\n  abortController,\n  object,\n}: {\n  abortController: AbortController\n  object?: AWS.GetObjectOutput\n}) => {\n  try {\n    abortController.abort()\n  } catch {\n    /* noop */\n  }\n  if (object?.Body && isNodeReadableStream(object.Body)) {\n    object.Body.destroy()\n  }\n}\n\nexport async function getFile({\n  bucket,\n  client,\n  clientUploadContext,\n  collection,\n  collectionPrefix = '',\n  filename,\n  incomingHeaders,\n  prefixQueryParam,\n  req,\n  signedDownloads,\n  useCompositePrefixes = false,\n}: GetFileArgs): Promise<Response> {\n  let object: AWS.GetObjectOutput | undefined = undefined\n  let streamed = false\n\n  const abortController = new AbortController()\n  if (req.signal) {\n    req.signal.addEventListener('abort', () => {\n      abortRequestAndDestroyStream({ abortController, object })\n    })\n  }\n\n  try {\n    const docPrefix = await getDocPrefix({\n      clientUploadContext,\n      collection,\n      filename,\n      prefixQueryParam,\n      req,\n    })\n\n    const { fileKey: key } = getFileKey({\n      collectionPrefix,\n      docPrefix,\n      filename,\n      useCompositePrefixes,\n    })\n\n    if (signedDownloads && !clientUploadContext) {\n      let useSignedURL = true\n      if (\n        typeof signedDownloads === 'object' &&\n        typeof signedDownloads.shouldUseSignedURL === 'function'\n      ) {\n        useSignedURL = await signedDownloads.shouldUseSignedURL({ collection, filename, req })\n      }\n\n      if (useSignedURL) {\n        const command = new GetObjectCommand({ Bucket: bucket, Key: key })\n        const signedUrl = await getSignedUrl(\n          client,\n          command,\n          typeof signedDownloads === 'object' ? signedDownloads : { expiresIn: 7200 },\n        )\n        return Response.redirect(signedUrl, 302)\n      }\n    }\n\n    // Get file size first for range validation and to set Content-Length header before streaming\n    const headObject = await client.headObject({\n      Bucket: bucket,\n      Key: key,\n    })\n    const fileSize = headObject.ContentLength\n\n    if (!fileSize) {\n      return new Response('Internal Server Error', { status: 500 })\n    }\n\n    // Handle range request\n    const rangeHeader = req.headers.get('range')\n    const rangeResult = getRangeRequestInfo({ fileSize, 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    const rangeForS3 =\n      rangeResult.type === 'partial'\n        ? `bytes=${rangeResult.rangeStart}-${rangeResult.rangeEnd}`\n        : undefined\n\n    let headers = new Headers(incomingHeaders)\n\n    // Add range-related headers from the result\n    for (const [headerKey, value] of Object.entries(rangeResult.headers)) {\n      headers.append(headerKey, value)\n    }\n\n    headers.append('Content-Type', String(headObject.ContentType))\n    if (headObject.ETag) {\n      headers.append('ETag', headObject.ETag)\n    }\n\n    // Add Content-Security-Policy header for SVG files to prevent executable code\n    if (headObject.ContentType === 'image/svg+xml') {\n      headers.append('Content-Security-Policy', \"script-src 'none'\")\n    }\n\n    const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match')\n    const objectEtag = headObject.ETag\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 === objectEtag) {\n      return new Response(null, {\n        headers,\n        status: 304,\n      })\n    }\n\n    object = await client.getObject(\n      {\n        Bucket: bucket,\n        Key: key,\n        Range: rangeForS3,\n      },\n      { abortSignal: abortController.signal },\n    )\n\n    if (!object.Body) {\n      return new Response(null, { status: 404, statusText: 'Not Found' })\n    }\n\n    if (!isNodeReadableStream(object.Body)) {\n      req.payload.logger.error({\n        key,\n        msg: 'S3 object body is not a readable stream',\n      })\n      return new Response('Internal Server Error', { status: 500 })\n    }\n\n    const stream = object.Body\n    stream.on('error', (err: Error) => {\n      req.payload.logger.error({\n        err,\n        key,\n        msg: 'Error while streaming S3 object (aborting)',\n      })\n      abortRequestAndDestroyStream({ abortController, object })\n    })\n\n    streamed = true\n    return new Response(stream, { headers, status: rangeResult.status })\n  } catch (err) {\n    if (\n      err &&\n      typeof err === 'object' &&\n      (('name' in err && (err.name === 'NoSuchKey' || err.name === 'NotFound')) ||\n        ('httpStatusCode' in err && err.httpStatusCode === 404))\n    ) {\n      return new Response(null, { status: 404, statusText: 'Not Found' })\n    }\n    req.payload.logger.error(err)\n    return new Response('Internal Server Error', { status: 500 })\n  } finally {\n    if (!streamed) {\n      abortRequestAndDestroyStream({ abortController, object })\n    }\n  }\n}\n"],"names":["GetObjectCommand","getSignedUrl","getFilePrefix","getDocPrefix","getFileKey","getRangeRequestInfo","isNodeReadableStream","body","pipe","destroy","abortRequestAndDestroyStream","abortController","object","abort","Body","getFile","bucket","client","clientUploadContext","collection","collectionPrefix","filename","incomingHeaders","prefixQueryParam","req","signedDownloads","useCompositePrefixes","undefined","streamed","AbortController","signal","addEventListener","docPrefix","fileKey","key","useSignedURL","shouldUseSignedURL","command","Bucket","Key","signedUrl","expiresIn","Response","redirect","headObject","fileSize","ContentLength","status","rangeHeader","headers","get","rangeResult","type","Headers","rangeForS3","rangeStart","rangeEnd","headerKey","value","Object","entries","append","String","ContentType","ETag","etagFromHeaders","objectEtag","upload","modifyResponseHeaders","getObject","Range","abortSignal","statusText","payload","logger","error","msg","stream","on","err","name","httpStatusCode"],"mappings":"AAIA,SAASA,gBAAgB,QAAQ,qBAAoB;AACrD,SAASC,YAAY,QAAQ,gCAA+B;AAC5D,SACEC,iBAAiBC,YAAY,EAC7BC,UAAU,QACL,6CAA4C;AACnD,SAASC,mBAAmB,QAAQ,mBAAkB;AA4BtD,MAAMC,uBAAuB,CAACC;IAC5B,OACE,OAAOA,SAAS,YAChBA,SAAS,QACT,UAAUA,QACV,OAAOA,KAAKC,IAAI,KAAK,cACrB,aAAaD,QACb,OAAOA,KAAKE,OAAO,KAAK;AAE5B;AAEA,MAAMC,+BAA+B,CAAC,EACpCC,eAAe,EACfC,MAAM,EAIP;IACC,IAAI;QACFD,gBAAgBE,KAAK;IACvB,EAAE,OAAM;IACN,QAAQ,GACV;IACA,IAAID,QAAQE,QAAQR,qBAAqBM,OAAOE,IAAI,GAAG;QACrDF,OAAOE,IAAI,CAACL,OAAO;IACrB;AACF;AAEA,OAAO,eAAeM,QAAQ,EAC5BC,MAAM,EACNC,MAAM,EACNC,mBAAmB,EACnBC,UAAU,EACVC,mBAAmB,EAAE,EACrBC,QAAQ,EACRC,eAAe,EACfC,gBAAgB,EAChBC,GAAG,EACHC,eAAe,EACfC,uBAAuB,KAAK,EAChB;IACZ,IAAId,SAA0Ce;IAC9C,IAAIC,WAAW;IAEf,MAAMjB,kBAAkB,IAAIkB;IAC5B,IAAIL,IAAIM,MAAM,EAAE;QACdN,IAAIM,MAAM,CAACC,gBAAgB,CAAC,SAAS;YACnCrB,6BAA6B;gBAAEC;gBAAiBC;YAAO;QACzD;IACF;IAEA,IAAI;QACF,MAAMoB,YAAY,MAAM7B,aAAa;YACnCe;YACAC;YACAE;YACAE;YACAC;QACF;QAEA,MAAM,EAAES,SAASC,GAAG,EAAE,GAAG9B,WAAW;YAClCgB;YACAY;YACAX;YACAK;QACF;QAEA,IAAID,mBAAmB,CAACP,qBAAqB;YAC3C,IAAIiB,eAAe;YACnB,IACE,OAAOV,oBAAoB,YAC3B,OAAOA,gBAAgBW,kBAAkB,KAAK,YAC9C;gBACAD,eAAe,MAAMV,gBAAgBW,kBAAkB,CAAC;oBAAEjB;oBAAYE;oBAAUG;gBAAI;YACtF;YAEA,IAAIW,cAAc;gBAChB,MAAME,UAAU,IAAIrC,iBAAiB;oBAAEsC,QAAQtB;oBAAQuB,KAAKL;gBAAI;gBAChE,MAAMM,YAAY,MAAMvC,aACtBgB,QACAoB,SACA,OAAOZ,oBAAoB,WAAWA,kBAAkB;oBAAEgB,WAAW;gBAAK;gBAE5E,OAAOC,SAASC,QAAQ,CAACH,WAAW;YACtC;QACF;QAEA,6FAA6F;QAC7F,MAAMI,aAAa,MAAM3B,OAAO2B,UAAU,CAAC;YACzCN,QAAQtB;YACRuB,KAAKL;QACP;QACA,MAAMW,WAAWD,WAAWE,aAAa;QAEzC,IAAI,CAACD,UAAU;YACb,OAAO,IAAIH,SAAS,yBAAyB;gBAAEK,QAAQ;YAAI;QAC7D;QAEA,uBAAuB;QACvB,MAAMC,cAAcxB,IAAIyB,OAAO,CAACC,GAAG,CAAC;QACpC,MAAMC,cAAc9C,oBAAoB;YAAEwC;YAAUG;QAAY;QAEhE,IAAIG,YAAYC,IAAI,KAAK,WAAW;YAClC,OAAO,IAAIV,SAAS,MAAM;gBACxBO,SAAS,IAAII,QAAQF,YAAYF,OAAO;gBACxCF,QAAQI,YAAYJ,MAAM;YAC5B;QACF;QAEA,MAAMO,aACJH,YAAYC,IAAI,KAAK,YACjB,CAAC,MAAM,EAAED,YAAYI,UAAU,CAAC,CAAC,EAAEJ,YAAYK,QAAQ,EAAE,GACzD7B;QAEN,IAAIsB,UAAU,IAAII,QAAQ/B;QAE1B,4CAA4C;QAC5C,KAAK,MAAM,CAACmC,WAAWC,MAAM,IAAIC,OAAOC,OAAO,CAACT,YAAYF,OAAO,EAAG;YACpEA,QAAQY,MAAM,CAACJ,WAAWC;QAC5B;QAEAT,QAAQY,MAAM,CAAC,gBAAgBC,OAAOlB,WAAWmB,WAAW;QAC5D,IAAInB,WAAWoB,IAAI,EAAE;YACnBf,QAAQY,MAAM,CAAC,QAAQjB,WAAWoB,IAAI;QACxC;QAEA,8EAA8E;QAC9E,IAAIpB,WAAWmB,WAAW,KAAK,iBAAiB;YAC9Cd,QAAQY,MAAM,CAAC,2BAA2B;QAC5C;QAEA,MAAMI,kBAAkBzC,IAAIyB,OAAO,CAACC,GAAG,CAAC,WAAW1B,IAAIyB,OAAO,CAACC,GAAG,CAAC;QACnE,MAAMgB,aAAatB,WAAWoB,IAAI;QAElC,IACE7C,WAAWgD,MAAM,IACjB,OAAOhD,WAAWgD,MAAM,KAAK,YAC7B,OAAOhD,WAAWgD,MAAM,CAACC,qBAAqB,KAAK,YACnD;YACAnB,UAAU9B,WAAWgD,MAAM,CAACC,qBAAqB,CAAC;gBAAEnB;YAAQ,MAAMA;QACpE;QAEA,IAAIgB,mBAAmBA,oBAAoBC,YAAY;YACrD,OAAO,IAAIxB,SAAS,MAAM;gBACxBO;gBACAF,QAAQ;YACV;QACF;QAEAnC,SAAS,MAAMK,OAAOoD,SAAS,CAC7B;YACE/B,QAAQtB;YACRuB,KAAKL;YACLoC,OAAOhB;QACT,GACA;YAAEiB,aAAa5D,gBAAgBmB,MAAM;QAAC;QAGxC,IAAI,CAAClB,OAAOE,IAAI,EAAE;YAChB,OAAO,IAAI4B,SAAS,MAAM;gBAAEK,QAAQ;gBAAKyB,YAAY;YAAY;QACnE;QAEA,IAAI,CAAClE,qBAAqBM,OAAOE,IAAI,GAAG;YACtCU,IAAIiD,OAAO,CAACC,MAAM,CAACC,KAAK,CAAC;gBACvBzC;gBACA0C,KAAK;YACP;YACA,OAAO,IAAIlC,SAAS,yBAAyB;gBAAEK,QAAQ;YAAI;QAC7D;QAEA,MAAM8B,SAASjE,OAAOE,IAAI;QAC1B+D,OAAOC,EAAE,CAAC,SAAS,CAACC;YAClBvD,IAAIiD,OAAO,CAACC,MAAM,CAACC,KAAK,CAAC;gBACvBI;gBACA7C;gBACA0C,KAAK;YACP;YACAlE,6BAA6B;gBAAEC;gBAAiBC;YAAO;QACzD;QAEAgB,WAAW;QACX,OAAO,IAAIc,SAASmC,QAAQ;YAAE5B;YAASF,QAAQI,YAAYJ,MAAM;QAAC;IACpE,EAAE,OAAOgC,KAAK;QACZ,IACEA,OACA,OAAOA,QAAQ,YACd,CAAA,AAAC,UAAUA,OAAQA,CAAAA,IAAIC,IAAI,KAAK,eAAeD,IAAIC,IAAI,KAAK,UAAS,KACnE,oBAAoBD,OAAOA,IAAIE,cAAc,KAAK,GAAG,GACxD;YACA,OAAO,IAAIvC,SAAS,MAAM;gBAAEK,QAAQ;gBAAKyB,YAAY;YAAY;QACnE;QACAhD,IAAIiD,OAAO,CAACC,MAAM,CAACC,KAAK,CAACI;QACzB,OAAO,IAAIrC,SAAS,yBAAyB;YAAEK,QAAQ;QAAI;IAC7D,SAAU;QACR,IAAI,CAACnB,UAAU;YACblB,6BAA6B;gBAAEC;gBAAiBC;YAAO;QACzD;IACF;AACF"}
+{"version":3,"sources":["../src/getFile.ts"],"sourcesContent":["import type * as AWS from '@aws-sdk/client-s3'\nimport type { CollectionConfig, PayloadRequest, TypeWithID } from 'payload'\nimport type { Readable } from 'stream'\n\nimport { GetObjectCommand } from '@aws-sdk/client-s3'\nimport { getSignedUrl } from '@aws-sdk/s3-request-presigner'\nimport { getStorageFilePath } from '@payloadcms/plugin-cloud-storage/utilities'\nimport {\n  getRangeRequestInfo,\n  isXmlMimeType,\n  UPLOAD_CONTENT_SECURITY_POLICY,\n} from 'payload/internal'\n\nexport type SignedDownloadsConfig =\n  | {\n      /** @default 7200 */\n      expiresIn?: number\n      shouldUseSignedURL?(args: {\n        collection: CollectionConfig\n        filename: string\n        req: PayloadRequest\n      }): boolean | Promise<boolean>\n    }\n  | boolean\n\ninterface GetFileArgs {\n  bucket: string\n  client: AWS.S3\n  clientUploadContext?: unknown\n  collection: CollectionConfig\n  collectionPrefix?: string\n  doc?: TypeWithID\n  filename: string\n  incomingHeaders?: Headers\n  req: PayloadRequest\n  signedDownloads: SignedDownloadsConfig\n  useCompositePrefixes?: boolean\n}\n\nconst isNodeReadableStream = (body: AWS.GetObjectOutput['Body']): body is Readable => {\n  return (\n    typeof body === 'object' &&\n    body !== null &&\n    'pipe' in body &&\n    typeof body.pipe === 'function' &&\n    'destroy' in body &&\n    typeof body.destroy === 'function'\n  )\n}\n\nconst abortRequestAndDestroyStream = ({\n  abortController,\n  object,\n}: {\n  abortController: AbortController\n  object?: AWS.GetObjectOutput\n}) => {\n  try {\n    abortController.abort()\n  } catch {\n    /* noop */\n  }\n  if (object?.Body && isNodeReadableStream(object.Body)) {\n    object.Body.destroy()\n  }\n}\n\nexport async function getFile({\n  bucket,\n  client,\n  clientUploadContext,\n  collection,\n  collectionPrefix = '',\n  doc,\n  filename,\n  incomingHeaders,\n  req,\n  signedDownloads,\n  useCompositePrefixes = false,\n}: GetFileArgs): Promise<Response> {\n  let object: AWS.GetObjectOutput | undefined = undefined\n  let streamed = false\n\n  const abortController = new AbortController()\n  if (req.signal) {\n    req.signal.addEventListener('abort', () => {\n      abortRequestAndDestroyStream({ abortController, object })\n    })\n  }\n\n  try {\n    const filePath = await getStorageFilePath({\n      clientUploadContext,\n      collection,\n      collectionPrefix,\n      doc,\n      filename,\n      req,\n      useCompositePrefixes,\n    })\n\n    if (signedDownloads && !clientUploadContext) {\n      let useSignedURL = true\n      if (\n        typeof signedDownloads === 'object' &&\n        typeof signedDownloads.shouldUseSignedURL === 'function'\n      ) {\n        useSignedURL = await signedDownloads.shouldUseSignedURL({ collection, filename, req })\n      }\n\n      if (useSignedURL) {\n        const command = new GetObjectCommand({ Bucket: bucket, Key: filePath })\n        const signedUrl = await getSignedUrl(\n          client,\n          command,\n          typeof signedDownloads === 'object' ? signedDownloads : { expiresIn: 7200 },\n        )\n        return Response.redirect(signedUrl, 302)\n      }\n    }\n\n    // Get file size first for range validation and to set Content-Length header before streaming\n    const headObject = await client.headObject({\n      Bucket: bucket,\n      Key: filePath,\n    })\n    const fileSize = headObject.ContentLength\n\n    if (!fileSize) {\n      return new Response('Internal Server Error', { status: 500 })\n    }\n\n    // Handle range request\n    const rangeHeader = req.headers.get('range')\n    const rangeResult = getRangeRequestInfo({ fileSize, 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    const rangeForS3 =\n      rangeResult.type === 'partial'\n        ? `bytes=${rangeResult.rangeStart}-${rangeResult.rangeEnd}`\n        : undefined\n\n    let headers = new Headers(incomingHeaders)\n\n    // Add range-related headers from the result\n    for (const [headerKey, value] of Object.entries(rangeResult.headers)) {\n      headers.append(headerKey, value)\n    }\n\n    headers.append('Content-Type', String(headObject.ContentType))\n    if (headObject.ETag) {\n      headers.append('ETag', headObject.ETag)\n    }\n\n    // Add Content-Security-Policy header for XML-family files\n    if (isXmlMimeType(headObject.ContentType)) {\n      headers.append('Content-Security-Policy', UPLOAD_CONTENT_SECURITY_POLICY)\n    }\n\n    const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match')\n    const objectEtag = headObject.ETag\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 === objectEtag) {\n      return new Response(null, {\n        headers,\n        status: 304,\n      })\n    }\n\n    object = await client.getObject(\n      {\n        Bucket: bucket,\n        Key: filePath,\n        Range: rangeForS3,\n      },\n      { abortSignal: abortController.signal },\n    )\n\n    if (!object.Body) {\n      return new Response(null, { status: 404, statusText: 'Not Found' })\n    }\n\n    if (!isNodeReadableStream(object.Body)) {\n      req.payload.logger.error({\n        key: filePath,\n        msg: 'S3 object body is not a readable stream',\n      })\n      return new Response('Internal Server Error', { status: 500 })\n    }\n\n    const stream = object.Body\n    stream.on('error', (err: Error) => {\n      req.payload.logger.error({\n        err,\n        key: filePath,\n        msg: 'Error while streaming S3 object (aborting)',\n      })\n      abortRequestAndDestroyStream({ abortController, object })\n    })\n\n    streamed = true\n    return new Response(stream, { headers, status: rangeResult.status })\n  } catch (err) {\n    if (\n      err &&\n      typeof err === 'object' &&\n      (('name' in err && (err.name === 'NoSuchKey' || err.name === 'NotFound')) ||\n        ('httpStatusCode' in err && err.httpStatusCode === 404))\n    ) {\n      return new Response(null, { status: 404, statusText: 'Not Found' })\n    }\n    req.payload.logger.error(err)\n    return new Response('Internal Server Error', { status: 500 })\n  } finally {\n    if (!streamed) {\n      abortRequestAndDestroyStream({ abortController, object })\n    }\n  }\n}\n"],"names":["GetObjectCommand","getSignedUrl","getStorageFilePath","getRangeRequestInfo","isXmlMimeType","UPLOAD_CONTENT_SECURITY_POLICY","isNodeReadableStream","body","pipe","destroy","abortRequestAndDestroyStream","abortController","object","abort","Body","getFile","bucket","client","clientUploadContext","collection","collectionPrefix","doc","filename","incomingHeaders","req","signedDownloads","useCompositePrefixes","undefined","streamed","AbortController","signal","addEventListener","filePath","useSignedURL","shouldUseSignedURL","command","Bucket","Key","signedUrl","expiresIn","Response","redirect","headObject","fileSize","ContentLength","status","rangeHeader","headers","get","rangeResult","type","Headers","rangeForS3","rangeStart","rangeEnd","headerKey","value","Object","entries","append","String","ContentType","ETag","etagFromHeaders","objectEtag","upload","modifyResponseHeaders","getObject","Range","abortSignal","statusText","payload","logger","error","key","msg","stream","on","err","name","httpStatusCode"],"mappings":"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"}

package/dist/index.d.ts

@@ -64,14 +64,15 @@ export type S3StorageOptions = {
     signedDownloads?: SignedDownloadsConfig;
     /**
      * 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;AAE/C,OAAO,KAAK,EAAU,MAAM,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAEnE,OAAO,KAAK,GAAG,MAAM,oBAAoB,CAAA;AAIzC,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AAKzD,MAAM,MAAM,gBAAgB,GAAG;IAC7B;;OAEG;IACH,GAAG,CAAC,EAAE,SAAS,GAAG,aAAa,CAAA;IAE/B;;;;;;;;OAQG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAE5B;;;;OAIG;IAEH,MAAM,EAAE,MAAM,CAAA;IAEd;;;;;OAKG;IACH,cAAc,CAAC,EAAE,MAAM,CAAA;IAEvB;;OAEG;IACH,aAAa,CAAC,EAAE,mBAAmB,CAAA;IACnC;;OAEG;IACH,WAAW,EAAE,OAAO,CAClB,MAAM,CACJ,oBAAoB,EAClB,CAAC;QACC,eAAe,CAAC,EAAE,qBAAqB,CAAA;KACxC,GAAG,IAAI,CAAC,iBAAiB,EAAE,SAAS,CAAC,CAAC,GACvC,IAAI,CACP,CACF,CAAA;IACD;;;;OAIG;IACH,MAAM,EAAE,GAAG,CAAC,cAAc,CAAA;IAE1B;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAE7B;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB;;OAEG;IACH,eAAe,CAAC,EAAE,qBAAqB,CAAA;IACvC;;;;;;;;;;;;OAYG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B,CAAA;AAED,KAAK,eAAe,GAAG,CAAC,aAAa,EAAE,gBAAgB,KAAK,MAAM,CAAA;AAelE,eAAO,MAAM,SAAS,EAAE,eAmIrB,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;AAE/C,OAAO,KAAK,EAAU,MAAM,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAEnE,OAAO,KAAK,GAAG,MAAM,oBAAoB,CAAA;AAIzC,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AAKzD,MAAM,MAAM,gBAAgB,GAAG;IAC7B;;OAEG;IACH,GAAG,CAAC,EAAE,SAAS,GAAG,aAAa,CAAA;IAE/B;;;;;;;;OAQG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAE5B;;;;OAIG;IAEH,MAAM,EAAE,MAAM,CAAA;IAEd;;;;;OAKG;IACH,cAAc,CAAC,EAAE,MAAM,CAAA;IAEvB;;OAEG;IACH,aAAa,CAAC,EAAE,mBAAmB,CAAA;IACnC;;OAEG;IACH,WAAW,EAAE,OAAO,CAClB,MAAM,CACJ,oBAAoB,EAClB,CAAC;QACC,eAAe,CAAC,EAAE,qBAAqB,CAAA;KACxC,GAAG,IAAI,CAAC,iBAAiB,EAAE,SAAS,CAAC,CAAC,GACvC,IAAI,CACP,CACF,CAAA;IACD;;;;OAIG;IACH,MAAM,EAAE,GAAG,CAAC,cAAc,CAAA;IAE1B;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAE7B;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB;;OAEG;IACH,eAAe,CAAC,EAAE,qBAAqB,CAAA;IACvC;;;;;;;;;;;;;OAaG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B,CAAA;AAED,KAAK,eAAe,GAAG,CAAC,aAAa,EAAE,gBAAgB,KAAK,MAAM,CAAA;AAelE,eAAO,MAAM,SAAS,EAAE,eAmIrB,CAAA"}

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 { NodeHttpHandlerOptions } from '@smithy/node-http-handler'\nimport type { Config, Plugin, UploadCollectionSlug } from 'payload'\n\nimport * as AWS from '@aws-sdk/client-s3'\nimport { cloudStoragePlugin } from '@payloadcms/plugin-cloud-storage'\nimport { initClientUploads } from '@payloadcms/plugin-cloud-storage/utilities'\n\nimport type { SignedDownloadsConfig } from './getFile.js'\n\nimport { createS3Adapter } from './adapter.js'\nimport { getGenerateSignedURLHandler } from './generateSignedURL.js'\n\nexport type S3StorageOptions = {\n  /**\n   * Access control list for uploaded files.\n   */\n  acl?: 'private' | 'public-read'\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   * Bucket name to upload files to.\n   *\n   * Must follow [AWS S3 bucket naming conventions](https://docs.aws.amazon.com/AmazonS3/latest/userguide/bucketnamingrules.html).\n   */\n\n  bucket: string\n\n  /**\n   * Optional cache key to identify the S3 storage client instance.\n   * If not provided, a default key will be used.\n   *\n   * @default `s3:containerName`\n   */\n  clientCacheKey?: string\n\n  /**\n   * Do uploads directly on the client to bypass limits on Vercel. You must allow CORS PUT method for the bucket to your website.\n   */\n  clientUploads?: ClientUploadsConfig\n  /**\n   * Collection options to apply the S3 adapter to.\n   */\n  collections: Partial<\n    Record<\n      UploadCollectionSlug,\n      | ({\n          signedDownloads?: SignedDownloadsConfig\n        } & Omit<CollectionOptions, 'adapter'>)\n      | true\n    >\n  >\n  /**\n   * AWS S3 client configuration. Highly dependent on your AWS setup.\n   *\n   * [AWS.S3ClientConfig Docs](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/clients/client-s3/interfaces/s3clientconfig.html)\n   */\n  config: AWS.S3ClientConfig\n\n  /**\n   * Whether or not to disable local storage\n   *\n   * @default true\n   */\n  disableLocalStorage?: boolean\n\n  /**\n   * Whether or not to enable the plugin\n   *\n   * Default: true\n   */\n  enabled?: boolean\n  /**\n   * Use pre-signed URLs for files downloading. Can be overriden per-collection.\n   */\n  signedDownloads?: SignedDownloadsConfig\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\ntype S3StoragePlugin = (storageS3Args: S3StorageOptions) => Plugin\n\nconst s3Clients = new Map<string, AWS.S3>()\n\nconst defaultRequestHandlerOpts: NodeHttpHandlerOptions = {\n  httpAgent: {\n    keepAlive: true,\n    maxSockets: 100,\n  },\n  httpsAgent: {\n    keepAlive: true,\n    maxSockets: 100,\n  },\n}\n\nexport const s3Storage: S3StoragePlugin =\n  (s3StorageOptions: S3StorageOptions) =>\n  (incomingConfig: Config): Config => {\n    const cacheKey = s3StorageOptions.clientCacheKey || `s3:${s3StorageOptions.bucket}`\n\n    const getStorageClient: () => AWS.S3 = () => {\n      if (s3Clients.has(cacheKey)) {\n        return s3Clients.get(cacheKey)!\n      }\n\n      s3Clients.set(\n        cacheKey,\n        new AWS.S3({\n          requestHandler: defaultRequestHandlerOpts,\n          ...(s3StorageOptions.config ?? {}),\n        }),\n      )\n\n      return s3Clients.get(cacheKey)!\n    }\n\n    const isPluginDisabled = s3StorageOptions.enabled === false\n\n    initClientUploads({\n      clientHandler: '@payloadcms/storage-s3/client#S3ClientUploadHandler',\n      collections: s3StorageOptions.collections,\n      config: incomingConfig,\n      enabled: !isPluginDisabled && Boolean(s3StorageOptions.clientUploads),\n      serverHandler: getGenerateSignedURLHandler({\n        access:\n          typeof s3StorageOptions.clientUploads === 'object'\n            ? s3StorageOptions.clientUploads.access\n            : undefined,\n        acl: s3StorageOptions.acl,\n        bucket: s3StorageOptions.bucket,\n        collections: s3StorageOptions.collections,\n        getStorageClient,\n        useCompositePrefixes: s3StorageOptions.useCompositePrefixes,\n      }),\n      serverHandlerPath: '/storage-s3-generate-signed-url',\n    })\n\n    if (isPluginDisabled) {\n      // If alwaysInsertFields is true, still call cloudStoragePlugin to insert fields\n      if (s3StorageOptions.alwaysInsertFields) {\n        // Build collections with adapter: null since plugin is disabled\n        const collectionsWithoutAdapter: CloudStoragePluginOptions['collections'] = Object.entries(\n          s3StorageOptions.collections,\n        ).reduce(\n          (acc, [slug, collOptions]) => ({\n            ...acc,\n            [slug]: {\n              ...(collOptions === true ? {} : collOptions),\n              adapter: null,\n            },\n          }),\n          {} as Record<string, CollectionOptions>,\n        )\n\n        return cloudStoragePlugin({\n          alwaysInsertFields: true,\n          collections: collectionsWithoutAdapter,\n          enabled: false,\n          useCompositePrefixes: s3StorageOptions.useCompositePrefixes,\n        })(incomingConfig)\n      }\n\n      return incomingConfig\n    }\n\n    // Determine signedDownloads for this collection\n    const resolveSignedDownloads = (slug: string): SignedDownloadsConfig => {\n      const collectionStorageConfig = s3StorageOptions.collections[slug]\n\n      let signedDownloads: null | SignedDownloadsConfig =\n        typeof collectionStorageConfig === 'object'\n          ? (collectionStorageConfig.signedDownloads ?? false)\n          : null\n\n      if (signedDownloads === null) {\n        signedDownloads = s3StorageOptions.signedDownloads ?? false\n      }\n\n      return signedDownloads\n    }\n\n    // Add adapter to each collection option object\n    const collectionsWithAdapter: CloudStoragePluginOptions['collections'] = Object.entries(\n      s3StorageOptions.collections,\n    ).reduce(\n      (acc, [slug, collOptions]) => ({\n        ...acc,\n        [slug]: {\n          ...(collOptions === true ? {} : collOptions),\n          adapter: createS3Adapter({\n            acl: s3StorageOptions.acl,\n            bucket: s3StorageOptions.bucket,\n            clientUploads: s3StorageOptions.clientUploads,\n            config: s3StorageOptions.config,\n            getStorageClient,\n            signedDownloads: resolveSignedDownloads(slug),\n            useCompositePrefixes: s3StorageOptions.useCompositePrefixes,\n          }),\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: s3StorageOptions.alwaysInsertFields,\n      collections: collectionsWithAdapter,\n      useCompositePrefixes: s3StorageOptions.useCompositePrefixes,\n    })(config)\n  }\n"],"names":["AWS","cloudStoragePlugin","initClientUploads","createS3Adapter","getGenerateSignedURLHandler","s3Clients","Map","defaultRequestHandlerOpts","httpAgent","keepAlive","maxSockets","httpsAgent","s3Storage","s3StorageOptions","incomingConfig","cacheKey","clientCacheKey","bucket","getStorageClient","has","get","set","S3","requestHandler","config","isPluginDisabled","enabled","clientHandler","collections","Boolean","clientUploads","serverHandler","access","undefined","acl","useCompositePrefixes","serverHandlerPath","alwaysInsertFields","collectionsWithoutAdapter","Object","entries","reduce","acc","slug","collOptions","adapter","resolveSignedDownloads","collectionStorageConfig","signedDownloads","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 { NodeHttpHandlerOptions } from '@smithy/node-http-handler'\nimport type { Config, Plugin, UploadCollectionSlug } from 'payload'\n\nimport * as AWS from '@aws-sdk/client-s3'\nimport { cloudStoragePlugin } from '@payloadcms/plugin-cloud-storage'\nimport { initClientUploads } from '@payloadcms/plugin-cloud-storage/utilities'\n\nimport type { SignedDownloadsConfig } from './getFile.js'\n\nimport { createS3Adapter } from './adapter.js'\nimport { getGenerateSignedURLHandler } from './generateSignedURL.js'\n\nexport type S3StorageOptions = {\n  /**\n   * Access control list for uploaded files.\n   */\n  acl?: 'private' | 'public-read'\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   * Bucket name to upload files to.\n   *\n   * Must follow [AWS S3 bucket naming conventions](https://docs.aws.amazon.com/AmazonS3/latest/userguide/bucketnamingrules.html).\n   */\n\n  bucket: string\n\n  /**\n   * Optional cache key to identify the S3 storage client instance.\n   * If not provided, a default key will be used.\n   *\n   * @default `s3:containerName`\n   */\n  clientCacheKey?: string\n\n  /**\n   * Do uploads directly on the client to bypass limits on Vercel. You must allow CORS PUT method for the bucket to your website.\n   */\n  clientUploads?: ClientUploadsConfig\n  /**\n   * Collection options to apply the S3 adapter to.\n   */\n  collections: Partial<\n    Record<\n      UploadCollectionSlug,\n      | ({\n          signedDownloads?: SignedDownloadsConfig\n        } & Omit<CollectionOptions, 'adapter'>)\n      | true\n    >\n  >\n  /**\n   * AWS S3 client configuration. Highly dependent on your AWS setup.\n   *\n   * [AWS.S3ClientConfig Docs](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/clients/client-s3/interfaces/s3clientconfig.html)\n   */\n  config: AWS.S3ClientConfig\n\n  /**\n   * Whether or not to disable local storage\n   *\n   * @default true\n   */\n  disableLocalStorage?: boolean\n\n  /**\n   * Whether or not to enable the plugin\n   *\n   * Default: true\n   */\n  enabled?: boolean\n  /**\n   * Use pre-signed URLs for files downloading. Can be overriden per-collection.\n   */\n  signedDownloads?: SignedDownloadsConfig\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\ntype S3StoragePlugin = (storageS3Args: S3StorageOptions) => Plugin\n\nconst s3Clients = new Map<string, AWS.S3>()\n\nconst defaultRequestHandlerOpts: NodeHttpHandlerOptions = {\n  httpAgent: {\n    keepAlive: true,\n    maxSockets: 100,\n  },\n  httpsAgent: {\n    keepAlive: true,\n    maxSockets: 100,\n  },\n}\n\nexport const s3Storage: S3StoragePlugin =\n  (s3StorageOptions: S3StorageOptions) =>\n  (incomingConfig: Config): Config => {\n    const cacheKey = s3StorageOptions.clientCacheKey || `s3:${s3StorageOptions.bucket}`\n\n    const getStorageClient: () => AWS.S3 = () => {\n      if (s3Clients.has(cacheKey)) {\n        return s3Clients.get(cacheKey)!\n      }\n\n      s3Clients.set(\n        cacheKey,\n        new AWS.S3({\n          requestHandler: defaultRequestHandlerOpts,\n          ...(s3StorageOptions.config ?? {}),\n        }),\n      )\n\n      return s3Clients.get(cacheKey)!\n    }\n\n    const isPluginDisabled = s3StorageOptions.enabled === false\n\n    initClientUploads({\n      clientHandler: '@payloadcms/storage-s3/client#S3ClientUploadHandler',\n      collections: s3StorageOptions.collections,\n      config: incomingConfig,\n      enabled: !isPluginDisabled && Boolean(s3StorageOptions.clientUploads),\n      serverHandler: getGenerateSignedURLHandler({\n        access:\n          typeof s3StorageOptions.clientUploads === 'object'\n            ? s3StorageOptions.clientUploads.access\n            : undefined,\n        acl: s3StorageOptions.acl,\n        bucket: s3StorageOptions.bucket,\n        collections: s3StorageOptions.collections,\n        getStorageClient,\n        useCompositePrefixes: s3StorageOptions.useCompositePrefixes,\n      }),\n      serverHandlerPath: '/storage-s3-generate-signed-url',\n    })\n\n    if (isPluginDisabled) {\n      // If alwaysInsertFields is true, still call cloudStoragePlugin to insert fields\n      if (s3StorageOptions.alwaysInsertFields) {\n        // Build collections with adapter: null since plugin is disabled\n        const collectionsWithoutAdapter: CloudStoragePluginOptions['collections'] = Object.entries(\n          s3StorageOptions.collections,\n        ).reduce(\n          (acc, [slug, collOptions]) => ({\n            ...acc,\n            [slug]: {\n              ...(collOptions === true ? {} : collOptions),\n              adapter: null,\n            },\n          }),\n          {} as Record<string, CollectionOptions>,\n        )\n\n        return cloudStoragePlugin({\n          alwaysInsertFields: true,\n          collections: collectionsWithoutAdapter,\n          enabled: false,\n          useCompositePrefixes: s3StorageOptions.useCompositePrefixes,\n        })(incomingConfig)\n      }\n\n      return incomingConfig\n    }\n\n    // Determine signedDownloads for this collection\n    const resolveSignedDownloads = (slug: string): SignedDownloadsConfig => {\n      const collectionStorageConfig = s3StorageOptions.collections[slug]\n\n      let signedDownloads: null | SignedDownloadsConfig =\n        typeof collectionStorageConfig === 'object'\n          ? (collectionStorageConfig.signedDownloads ?? false)\n          : null\n\n      if (signedDownloads === null) {\n        signedDownloads = s3StorageOptions.signedDownloads ?? false\n      }\n\n      return signedDownloads\n    }\n\n    // Add adapter to each collection option object\n    const collectionsWithAdapter: CloudStoragePluginOptions['collections'] = Object.entries(\n      s3StorageOptions.collections,\n    ).reduce(\n      (acc, [slug, collOptions]) => ({\n        ...acc,\n        [slug]: {\n          ...(collOptions === true ? {} : collOptions),\n          adapter: createS3Adapter({\n            acl: s3StorageOptions.acl,\n            bucket: s3StorageOptions.bucket,\n            clientUploads: s3StorageOptions.clientUploads,\n            config: s3StorageOptions.config,\n            getStorageClient,\n            signedDownloads: resolveSignedDownloads(slug),\n            useCompositePrefixes: s3StorageOptions.useCompositePrefixes,\n          }),\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: s3StorageOptions.alwaysInsertFields,\n      collections: collectionsWithAdapter,\n      useCompositePrefixes: s3StorageOptions.useCompositePrefixes,\n    })(config)\n  }\n"],"names":["AWS","cloudStoragePlugin","initClientUploads","createS3Adapter","getGenerateSignedURLHandler","s3Clients","Map","defaultRequestHandlerOpts","httpAgent","keepAlive","maxSockets","httpsAgent","s3Storage","s3StorageOptions","incomingConfig","cacheKey","clientCacheKey","bucket","getStorageClient","has","get","set","S3","requestHandler","config","isPluginDisabled","enabled","clientHandler","collections","Boolean","clientUploads","serverHandler","access","undefined","acl","useCompositePrefixes","serverHandlerPath","alwaysInsertFields","collectionsWithoutAdapter","Object","entries","reduce","acc","slug","collOptions","adapter","resolveSignedDownloads","collectionStorageConfig","signedDownloads","collectionsWithAdapter","map","collection","upload","disableLocalStorage"],"mappings":"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"}

package/dist/staticHandler.spec.js

@@ -0,0 +1,72 @@
+import { Readable } from 'node:stream';
+import { describe, expect, it, vi } from 'vitest';
+import { createS3Adapter } from './adapter.js';
+describe('static handler document locations', ()=>{
+    it('should read the checked document without another lookup', async ()=>{
+        const headObject = vi.fn(async ()=>({
+                ContentLength: 4,
+                ContentType: 'image/png'
+            }));
+        const getObject = vi.fn(async ()=>({
+                Body: Readable.from([
+                    'file'
+                ])
+            }));
+        const adapter = createS3Adapter({
+            bucket: 'bucket',
+            config: {},
+            getStorageClient: ()=>({
+                    getObject,
+                    headObject
+                }),
+            signedDownloads: false
+        });
+        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(headObject).toHaveBeenCalledWith({
+            Bucket: 'bucket',
+            Key: 'legacy/original.png'
+        });
+        expect(getObject).toHaveBeenCalledWith(expect.objectContaining({
+            Bucket: 'bucket',
+            Key: 'legacy/original.png'
+        }), 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 { Readable } from 'node:stream'\nimport { describe, expect, it, vi } from 'vitest'\n\nimport { createS3Adapter } from './adapter.js'\n\ndescribe('static handler document locations', () => {\n  it('should read the checked document without another lookup', async () => {\n    const headObject = vi.fn(async () => ({ ContentLength: 4, ContentType: 'image/png' }))\n    const getObject = vi.fn(async () => ({ Body: Readable.from(['file']) }))\n    const adapter = createS3Adapter({\n      bucket: 'bucket',\n      config: {},\n      getStorageClient: () => ({ getObject, headObject }) as never,\n      signedDownloads: false,\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(headObject).toHaveBeenCalledWith({ Bucket: 'bucket', Key: 'legacy/original.png' })\n    expect(getObject).toHaveBeenCalledWith(\n      expect.objectContaining({ Bucket: 'bucket', Key: 'legacy/original.png' }),\n      expect.any(Object),\n    )\n    expect(find).not.toHaveBeenCalled()\n  })\n})\n"],"names":["Readable","describe","expect","it","vi","createS3Adapter","headObject","fn","ContentLength","ContentType","getObject","Body","from","adapter","bucket","config","getStorageClient","signedDownloads","find","docs","prefix","generatedAdapter","collection","fields","slug","upload","doc","id","response","staticHandler","headers","Headers","payload","logger","error","params","filename","status","toBe","text","toHaveBeenCalledWith","Bucket","Key","objectContaining","any","Object","not","toHaveBeenCalled"],"mappings":"AAAA,SAASA,QAAQ,QAAQ,cAAa;AACtC,SAASC,QAAQ,EAAEC,MAAM,EAAEC,EAAE,EAAEC,EAAE,QAAQ,SAAQ;AAEjD,SAASC,eAAe,QAAQ,eAAc;AAE9CJ,SAAS,qCAAqC;IAC5CE,GAAG,2DAA2D;QAC5D,MAAMG,aAAaF,GAAGG,EAAE,CAAC,UAAa,CAAA;gBAAEC,eAAe;gBAAGC,aAAa;YAAY,CAAA;QACnF,MAAMC,YAAYN,GAAGG,EAAE,CAAC,UAAa,CAAA;gBAAEI,MAAMX,SAASY,IAAI,CAAC;oBAAC;iBAAO;YAAE,CAAA;QACrE,MAAMC,UAAUR,gBAAgB;YAC9BS,QAAQ;YACRC,QAAQ,CAAC;YACTC,kBAAkB,IAAO,CAAA;oBAAEN;oBAAWJ;gBAAW,CAAA;YACjDW,iBAAiB;QACnB;QACA,MAAMC,OAAOd,GAAGG,EAAE,CAAC,UAAa,CAAA;gBAAEY,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,OAAO9B,GAAGG,EAAE;gBAAG;YAAE;QAC9C,GACA;YACEmB;YACAS,QAAQ;gBAAEb,YAAY;gBAASc,UAAU;YAAe;QAC1D;QAGFlC,OAAO0B,SAASS,MAAM,EAAEC,IAAI,CAAC;QAC7BpC,OAAO,MAAM0B,SAASW,IAAI,IAAID,IAAI,CAAC;QACnCpC,OAAOI,YAAYkC,oBAAoB,CAAC;YAAEC,QAAQ;YAAUC,KAAK;QAAsB;QACvFxC,OAAOQ,WAAW8B,oBAAoB,CACpCtC,OAAOyC,gBAAgB,CAAC;YAAEF,QAAQ;YAAUC,KAAK;QAAsB,IACvExC,OAAO0C,GAAG,CAACC;QAEb3C,OAAOgB,MAAM4B,GAAG,CAACC,gBAAgB;IACnC;AACF"}

package/dist/uploadFile.d.ts

@@ -4,13 +4,10 @@ interface UploadArgs {
     bucket: string;
     buffer: Buffer;
     client: AWS.S3;
-    collectionPrefix?: string;
-    docPrefix?: string;
-    filename: string;
     mimeType: string;
+    storageFilePath: string;
     tempFilePath?: string;
-    useCompositePrefixes?: boolean;
 }
-export declare function uploadFile({ acl, bucket, buffer, client, collectionPrefix, docPrefix, filename, mimeType, tempFilePath, useCompositePrefixes, }: UploadArgs): Promise<void>;
+export declare function uploadFile({ acl, bucket, buffer, client, mimeType, storageFilePath, tempFilePath, }: UploadArgs): Promise<void>;
 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":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,oBAAoB,CAAA;AAM9C,UAAU,UAAU;IAClB,GAAG,CAAC,EAAE,SAAS,GAAG,aAAa,CAAA;IAC/B,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,GAAG,CAAC,EAAE,CAAA;IACd,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAID,wBAAsB,UAAU,CAAC,EAC/B,GAAG,EACH,MAAM,EACN,MAAM,EACN,MAAM,EACN,gBAAqB,EACrB,SAAS,EACT,QAAQ,EACR,QAAQ,EACR,YAAY,EACZ,oBAA4B,GAC7B,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAoC5B"}
+{"version":3,"file":"uploadFile.d.ts","sourceRoot":"","sources":["../src/uploadFile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,oBAAoB,CAAA;AAK9C,UAAU,UAAU;IAClB,GAAG,CAAC,EAAE,SAAS,GAAG,aAAa,CAAA;IAC/B,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,GAAG,CAAC,EAAE,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;IAChB,eAAe,EAAE,MAAM,CAAA;IACvB,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB;AAID,wBAAsB,UAAU,CAAC,EAC/B,GAAG,EACH,MAAM,EACN,MAAM,EACN,MAAM,EACN,QAAQ,EACR,eAAe,EACf,YAAY,GACb,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CA6B5B"}

package/dist/uploadFile.js

@@ -1,15 +1,8 @@
 import { Upload } from '@aws-sdk/lib-storage';
-import { getFileKey } from '@payloadcms/plugin-cloud-storage/utilities';
 import fs from 'fs';
 const multipartThreshold = 1024 * 1024 * 50 // 50MB
 ;
-export async function uploadFile({ acl, bucket, buffer, client, collectionPrefix = '', docPrefix, filename, mimeType, tempFilePath, useCompositePrefixes = false }) {
-    const { fileKey } = getFileKey({
-        collectionPrefix,
-        docPrefix,
-        filename,
-        useCompositePrefixes
-    });
+export async function uploadFile({ acl, bucket, buffer, client, mimeType, storageFilePath, tempFilePath }) {
     const fileBufferOrStream = tempFilePath ? fs.createReadStream(tempFilePath) : buffer;
     if (buffer.length > 0 && buffer.length < multipartThreshold) {
         await client.putObject({
@@ -17,7 +10,7 @@ export async function uploadFile({ acl, bucket, buffer, client, collectionPrefix
             Body: fileBufferOrStream,
             Bucket: bucket,
             ContentType: mimeType,
-            Key: fileKey
+            Key: storageFilePath
         });
         return;
     }
@@ -28,7 +21,7 @@ export async function uploadFile({ acl, bucket, buffer, client, collectionPrefix
             Body: fileBufferOrStream,
             Bucket: bucket,
             ContentType: mimeType,
-            Key: fileKey
+            Key: storageFilePath
         },
         partSize: multipartThreshold,
         queueSize: 4

package/dist/uploadFile.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/uploadFile.ts"],"sourcesContent":["import type * as AWS from '@aws-sdk/client-s3'\n\nimport { Upload } from '@aws-sdk/lib-storage'\nimport { getFileKey } from '@payloadcms/plugin-cloud-storage/utilities'\nimport fs from 'fs'\n\ninterface UploadArgs {\n  acl?: 'private' | 'public-read'\n  bucket: string\n  buffer: Buffer\n  client: AWS.S3\n  collectionPrefix?: string\n  docPrefix?: string\n  filename: string\n  mimeType: string\n  tempFilePath?: string\n  useCompositePrefixes?: boolean\n}\n\nconst multipartThreshold = 1024 * 1024 * 50 // 50MB\n\nexport async function uploadFile({\n  acl,\n  bucket,\n  buffer,\n  client,\n  collectionPrefix = '',\n  docPrefix,\n  filename,\n  mimeType,\n  tempFilePath,\n  useCompositePrefixes = false,\n}: UploadArgs): Promise<void> {\n  const { fileKey } = getFileKey({\n    collectionPrefix,\n    docPrefix,\n    filename,\n    useCompositePrefixes,\n  })\n\n  const fileBufferOrStream = tempFilePath ? fs.createReadStream(tempFilePath) : buffer\n\n  if (buffer.length > 0 && buffer.length < multipartThreshold) {\n    await client.putObject({\n      ACL: acl,\n      Body: fileBufferOrStream,\n      Bucket: bucket,\n      ContentType: mimeType,\n      Key: fileKey,\n    })\n\n    return\n  }\n\n  const parallelUploadS3 = new Upload({\n    client,\n    params: {\n      ACL: acl,\n      Body: fileBufferOrStream,\n      Bucket: bucket,\n      ContentType: mimeType,\n      Key: fileKey,\n    },\n    partSize: multipartThreshold,\n    queueSize: 4,\n  })\n\n  await parallelUploadS3.done()\n}\n"],"names":["Upload","getFileKey","fs","multipartThreshold","uploadFile","acl","bucket","buffer","client","collectionPrefix","docPrefix","filename","mimeType","tempFilePath","useCompositePrefixes","fileKey","fileBufferOrStream","createReadStream","length","putObject","ACL","Body","Bucket","ContentType","Key","parallelUploadS3","params","partSize","queueSize","done"],"mappings":"AAEA,SAASA,MAAM,QAAQ,uBAAsB;AAC7C,SAASC,UAAU,QAAQ,6CAA4C;AACvE,OAAOC,QAAQ,KAAI;AAenB,MAAMC,qBAAqB,OAAO,OAAO,GAAG,OAAO;;AAEnD,OAAO,eAAeC,WAAW,EAC/BC,GAAG,EACHC,MAAM,EACNC,MAAM,EACNC,MAAM,EACNC,mBAAmB,EAAE,EACrBC,SAAS,EACTC,QAAQ,EACRC,QAAQ,EACRC,YAAY,EACZC,uBAAuB,KAAK,EACjB;IACX,MAAM,EAAEC,OAAO,EAAE,GAAGd,WAAW;QAC7BQ;QACAC;QACAC;QACAG;IACF;IAEA,MAAME,qBAAqBH,eAAeX,GAAGe,gBAAgB,CAACJ,gBAAgBN;IAE9E,IAAIA,OAAOW,MAAM,GAAG,KAAKX,OAAOW,MAAM,GAAGf,oBAAoB;QAC3D,MAAMK,OAAOW,SAAS,CAAC;YACrBC,KAAKf;YACLgB,MAAML;YACNM,QAAQhB;YACRiB,aAAaX;YACbY,KAAKT;QACP;QAEA;IACF;IAEA,MAAMU,mBAAmB,IAAIzB,OAAO;QAClCQ;QACAkB,QAAQ;YACNN,KAAKf;YACLgB,MAAML;YACNM,QAAQhB;YACRiB,aAAaX;YACbY,KAAKT;QACP;QACAY,UAAUxB;QACVyB,WAAW;IACb;IAEA,MAAMH,iBAAiBI,IAAI;AAC7B"}
+{"version":3,"sources":["../src/uploadFile.ts"],"sourcesContent":["import type * as AWS from '@aws-sdk/client-s3'\n\nimport { Upload } from '@aws-sdk/lib-storage'\nimport fs from 'fs'\n\ninterface UploadArgs {\n  acl?: 'private' | 'public-read'\n  bucket: string\n  buffer: Buffer\n  client: AWS.S3\n  mimeType: string\n  storageFilePath: string\n  tempFilePath?: string\n}\n\nconst multipartThreshold = 1024 * 1024 * 50 // 50MB\n\nexport async function uploadFile({\n  acl,\n  bucket,\n  buffer,\n  client,\n  mimeType,\n  storageFilePath,\n  tempFilePath,\n}: UploadArgs): Promise<void> {\n  const fileBufferOrStream = tempFilePath ? fs.createReadStream(tempFilePath) : buffer\n\n  if (buffer.length > 0 && buffer.length < multipartThreshold) {\n    await client.putObject({\n      ACL: acl,\n      Body: fileBufferOrStream,\n      Bucket: bucket,\n      ContentType: mimeType,\n      Key: storageFilePath,\n    })\n\n    return\n  }\n\n  const parallelUploadS3 = new Upload({\n    client,\n    params: {\n      ACL: acl,\n      Body: fileBufferOrStream,\n      Bucket: bucket,\n      ContentType: mimeType,\n      Key: storageFilePath,\n    },\n    partSize: multipartThreshold,\n    queueSize: 4,\n  })\n\n  await parallelUploadS3.done()\n}\n"],"names":["Upload","fs","multipartThreshold","uploadFile","acl","bucket","buffer","client","mimeType","storageFilePath","tempFilePath","fileBufferOrStream","createReadStream","length","putObject","ACL","Body","Bucket","ContentType","Key","parallelUploadS3","params","partSize","queueSize","done"],"mappings":"AAEA,SAASA,MAAM,QAAQ,uBAAsB;AAC7C,OAAOC,QAAQ,KAAI;AAYnB,MAAMC,qBAAqB,OAAO,OAAO,GAAG,OAAO;;AAEnD,OAAO,eAAeC,WAAW,EAC/BC,GAAG,EACHC,MAAM,EACNC,MAAM,EACNC,MAAM,EACNC,QAAQ,EACRC,eAAe,EACfC,YAAY,EACD;IACX,MAAMC,qBAAqBD,eAAeT,GAAGW,gBAAgB,CAACF,gBAAgBJ;IAE9E,IAAIA,OAAOO,MAAM,GAAG,KAAKP,OAAOO,MAAM,GAAGX,oBAAoB;QAC3D,MAAMK,OAAOO,SAAS,CAAC;YACrBC,KAAKX;YACLY,MAAML;YACNM,QAAQZ;YACRa,aAAaV;YACbW,KAAKV;QACP;QAEA;IACF;IAEA,MAAMW,mBAAmB,IAAIpB,OAAO;QAClCO;QACAc,QAAQ;YACNN,KAAKX;YACLY,MAAML;YACNM,QAAQZ;YACRa,aAAaV;YACbW,KAAKV;QACP;QACAa,UAAUpB;QACVqB,WAAW;IACb;IAEA,MAAMH,iBAAiBI,IAAI;AAC7B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/storage-s3",
-  "version": "3.89.0",
+  "version": "3.90.1",
   "description": "Payload storage adapter for Amazon S3",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -40,14 +40,14 @@
     "@aws-sdk/client-s3": "^3.614.0",
     "@aws-sdk/lib-storage": "^3.614.0",
     "@aws-sdk/s3-request-presigner": "^3.614.0",
-    "@payloadcms/plugin-cloud-storage": "3.89.0"
+    "@payloadcms/plugin-cloud-storage": "3.90.1"
   },
   "devDependencies": {
     "@smithy/node-http-handler": "4.0.3",
-    "payload": "3.89.0"
+    "payload": "3.90.1"
   },
   "peerDependencies": {
-    "payload": "3.89.0"
+    "payload": "3.90.1"
   },
   "engines": {
     "node": "^18.20.2 || >=20.9.0"