@payloadcms/storage-azure 4.0.0-internal.cea8867 → 4.0.0-internal.d21c039

package/README.md

@@ -14,7 +14,7 @@ pnpm add @payloadcms/storage-azure
 
 - Configure the `collections` object to specify which collections should use the Azure Blob Storage adapter. The slug _must_ match one of your existing collection slugs.
 - When enabled, this package will automatically set `disableLocalStorage` to `true` for each collection.
-- When deploying to Vercel, server uploads are limited with 4.5MB. Set `clientUploads` to `true` to do uploads directly on the client.
+- When deploying to Vercel, server uploads are limited to 4.5MB. Set `clientUploads` to `true` to use upload instructions and send files directly to Azure.
 
 ### Client uploads and CORS
 
@@ -58,12 +58,15 @@ export default buildConfig({
 
 ### Configuration Options
 
-| Option                 | Description                                                              | Default |
-| ---------------------- | ------------------------------------------------------------------------ | ------- |
-| `enabled`              | Whether or not to enable the plugin                                      | `true`  |
-| `collections`          | Collections to apply the Azure Blob adapter to                           |         |
-| `allowContainerCreate` | Whether or not to allow the container to be created if it does not exist | `false` |
-| `baseURL`              | Base URL for the Azure Blob storage account                              |         |
-| `connectionString`     | Azure Blob storage connection string                                     |         |
-| `containerName`        | Azure Blob storage container name                                        |         |
-| `clientUploads`        | Do uploads directly on the client to bypass limits on Vercel.            |         |
+| Option                 | Description                                                                                                                                                                                                                                                               | Default     |
+| ---------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------- |
+| `enabled`              | Whether or not to enable the plugin                                                                                                                                                                                                                                       | `true`      |
+| `collections`          | Collections to apply the Azure Blob adapter to                                                                                                                                                                                                                            |             |
+| `allowContainerCreate` | Whether or not to allow the container to be created if it does not exist                                                                                                                                                                                                  | `false`     |
+| `containerAccess`      | Public access level for a container the plugin creates. `'private'` (default) serves blobs only through Payload's access-controlled route; `'blob'` / `'container'` expose them to anonymous clients directly from Azure. Has no effect on containers that already exist. | `'private'` |
+| `baseURL`              | Base URL for the Azure Blob storage account                                                                                                                                                                                                                               |             |
+| `connectionString`     | Azure Blob storage connection string                                                                                                                                                                                                                                      |             |
+| `containerName`        | Azure Blob storage container name                                                                                                                                                                                                                                         |             |
+| `clientUploads`        | Upload directly to Azure instead of through Payload.                                                                                                                                                                                                                      |             |
+
+> **Breaking change (private by default):** When `allowContainerCreate: true`, the plugin now creates containers with **private** access. Previously it created them with public `blob` access. If you relied on files being served directly from the anonymous Azure blob URL (typically alongside `disablePayloadAccessControl: true`), set `containerAccess: 'blob'` to restore the old behaviour. This only affects **newly created** containers — existing containers keep their current access level, so you must flip their ACL manually if needed.

package/dist/adapter.d.ts

@@ -5,7 +5,7 @@ interface CreateAzureAdapterArgs {
     baseURL: string;
     clientUploads?: ClientUploadsConfig;
     containerName: string;
-    createContainerIfNotExists: () => void;
+    createContainerIfNotExists: () => Promise<void> | void;
     getStorageClient: () => ContainerClient;
     useCompositePrefixes?: boolean;
 }

package/dist/adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAC1D,OAAO,KAAK,EACV,OAAO,EACP,mBAAmB,EAEpB,MAAM,wCAAwC,CAAA;AAO/C,UAAU,sBAAsB;IAC9B,oBAAoB,EAAE,OAAO,CAAA;IAC7B,OAAO,EAAE,MAAM,CAAA;IACf,aAAa,CAAC,EAAE,mBAAmB,CAAA;IACnC,aAAa,EAAE,MAAM,CAAA;IACrB,0BAA0B,EAAE,MAAM,IAAI,CAAA;IACtC,gBAAgB,EAAE,MAAM,eAAe,CAAA;IACvC,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,wBAAgB,kBAAkB,CAAC,EACjC,oBAAoB,EACpB,OAAO,EACP,aAAa,EACb,aAAa,EACb,0BAA0B,EAC1B,gBAAgB,EAChB,oBAA4B,GAC7B,EAAE,sBAAsB,GAAG,OAAO,CAyDlC"}
+{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAC1D,OAAO,KAAK,EACV,OAAO,EACP,mBAAmB,EAEpB,MAAM,wCAAwC,CAAA;AAS/C,UAAU,sBAAsB;IAC9B,oBAAoB,EAAE,OAAO,CAAA;IAC7B,OAAO,EAAE,MAAM,CAAA;IACf,aAAa,CAAC,EAAE,mBAAmB,CAAA;IACnC,aAAa,EAAE,MAAM,CAAA;IACrB,0BAA0B,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;IACtD,gBAAgB,EAAE,MAAM,eAAe,CAAA;IACvC,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,wBAAgB,kBAAkB,CAAC,EACjC,oBAAoB,EACpB,OAAO,EACP,aAAa,EACb,aAAa,EACb,0BAA0B,EAC1B,gBAAgB,EAChB,oBAA4B,GAC7B,EAAE,sBAAsB,GAAG,OAAO,CA+DlC"}

package/dist/adapter.js

@@ -1,11 +1,12 @@
 import { deleteFile } from './deleteFile.js';
+import { generateUploadInstructions } from './generateUploadInstructions.js';
 import { generateURL } from './generateURL.js';
 import { getFile } from './getFile.js';
+import { isClientUploadAllowed } from './isClientUploadAllowed.js';
 import { uploadFile } from './uploadFile.js';
 export function createAzureAdapter({ allowContainerCreate, baseURL, clientUploads, containerName, createContainerIfNotExists, getStorageClient, useCompositePrefixes = false }) {
     return ({ collection, prefix = '' })=>({
             name: 'azure',
-            clientUploads,
             generateURL: ({ filename, prefix: urlPrefix = '' })=>generateURL({
                     baseURL,
                     collectionPrefix: prefix,
@@ -14,35 +15,44 @@ export function createAzureAdapter({ allowContainerCreate, baseURL, clientUpload
                     prefix: urlPrefix,
                     useCompositePrefixes
                 }),
-            handleDelete: ({ doc: { prefix: docPrefix = '' }, filename })=>deleteFile({
-                    client: getStorageClient(),
+            uploadInstructions: {
+                adminHandler: {
+                    path: '@payloadcms/storage-azure/client#AzureClientUploadHandler'
+                },
+                enabled: Boolean(clientUploads) && isClientUploadAllowed(collection),
+                generate: generateUploadInstructions({
+                    access: typeof clientUploads === 'object' ? clientUploads.access : undefined,
                     collectionPrefix: prefix,
-                    docPrefix,
-                    filename,
+                    containerName,
+                    getStorageClient,
                     useCompositePrefixes
                 }),
-            handleUpload: async ({ data, file })=>{
+                requiresUploadReceipt: true,
+                useInAdmin: true
+            },
+            handleDelete: ({ storageFilePath })=>deleteFile({
+                    client: getStorageClient(),
+                    storageFilePath
+                }),
+            handleUpload: async ({ data, file, storageFilePath })=>{
                 await uploadFile({
                     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: { filename, uploadReference } })=>getFile({
                     client: getStorageClient(),
-                    clientUploadContext,
                     collection,
                     collectionPrefix: prefix,
+                    doc,
                     filename,
                     incomingHeaders: headers,
-                    prefixQueryParam,
                     req,
+                    uploadReference,
                     useCompositePrefixes
                 }),
             ...allowContainerCreate && {

package/dist/adapter.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/adapter.ts"],"sourcesContent":["import type { ContainerClient } from '@azure/storage-blob'\nimport type {\n  Adapter,\n  ClientUploadsConfig,\n  GeneratedAdapter,\n} from '@payloadcms/plugin-cloud-storage/types'\n\nimport { deleteFile } from './deleteFile.js'\nimport { generateURL } from './generateURL.js'\nimport { getFile } from './getFile.js'\nimport { uploadFile } from './uploadFile.js'\n\ninterface CreateAzureAdapterArgs {\n  allowContainerCreate: boolean\n  baseURL: string\n  clientUploads?: ClientUploadsConfig\n  containerName: string\n  createContainerIfNotExists: () => void\n  getStorageClient: () => ContainerClient\n  useCompositePrefixes?: boolean\n}\n\nexport function createAzureAdapter({\n  allowContainerCreate,\n  baseURL,\n  clientUploads,\n  containerName,\n  createContainerIfNotExists,\n  getStorageClient,\n  useCompositePrefixes = false,\n}: CreateAzureAdapterArgs): Adapter {\n  return ({ collection, prefix = '' }): GeneratedAdapter => ({\n    name: 'azure',\n    clientUploads,\n\n    generateURL: ({ filename, prefix: urlPrefix = '' }) =>\n      generateURL({\n        baseURL,\n        collectionPrefix: prefix,\n        containerName,\n        filename,\n        prefix: urlPrefix,\n        useCompositePrefixes,\n      }),\n\n    handleDelete: ({ doc: { prefix: docPrefix = '' }, filename }) =>\n      deleteFile({\n        client: getStorageClient(),\n        collectionPrefix: prefix,\n        docPrefix,\n        filename,\n        useCompositePrefixes,\n      }),\n\n    handleUpload: async ({ data, file }) => {\n      await uploadFile({\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        client: getStorageClient(),\n        clientUploadContext,\n        collection,\n        collectionPrefix: prefix,\n        filename,\n        incomingHeaders: headers,\n        prefixQueryParam,\n        req,\n        useCompositePrefixes,\n      }),\n\n    ...(allowContainerCreate && { onInit: createContainerIfNotExists }),\n  })\n}\n"],"names":["deleteFile","generateURL","getFile","uploadFile","createAzureAdapter","allowContainerCreate","baseURL","clientUploads","containerName","createContainerIfNotExists","getStorageClient","useCompositePrefixes","collection","prefix","name","filename","urlPrefix","collectionPrefix","handleDelete","doc","docPrefix","client","handleUpload","data","file","buffer","mimeType","tempFilePath","staticHandler","req","headers","params","clientUploadContext","prefixQueryParam","incomingHeaders","onInit"],"mappings":"AAOA,SAASA,UAAU,QAAQ,kBAAiB;AAC5C,SAASC,WAAW,QAAQ,mBAAkB;AAC9C,SAASC,OAAO,QAAQ,eAAc;AACtC,SAASC,UAAU,QAAQ,kBAAiB;AAY5C,OAAO,SAASC,mBAAmB,EACjCC,oBAAoB,EACpBC,OAAO,EACPC,aAAa,EACbC,aAAa,EACbC,0BAA0B,EAC1BC,gBAAgB,EAChBC,uBAAuB,KAAK,EACL;IACvB,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;oBAClBL;oBACAO;oBACAF,QAAQG;oBACRL;gBACF;YAEFO,cAAc,CAAC,EAAEC,KAAK,EAAEN,QAAQO,YAAY,EAAE,EAAE,EAAEL,QAAQ,EAAE,GAC1Df,WAAW;oBACTqB,QAAQX;oBACRO,kBAAkBJ;oBAClBO;oBACAL;oBACAJ;gBACF;YAEFW,cAAc,OAAO,EAAEC,IAAI,EAAEC,IAAI,EAAE;gBACjC,MAAMrB,WAAW;oBACfsB,QAAQD,KAAKC,MAAM;oBACnBJ,QAAQX;oBACRO,kBAAkBJ;oBAClBO,WAAWG,KAAKV,MAAM;oBACtBE,UAAUS,KAAKT,QAAQ;oBACvBW,UAAUF,KAAKE,QAAQ;oBACvBC,cAAcH,KAAKG,YAAY;oBAC/BhB;gBACF;gBAEA,OAAOY;YACT;YAEAK,eAAe,CACbC,KACA,EAAEC,OAAO,EAAEC,QAAQ,EAAEC,mBAAmB,EAAEjB,QAAQ,EAAEF,QAAQoB,gBAAgB,EAAE,EAAE,GAEhF/B,QAAQ;oBACNmB,QAAQX;oBACRsB;oBACApB;oBACAK,kBAAkBJ;oBAClBE;oBACAmB,iBAAiBJ;oBACjBG;oBACAJ;oBACAlB;gBACF;YAEF,GAAIN,wBAAwB;gBAAE8B,QAAQ1B;YAA2B,CAAC;QACpE,CAAA;AACF"}
+{"version":3,"sources":["../src/adapter.ts"],"sourcesContent":["import type { ContainerClient } from '@azure/storage-blob'\nimport type {\n  Adapter,\n  ClientUploadsConfig,\n  GeneratedAdapter,\n} from '@payloadcms/plugin-cloud-storage/types'\n\nimport { deleteFile } from './deleteFile.js'\nimport { generateUploadInstructions } from './generateUploadInstructions.js'\nimport { generateURL } from './generateURL.js'\nimport { getFile } from './getFile.js'\nimport { isClientUploadAllowed } from './isClientUploadAllowed.js'\nimport { uploadFile } from './uploadFile.js'\n\ninterface CreateAzureAdapterArgs {\n  allowContainerCreate: boolean\n  baseURL: string\n  clientUploads?: ClientUploadsConfig\n  containerName: string\n  createContainerIfNotExists: () => Promise<void> | void\n  getStorageClient: () => ContainerClient\n  useCompositePrefixes?: boolean\n}\n\nexport function createAzureAdapter({\n  allowContainerCreate,\n  baseURL,\n  clientUploads,\n  containerName,\n  createContainerIfNotExists,\n  getStorageClient,\n  useCompositePrefixes = false,\n}: CreateAzureAdapterArgs): Adapter {\n  return ({ collection, prefix = '' }): GeneratedAdapter => ({\n    name: 'azure',\n\n    generateURL: ({ filename, prefix: urlPrefix = '' }) =>\n      generateURL({\n        baseURL,\n        collectionPrefix: prefix,\n        containerName,\n        filename,\n        prefix: urlPrefix,\n        useCompositePrefixes,\n      }),\n\n    uploadInstructions: {\n      adminHandler: {\n        path: '@payloadcms/storage-azure/client#AzureClientUploadHandler',\n      },\n      enabled: Boolean(clientUploads) && isClientUploadAllowed(collection),\n      generate: generateUploadInstructions({\n        access: typeof clientUploads === 'object' ? clientUploads.access : undefined,\n        collectionPrefix: prefix,\n        containerName,\n        getStorageClient,\n        useCompositePrefixes,\n      }),\n      requiresUploadReceipt: true,\n      useInAdmin: true,\n    },\n\n    handleDelete: ({ storageFilePath }) =>\n      deleteFile({\n        client: getStorageClient(),\n        storageFilePath,\n      }),\n\n    handleUpload: async ({ data, file, storageFilePath }) => {\n      await uploadFile({\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: { filename, uploadReference } }) =>\n      getFile({\n        client: getStorageClient(),\n        collection,\n        collectionPrefix: prefix,\n        doc,\n        filename,\n        incomingHeaders: headers,\n        req,\n        uploadReference,\n        useCompositePrefixes,\n      }),\n\n    ...(allowContainerCreate && { onInit: createContainerIfNotExists }),\n  })\n}\n"],"names":["deleteFile","generateUploadInstructions","generateURL","getFile","isClientUploadAllowed","uploadFile","createAzureAdapter","allowContainerCreate","baseURL","clientUploads","containerName","createContainerIfNotExists","getStorageClient","useCompositePrefixes","collection","prefix","name","filename","urlPrefix","collectionPrefix","uploadInstructions","adminHandler","path","enabled","Boolean","generate","access","undefined","requiresUploadReceipt","useInAdmin","handleDelete","storageFilePath","client","handleUpload","data","file","buffer","mimeType","tempFilePath","staticHandler","req","doc","headers","params","uploadReference","incomingHeaders","onInit"],"mappings":"AAOA,SAASA,UAAU,QAAQ,kBAAiB;AAC5C,SAASC,0BAA0B,QAAQ,kCAAiC;AAC5E,SAASC,WAAW,QAAQ,mBAAkB;AAC9C,SAASC,OAAO,QAAQ,eAAc;AACtC,SAASC,qBAAqB,QAAQ,6BAA4B;AAClE,SAASC,UAAU,QAAQ,kBAAiB;AAY5C,OAAO,SAASC,mBAAmB,EACjCC,oBAAoB,EACpBC,OAAO,EACPC,aAAa,EACbC,aAAa,EACbC,0BAA0B,EAC1BC,gBAAgB,EAChBC,uBAAuB,KAAK,EACL;IACvB,OAAO,CAAC,EAAEC,UAAU,EAAEC,SAAS,EAAE,EAAE,GAAwB,CAAA;YACzDC,MAAM;YAENd,aAAa,CAAC,EAAEe,QAAQ,EAAEF,QAAQG,YAAY,EAAE,EAAE,GAChDhB,YAAY;oBACVM;oBACAW,kBAAkBJ;oBAClBL;oBACAO;oBACAF,QAAQG;oBACRL;gBACF;YAEFO,oBAAoB;gBAClBC,cAAc;oBACZC,MAAM;gBACR;gBACAC,SAASC,QAAQf,kBAAkBL,sBAAsBU;gBACzDW,UAAUxB,2BAA2B;oBACnCyB,QAAQ,OAAOjB,kBAAkB,WAAWA,cAAciB,MAAM,GAAGC;oBACnER,kBAAkBJ;oBAClBL;oBACAE;oBACAC;gBACF;gBACAe,uBAAuB;gBACvBC,YAAY;YACd;YAEAC,cAAc,CAAC,EAAEC,eAAe,EAAE,GAChC/B,WAAW;oBACTgC,QAAQpB;oBACRmB;gBACF;YAEFE,cAAc,OAAO,EAAEC,IAAI,EAAEC,IAAI,EAAEJ,eAAe,EAAE;gBAClD,MAAM1B,WAAW;oBACf+B,QAAQD,KAAKC,MAAM;oBACnBJ,QAAQpB;oBACRyB,UAAUF,KAAKE,QAAQ;oBACvBN;oBACAO,cAAcH,KAAKG,YAAY;gBACjC;gBAEA,OAAOJ;YACT;YAEAK,eAAe,CAACC,KAAK,EAAEC,GAAG,EAAEC,OAAO,EAAEC,QAAQ,EAAE1B,QAAQ,EAAE2B,eAAe,EAAE,EAAE,GAC1EzC,QAAQ;oBACN6B,QAAQpB;oBACRE;oBACAK,kBAAkBJ;oBAClB0B;oBACAxB;oBACA4B,iBAAiBH;oBACjBF;oBACAI;oBACA/B;gBACF;YAEF,GAAIN,wBAAwB;gBAAEuC,QAAQnC;YAA2B,CAAC;QACpE,CAAA;AACF"}

package/dist/client/AzureClientUploadHandler.d.ts

@@ -1,9 +1,8 @@
-export declare const AzureClientUploadHandler: ({ children, collectionSlug, enabled, extra, prefix, serverHandlerPath, }: {
+export declare const AzureClientUploadHandler: ({ children, collectionSlug, endpointPath, prefix, props, }: {
     children: import("react").ReactNode;
     collectionSlug: import("payload").UploadCollectionSlug;
-    enabled?: boolean;
-    extra: Record<string, unknown>;
+    endpointPath?: `/${string}`;
     prefix?: string;
-    serverHandlerPath: `/${string}`;
+    props: Record<string, unknown>;
 }) => import("react").JSX.Element;
 //# sourceMappingURL=AzureClientUploadHandler.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"AzureClientUploadHandler.d.ts","sourceRoot":"","sources":["../../src/client/AzureClientUploadHandler.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,wBAAwB;;;;;;;iCAoBnC,CAAA"}
+{"version":3,"file":"AzureClientUploadHandler.d.ts","sourceRoot":"","sources":["../../src/client/AzureClientUploadHandler.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,wBAAwB;;;;;;iCAGnC,CAAA"}

package/dist/client/AzureClientUploadHandler.js

@@ -2,17 +2,8 @@
 import { createClientUploadHandler } from '@payloadcms/plugin-cloud-storage/client';
 import { handleAzureUpload } from './handleAzureUpload.js';
 export const AzureClientUploadHandler = createClientUploadHandler({
-    handler: async ({ apiRoute, collectionSlug, docPrefix, file, serverHandlerPath, serverURL, updateFilename })=>{
-        return handleAzureUpload({
-            apiRoute,
-            collectionSlug,
-            docPrefix,
-            file,
-            serverHandlerPath,
-            serverURL,
-            updateFilename
-        });
-    }
+    name: 'uploadToAzure',
+    handler: handleAzureUpload
 });
 
 //# sourceMappingURL=AzureClientUploadHandler.js.map

package/dist/client/AzureClientUploadHandler.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/client/AzureClientUploadHandler.ts"],"sourcesContent":["'use client'\nimport { createClientUploadHandler } from '@payloadcms/plugin-cloud-storage/client'\n\nimport { handleAzureUpload } from './handleAzureUpload.js'\n\nexport const AzureClientUploadHandler = createClientUploadHandler({\n  handler: async ({\n    apiRoute,\n    collectionSlug,\n    docPrefix,\n    file,\n    serverHandlerPath,\n    serverURL,\n    updateFilename,\n  }) => {\n    return handleAzureUpload({\n      apiRoute,\n      collectionSlug,\n      docPrefix,\n      file,\n      serverHandlerPath,\n      serverURL,\n      updateFilename,\n    })\n  },\n})\n"],"names":["createClientUploadHandler","handleAzureUpload","AzureClientUploadHandler","handler","apiRoute","collectionSlug","docPrefix","file","serverHandlerPath","serverURL","updateFilename"],"mappings":"AAAA;AACA,SAASA,yBAAyB,QAAQ,0CAAyC;AAEnF,SAASC,iBAAiB,QAAQ,yBAAwB;AAE1D,OAAO,MAAMC,2BAA2BF,0BAA0B;IAChEG,SAAS,OAAO,EACdC,QAAQ,EACRC,cAAc,EACdC,SAAS,EACTC,IAAI,EACJC,iBAAiB,EACjBC,SAAS,EACTC,cAAc,EACf;QACC,OAAOT,kBAAkB;YACvBG;YACAC;YACAC;YACAC;YACAC;YACAC;YACAC;QACF;IACF;AACF,GAAE"}
+{"version":3,"sources":["../../src/client/AzureClientUploadHandler.ts"],"sourcesContent":["'use client'\nimport { createClientUploadHandler } from '@payloadcms/plugin-cloud-storage/client'\n\nimport { handleAzureUpload } from './handleAzureUpload.js'\n\nexport const AzureClientUploadHandler = createClientUploadHandler({\n  name: 'uploadToAzure',\n  handler: handleAzureUpload,\n})\n"],"names":["createClientUploadHandler","handleAzureUpload","AzureClientUploadHandler","name","handler"],"mappings":"AAAA;AACA,SAASA,yBAAyB,QAAQ,0CAAyC;AAEnF,SAASC,iBAAiB,QAAQ,yBAAwB;AAE1D,OAAO,MAAMC,2BAA2BF,0BAA0B;IAChEG,MAAM;IACNC,SAASH;AACX,GAAE"}

package/dist/client/handleAzureUpload.d.ts

@@ -1,14 +1,7 @@
 type HandleAzureUploadArgs = {
-    apiRoute: string;
-    collectionSlug: string;
-    docPrefix?: string;
+    data?: unknown;
     file: File;
-    serverHandlerPath: `/${string}`;
-    serverURL: string;
-    updateFilename: (value: string) => void;
 };
-export declare const handleAzureUpload: ({ apiRoute, collectionSlug, docPrefix, file, serverHandlerPath, serverURL, updateFilename, }: HandleAzureUploadArgs) => Promise<{
-    prefix: string;
-}>;
+export declare const handleAzureUpload: ({ data, file }: HandleAzureUploadArgs) => Promise<void>;
 export {};
 //# sourceMappingURL=handleAzureUpload.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"handleAzureUpload.d.ts","sourceRoot":"","sources":["../../src/client/handleAzureUpload.ts"],"names":[],"mappings":"AAUA,KAAK,qBAAqB,GAAG;IAC3B,QAAQ,EAAE,MAAM,CAAA;IAChB,cAAc,EAAE,MAAM,CAAA;IACtB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,IAAI,EAAE,IAAI,CAAA;IACV,iBAAiB,EAAE,IAAI,MAAM,EAAE,CAAA;IAC/B,SAAS,EAAE,MAAM,CAAA;IACjB,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;CACxC,CAAA;AAED,eAAO,MAAM,iBAAiB,iGAQ3B,qBAAqB,KAAG,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAiDpD,CAAA"}
+{"version":3,"file":"handleAzureUpload.d.ts","sourceRoot":"","sources":["../../src/client/handleAzureUpload.ts"],"names":[],"mappings":"AASA,KAAK,qBAAqB,GAAG;IAC3B,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,IAAI,EAAE,IAAI,CAAA;CACX,CAAA;AAED,eAAO,MAAM,iBAAiB,mBAA0B,qBAAqB,KAAG,OAAO,CAAC,IAAI,CAc3F,CAAA"}

package/dist/client/handleAzureUpload.js

@@ -1,34 +1,12 @@
 'use client';
-import { formatAdminURL } from 'payload/shared';
 // Balances upload parallelism against browser memory: `blockSize * concurrency`
 // bytes are buffered in flight. The SDK uses a single Put Blob for small files
 // and switches to Put Block + Put Block List above its single-shot threshold,
 // lifting the ~5 GB single-request ceiling to Azure's block-blob maximum.
 const BLOCK_SIZE = 64 * 1024 * 1024;
 const CONCURRENCY = 4;
-export const handleAzureUpload = async ({ apiRoute, collectionSlug, docPrefix, file, serverHandlerPath, serverURL, updateFilename })=>{
-    const endpointRoute = formatAdminURL({
-        apiRoute,
-        path: serverHandlerPath,
-        serverURL
-    });
-    const response = await fetch(endpointRoute, {
-        body: JSON.stringify({
-            collectionSlug,
-            docPrefix,
-            filename: file.name,
-            mimeType: file.type
-        }),
-        credentials: 'include',
-        method: 'POST'
-    });
-    if (!response.ok) {
-        throw new Error('Failed to retrieve signed URL for Azure client upload');
-    }
-    const { docPrefix: sanitizedDocPrefix, filename: sanitizedFilename, url } = await response.json();
-    if (sanitizedFilename && sanitizedFilename !== file.name) {
-        updateFilename(sanitizedFilename);
-    }
+export const handleAzureUpload = async ({ data, file })=>{
+    const { url } = data;
     // Loaded on demand so @azure/storage-blob is only pulled into the client bundle
     // when a client upload actually runs, rather than for every Azure adapter user.
     const { BlockBlobClient } = await import('@azure/storage-blob');
@@ -40,9 +18,6 @@ export const handleAzureUpload = async ({ apiRoute, collectionSlug, docPrefix, f
         blockSize: BLOCK_SIZE,
         concurrency: CONCURRENCY
     });
-    return {
-        prefix: sanitizedDocPrefix
-    };
 };
 
 //# sourceMappingURL=handleAzureUpload.js.map

package/dist/client/handleAzureUpload.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/client/handleAzureUpload.ts"],"sourcesContent":["'use client'\nimport { formatAdminURL } from 'payload/shared'\n\n// Balances upload parallelism against browser memory: `blockSize * concurrency`\n// bytes are buffered in flight. The SDK uses a single Put Blob for small files\n// and switches to Put Block + Put Block List above its single-shot threshold,\n// lifting the ~5 GB single-request ceiling to Azure's block-blob maximum.\nconst BLOCK_SIZE = 64 * 1024 * 1024\nconst CONCURRENCY = 4\n\ntype HandleAzureUploadArgs = {\n  apiRoute: string\n  collectionSlug: string\n  docPrefix?: string\n  file: File\n  serverHandlerPath: `/${string}`\n  serverURL: string\n  updateFilename: (value: string) => void\n}\n\nexport const handleAzureUpload = async ({\n  apiRoute,\n  collectionSlug,\n  docPrefix,\n  file,\n  serverHandlerPath,\n  serverURL,\n  updateFilename,\n}: HandleAzureUploadArgs): Promise<{ prefix: string }> => {\n  const endpointRoute = formatAdminURL({\n    apiRoute,\n    path: serverHandlerPath,\n    serverURL,\n  })\n\n  const response = await fetch(endpointRoute, {\n    body: JSON.stringify({\n      collectionSlug,\n      docPrefix,\n      filename: file.name,\n      mimeType: file.type,\n    }),\n    credentials: 'include',\n    method: 'POST',\n  })\n\n  if (!response.ok) {\n    throw new Error('Failed to retrieve signed URL for Azure client upload')\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  // Loaded on demand so @azure/storage-blob is only pulled into the client bundle\n  // when a client upload actually runs, rather than for every Azure adapter user.\n  const { BlockBlobClient } = await import('@azure/storage-blob')\n\n  const blockBlobClient = new BlockBlobClient(url)\n\n  await blockBlobClient.uploadData(file, {\n    blobHTTPHeaders: { blobContentType: file.type },\n    blockSize: BLOCK_SIZE,\n    concurrency: CONCURRENCY,\n  })\n\n  return { prefix: sanitizedDocPrefix }\n}\n"],"names":["formatAdminURL","BLOCK_SIZE","CONCURRENCY","handleAzureUpload","apiRoute","collectionSlug","docPrefix","file","serverHandlerPath","serverURL","updateFilename","endpointRoute","path","response","fetch","body","JSON","stringify","filename","name","mimeType","type","credentials","method","ok","Error","sanitizedDocPrefix","sanitizedFilename","url","json","BlockBlobClient","blockBlobClient","uploadData","blobHTTPHeaders","blobContentType","blockSize","concurrency","prefix"],"mappings":"AAAA;AACA,SAASA,cAAc,QAAQ,iBAAgB;AAE/C,gFAAgF;AAChF,+EAA+E;AAC/E,8EAA8E;AAC9E,0EAA0E;AAC1E,MAAMC,aAAa,KAAK,OAAO;AAC/B,MAAMC,cAAc;AAYpB,OAAO,MAAMC,oBAAoB,OAAO,EACtCC,QAAQ,EACRC,cAAc,EACdC,SAAS,EACTC,IAAI,EACJC,iBAAiB,EACjBC,SAAS,EACTC,cAAc,EACQ;IACtB,MAAMC,gBAAgBX,eAAe;QACnCI;QACAQ,MAAMJ;QACNC;IACF;IAEA,MAAMI,WAAW,MAAMC,MAAMH,eAAe;QAC1CI,MAAMC,KAAKC,SAAS,CAAC;YACnBZ;YACAC;YACAY,UAAUX,KAAKY,IAAI;YACnBC,UAAUb,KAAKc,IAAI;QACrB;QACAC,aAAa;QACbC,QAAQ;IACV;IAEA,IAAI,CAACV,SAASW,EAAE,EAAE;QAChB,MAAM,IAAIC,MAAM;IAClB;IAEA,MAAM,EACJnB,WAAWoB,kBAAkB,EAC7BR,UAAUS,iBAAiB,EAC3BC,GAAG,EACJ,GAAI,MAAMf,SAASgB,IAAI;IAMxB,IAAIF,qBAAqBA,sBAAsBpB,KAAKY,IAAI,EAAE;QACxDT,eAAeiB;IACjB;IAEA,gFAAgF;IAChF,gFAAgF;IAChF,MAAM,EAAEG,eAAe,EAAE,GAAG,MAAM,MAAM,CAAC;IAEzC,MAAMC,kBAAkB,IAAID,gBAAgBF;IAE5C,MAAMG,gBAAgBC,UAAU,CAACzB,MAAM;QACrC0B,iBAAiB;YAAEC,iBAAiB3B,KAAKc,IAAI;QAAC;QAC9Cc,WAAWlC;QACXmC,aAAalC;IACf;IAEA,OAAO;QAAEmC,QAAQX;IAAmB;AACtC,EAAC"}
+{"version":3,"sources":["../../src/client/handleAzureUpload.ts"],"sourcesContent":["'use client'\n\n// Balances upload parallelism against browser memory: `blockSize * concurrency`\n// bytes are buffered in flight. The SDK uses a single Put Blob for small files\n// and switches to Put Block + Put Block List above its single-shot threshold,\n// lifting the ~5 GB single-request ceiling to Azure's block-blob maximum.\nconst BLOCK_SIZE = 64 * 1024 * 1024\nconst CONCURRENCY = 4\n\ntype HandleAzureUploadArgs = {\n  data?: unknown\n  file: File\n}\n\nexport const handleAzureUpload = async ({ data, file }: HandleAzureUploadArgs): Promise<void> => {\n  const { url } = data as { url: string }\n\n  // Loaded on demand so @azure/storage-blob is only pulled into the client bundle\n  // when a client upload actually runs, rather than for every Azure adapter user.\n  const { BlockBlobClient } = await import('@azure/storage-blob')\n\n  const blockBlobClient = new BlockBlobClient(url)\n\n  await blockBlobClient.uploadData(file, {\n    blobHTTPHeaders: { blobContentType: file.type },\n    blockSize: BLOCK_SIZE,\n    concurrency: CONCURRENCY,\n  })\n}\n"],"names":["BLOCK_SIZE","CONCURRENCY","handleAzureUpload","data","file","url","BlockBlobClient","blockBlobClient","uploadData","blobHTTPHeaders","blobContentType","type","blockSize","concurrency"],"mappings":"AAAA;AAEA,gFAAgF;AAChF,+EAA+E;AAC/E,8EAA8E;AAC9E,0EAA0E;AAC1E,MAAMA,aAAa,KAAK,OAAO;AAC/B,MAAMC,cAAc;AAOpB,OAAO,MAAMC,oBAAoB,OAAO,EAAEC,IAAI,EAAEC,IAAI,EAAyB;IAC3E,MAAM,EAAEC,GAAG,EAAE,GAAGF;IAEhB,gFAAgF;IAChF,gFAAgF;IAChF,MAAM,EAAEG,eAAe,EAAE,GAAG,MAAM,MAAM,CAAC;IAEzC,MAAMC,kBAAkB,IAAID,gBAAgBD;IAE5C,MAAME,gBAAgBC,UAAU,CAACJ,MAAM;QACrCK,iBAAiB;YAAEC,iBAAiBN,KAAKO,IAAI;QAAC;QAC9CC,WAAWZ;QACXa,aAAaZ;IACf;AACF,EAAC"}

package/dist/deleteFile.d.ts

@@ -1,11 +1,8 @@
 import type { ContainerClient } from '@azure/storage-blob';
 interface DeleteArgs {
     client: ContainerClient;
-    collectionPrefix?: string;
-    docPrefix: string;
-    filename: string;
-    useCompositePrefixes?: boolean;
+    storageFilePath: string;
 }
-export declare function deleteFile({ client, collectionPrefix, docPrefix, filename, useCompositePrefixes, }: DeleteArgs): Promise<void>;
+export declare function deleteFile({ 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,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAI1D,UAAU,UAAU;IAClB,MAAM,EAAE,eAAe,CAAA;IACvB,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,gBAAqB,EACrB,SAAS,EACT,QAAQ,EACR,oBAA4B,GAC7B,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAW5B"}
+{"version":3,"file":"deleteFile.d.ts","sourceRoot":"","sources":["../src/deleteFile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAE1D,UAAU,UAAU;IAClB,MAAM,EAAE,eAAe,CAAA;IACvB,eAAe,EAAE,MAAM,CAAA;CACxB;AAED,wBAAsB,UAAU,CAAC,EAAE,MAAM,EAAE,eAAe,EAAE,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAIvF"}

package/dist/deleteFile.js

@@ -1,12 +1,5 @@
-import { getFileKey } from '@payloadcms/plugin-cloud-storage/utilities';
-export async function deleteFile({ client, collectionPrefix = '', docPrefix, filename, useCompositePrefixes = false }) {
-    const { fileKey } = getFileKey({
-        collectionPrefix,
-        docPrefix,
-        filename,
-        useCompositePrefixes
-    });
-    const blockBlobClient = client.getBlockBlobClient(fileKey);
+export async function deleteFile({ client, storageFilePath }) {
+    const blockBlobClient = client.getBlockBlobClient(storageFilePath);
     await blockBlobClient.deleteIfExists();
 }
 

package/dist/deleteFile.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/deleteFile.ts"],"sourcesContent":["import type { ContainerClient } from '@azure/storage-blob'\n\nimport { getFileKey } from '@payloadcms/plugin-cloud-storage/utilities'\n\ninterface DeleteArgs {\n  client: ContainerClient\n  collectionPrefix?: string\n  docPrefix: string\n  filename: string\n  useCompositePrefixes?: boolean\n}\n\nexport async function deleteFile({\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  const blockBlobClient = client.getBlockBlobClient(fileKey)\n\n  await blockBlobClient.deleteIfExists()\n}\n"],"names":["getFileKey","deleteFile","client","collectionPrefix","docPrefix","filename","useCompositePrefixes","fileKey","blockBlobClient","getBlockBlobClient","deleteIfExists"],"mappings":"AAEA,SAASA,UAAU,QAAQ,6CAA4C;AAUvE,OAAO,eAAeC,WAAW,EAC/BC,MAAM,EACNC,mBAAmB,EAAE,EACrBC,SAAS,EACTC,QAAQ,EACRC,uBAAuB,KAAK,EACjB;IACX,MAAM,EAAEC,OAAO,EAAE,GAAGP,WAAW;QAC7BG;QACAC;QACAC;QACAC;IACF;IAEA,MAAME,kBAAkBN,OAAOO,kBAAkB,CAACF;IAElD,MAAMC,gBAAgBE,cAAc;AACtC"}
+{"version":3,"sources":["../src/deleteFile.ts"],"sourcesContent":["import type { ContainerClient } from '@azure/storage-blob'\n\ninterface DeleteArgs {\n  client: ContainerClient\n  storageFilePath: string\n}\n\nexport async function deleteFile({ client, storageFilePath }: DeleteArgs): Promise<void> {\n  const blockBlobClient = client.getBlockBlobClient(storageFilePath)\n\n  await blockBlobClient.deleteIfExists()\n}\n"],"names":["deleteFile","client","storageFilePath","blockBlobClient","getBlockBlobClient","deleteIfExists"],"mappings":"AAOA,OAAO,eAAeA,WAAW,EAAEC,MAAM,EAAEC,eAAe,EAAc;IACtE,MAAMC,kBAAkBF,OAAOG,kBAAkB,CAACF;IAElD,MAAMC,gBAAgBE,cAAc;AACtC"}

package/dist/generateURL.js

@@ -1,12 +1,12 @@
-import { getFileKey } from '@payloadcms/plugin-cloud-storage/utilities';
+import { buildStoragePathData } from '@payloadcms/plugin-cloud-storage/utilities';
 export function generateURL({ baseURL, collectionPrefix = '', containerName, filename, prefix, useCompositePrefixes = false }) {
-    const { fileKey } = getFileKey({
+    const { storageFilePath } = buildStoragePathData({
         collectionPrefix,
         docPrefix: prefix,
         filename,
         useCompositePrefixes
     });
-    return `${baseURL}/${containerName}/${fileKey}`;
+    return `${baseURL}/${containerName}/${storageFilePath}`;
 }
 
 //# sourceMappingURL=generateURL.js.map

package/dist/generateURL.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/generateURL.ts"],"sourcesContent":["import { getFileKey } from '@payloadcms/plugin-cloud-storage/utilities'\n\ninterface GenerateURLArgs {\n  baseURL: string\n  collectionPrefix?: string\n  containerName: string\n  filename: string\n  prefix: string\n  useCompositePrefixes?: boolean\n}\n\nexport function generateURL({\n  baseURL,\n  collectionPrefix = '',\n  containerName,\n  filename,\n  prefix,\n  useCompositePrefixes = false,\n}: GenerateURLArgs): string {\n  const { fileKey } = getFileKey({\n    collectionPrefix,\n    docPrefix: prefix,\n    filename,\n    useCompositePrefixes,\n  })\n\n  return `${baseURL}/${containerName}/${fileKey}`\n}\n"],"names":["getFileKey","generateURL","baseURL","collectionPrefix","containerName","filename","prefix","useCompositePrefixes","fileKey","docPrefix"],"mappings":"AAAA,SAASA,UAAU,QAAQ,6CAA4C;AAWvE,OAAO,SAASC,YAAY,EAC1BC,OAAO,EACPC,mBAAmB,EAAE,EACrBC,aAAa,EACbC,QAAQ,EACRC,MAAM,EACNC,uBAAuB,KAAK,EACZ;IAChB,MAAM,EAAEC,OAAO,EAAE,GAAGR,WAAW;QAC7BG;QACAM,WAAWH;QACXD;QACAE;IACF;IAEA,OAAO,GAAGL,QAAQ,CAAC,EAAEE,cAAc,CAAC,EAAEI,SAAS;AACjD"}
+{"version":3,"sources":["../src/generateURL.ts"],"sourcesContent":["import { buildStoragePathData } from '@payloadcms/plugin-cloud-storage/utilities'\n\ninterface GenerateURLArgs {\n  baseURL: string\n  collectionPrefix?: string\n  containerName: string\n  filename: string\n  prefix: string\n  useCompositePrefixes?: boolean\n}\n\nexport function generateURL({\n  baseURL,\n  collectionPrefix = '',\n  containerName,\n  filename,\n  prefix,\n  useCompositePrefixes = false,\n}: GenerateURLArgs): string {\n  const { storageFilePath } = buildStoragePathData({\n    collectionPrefix,\n    docPrefix: prefix,\n    filename,\n    useCompositePrefixes,\n  })\n\n  return `${baseURL}/${containerName}/${storageFilePath}`\n}\n"],"names":["buildStoragePathData","generateURL","baseURL","collectionPrefix","containerName","filename","prefix","useCompositePrefixes","storageFilePath","docPrefix"],"mappings":"AAAA,SAASA,oBAAoB,QAAQ,6CAA4C;AAWjF,OAAO,SAASC,YAAY,EAC1BC,OAAO,EACPC,mBAAmB,EAAE,EACrBC,aAAa,EACbC,QAAQ,EACRC,MAAM,EACNC,uBAAuB,KAAK,EACZ;IAChB,MAAM,EAAEC,eAAe,EAAE,GAAGR,qBAAqB;QAC/CG;QACAM,WAAWH;QACXD;QACAE;IACF;IAEA,OAAO,GAAGL,QAAQ,CAAC,EAAEE,cAAc,CAAC,EAAEI,iBAAiB;AACzD"}

package/dist/generateUploadInstructions.d.ts

@@ -0,0 +1,12 @@
+import type { ContainerClient } from '@azure/storage-blob';
+import type { GenerateUploadInstructions, UploadInstructionsAccess } from 'payload';
+interface Args {
+    access?: UploadInstructionsAccess;
+    collectionPrefix: string;
+    containerName: string;
+    getStorageClient: () => ContainerClient;
+    useCompositePrefixes?: boolean;
+}
+export declare const generateUploadInstructions: ({ access, collectionPrefix, containerName, getStorageClient, useCompositePrefixes, }: Args) => GenerateUploadInstructions;
+export {};
+//# sourceMappingURL=generateUploadInstructions.d.ts.map

package/dist/generateUploadInstructions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"generateUploadInstructions.d.ts","sourceRoot":"","sources":["../src/generateUploadInstructions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAA8B,MAAM,qBAAqB,CAAA;AACtF,OAAO,KAAK,EAAE,0BAA0B,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAA;AASnF,UAAU,IAAI;IACZ,MAAM,CAAC,EAAE,wBAAwB,CAAA;IACjC,gBAAgB,EAAE,MAAM,CAAA;IACxB,aAAa,EAAE,MAAM,CAAA;IACrB,gBAAgB,EAAE,MAAM,eAAe,CAAA;IACvC,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,eAAO,MAAM,0BAA0B,yFAMpC,IAAI,KAAG,0BA8DT,CAAA"}

package/dist/generateUploadInstructions.js

@@ -0,0 +1,57 @@
+import { BlobSASPermissions, generateBlobSASQueryParameters } from '@azure/storage-blob';
+import { resolveSignedURLKey } from '@payloadcms/plugin-cloud-storage/utilities';
+import { APIError, Forbidden } from 'payload';
+import { assertClientUploadAllowed } from 'payload/internal';
+import { isClientUploadAllowed } from './isClientUploadAllowed.js';
+export const generateUploadInstructions = ({ access, collectionPrefix, containerName, getStorageClient, useCompositePrefixes = false })=>{
+    return async ({ collectionSlug, docPrefix, filename, filesize, mimeType, overrideAccess, req })=>{
+        if (!overrideAccess && (access ? !await access({
+            collectionSlug,
+            req
+        }) : !req.user)) {
+            throw new Forbidden(req.t);
+        }
+        const collection = req.payload.collections[collectionSlug]?.config;
+        if (!isClientUploadAllowed(collection)) {
+            throw new APIError('Azure client uploads require allowRestrictedFileTypes to be enabled.', 400);
+        }
+        assertClientUploadAllowed({
+            collection,
+            filename,
+            mimeType
+        });
+        const { sanitizedFilename, storageFilePath, uploadReference } = await resolveSignedURLKey({
+            collectionPrefix,
+            collectionSlug,
+            docPrefix,
+            filename,
+            req,
+            useCompositePrefixes
+        });
+        const blobClient = getStorageClient().getBlobClient(storageFilePath);
+        const sasToken = generateBlobSASQueryParameters({
+            blobName: storageFilePath,
+            containerName,
+            contentType: mimeType,
+            expiresOn: new Date(Date.now() + 3 * 60 * 60 * 1000),
+            permissions: BlobSASPermissions.parse('c'),
+            startsOn: new Date(),
+            version: '2026-04-06'
+        }, getStorageClient().credential);
+        return {
+            name: 'uploadToAzure',
+            type: 'dispatch',
+            data: {
+                url: `${blobClient.url}?${sasToken.toString()}`
+            },
+            file: {
+                filename: sanitizedFilename,
+                mimeType,
+                size: filesize,
+                uploadReference
+            }
+        };
+    };
+};
+
+//# sourceMappingURL=generateUploadInstructions.js.map

package/dist/generateUploadInstructions.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/generateUploadInstructions.ts"],"sourcesContent":["import type { ContainerClient, StorageSharedKeyCredential } from '@azure/storage-blob'\nimport type { GenerateUploadInstructions, UploadInstructionsAccess } from 'payload'\n\nimport { BlobSASPermissions, generateBlobSASQueryParameters } from '@azure/storage-blob'\nimport { resolveSignedURLKey } from '@payloadcms/plugin-cloud-storage/utilities'\nimport { APIError, Forbidden } from 'payload'\nimport { assertClientUploadAllowed } from 'payload/internal'\n\nimport { isClientUploadAllowed } from './isClientUploadAllowed.js'\n\ninterface Args {\n  access?: UploadInstructionsAccess\n  collectionPrefix: string\n  containerName: string\n  getStorageClient: () => ContainerClient\n  useCompositePrefixes?: boolean\n}\n\nexport const generateUploadInstructions = ({\n  access,\n  collectionPrefix,\n  containerName,\n  getStorageClient,\n  useCompositePrefixes = false,\n}: Args): GenerateUploadInstructions => {\n  return async ({\n    collectionSlug,\n    docPrefix,\n    filename,\n    filesize,\n    mimeType,\n    overrideAccess,\n    req,\n  }) => {\n    if (!overrideAccess && (access ? !(await access({ collectionSlug, req })) : !req.user)) {\n      throw new Forbidden(req.t)\n    }\n\n    const collection = req.payload.collections[collectionSlug]?.config\n    if (!isClientUploadAllowed(collection)) {\n      throw new APIError(\n        'Azure client uploads require allowRestrictedFileTypes to be enabled.',\n        400,\n      )\n    }\n\n    assertClientUploadAllowed({ collection, filename, mimeType })\n\n    const { sanitizedFilename, storageFilePath, uploadReference } = await resolveSignedURLKey({\n      collectionPrefix,\n      collectionSlug,\n      docPrefix,\n      filename,\n      req,\n      useCompositePrefixes,\n    })\n\n    const blobClient = getStorageClient().getBlobClient(storageFilePath)\n\n    const sasToken = generateBlobSASQueryParameters(\n      {\n        blobName: storageFilePath,\n        containerName,\n        contentType: mimeType,\n        expiresOn: new Date(Date.now() + 3 * 60 * 60 * 1000),\n        permissions: BlobSASPermissions.parse('c'),\n        startsOn: new Date(),\n        version: '2026-04-06',\n      },\n      getStorageClient().credential as StorageSharedKeyCredential,\n    )\n\n    return {\n      name: 'uploadToAzure',\n      type: 'dispatch',\n      data: {\n        url: `${blobClient.url}?${sasToken.toString()}`,\n      },\n      file: {\n        filename: sanitizedFilename,\n        mimeType,\n        size: filesize,\n        uploadReference,\n      },\n    }\n  }\n}\n"],"names":["BlobSASPermissions","generateBlobSASQueryParameters","resolveSignedURLKey","APIError","Forbidden","assertClientUploadAllowed","isClientUploadAllowed","generateUploadInstructions","access","collectionPrefix","containerName","getStorageClient","useCompositePrefixes","collectionSlug","docPrefix","filename","filesize","mimeType","overrideAccess","req","user","t","collection","payload","collections","config","sanitizedFilename","storageFilePath","uploadReference","blobClient","getBlobClient","sasToken","blobName","contentType","expiresOn","Date","now","permissions","parse","startsOn","version","credential","name","type","data","url","toString","file","size"],"mappings":"AAGA,SAASA,kBAAkB,EAAEC,8BAA8B,QAAQ,sBAAqB;AACxF,SAASC,mBAAmB,QAAQ,6CAA4C;AAChF,SAASC,QAAQ,EAAEC,SAAS,QAAQ,UAAS;AAC7C,SAASC,yBAAyB,QAAQ,mBAAkB;AAE5D,SAASC,qBAAqB,QAAQ,6BAA4B;AAUlE,OAAO,MAAMC,6BAA6B,CAAC,EACzCC,MAAM,EACNC,gBAAgB,EAChBC,aAAa,EACbC,gBAAgB,EAChBC,uBAAuB,KAAK,EACvB;IACL,OAAO,OAAO,EACZC,cAAc,EACdC,SAAS,EACTC,QAAQ,EACRC,QAAQ,EACRC,QAAQ,EACRC,cAAc,EACdC,GAAG,EACJ;QACC,IAAI,CAACD,kBAAmBV,CAAAA,SAAS,CAAE,MAAMA,OAAO;YAAEK;YAAgBM;QAAI,KAAM,CAACA,IAAIC,IAAI,AAAD,GAAI;YACtF,MAAM,IAAIhB,UAAUe,IAAIE,CAAC;QAC3B;QAEA,MAAMC,aAAaH,IAAII,OAAO,CAACC,WAAW,CAACX,eAAe,EAAEY;QAC5D,IAAI,CAACnB,sBAAsBgB,aAAa;YACtC,MAAM,IAAInB,SACR,wEACA;QAEJ;QAEAE,0BAA0B;YAAEiB;YAAYP;YAAUE;QAAS;QAE3D,MAAM,EAAES,iBAAiB,EAAEC,eAAe,EAAEC,eAAe,EAAE,GAAG,MAAM1B,oBAAoB;YACxFO;YACAI;YACAC;YACAC;YACAI;YACAP;QACF;QAEA,MAAMiB,aAAalB,mBAAmBmB,aAAa,CAACH;QAEpD,MAAMI,WAAW9B,+BACf;YACE+B,UAAUL;YACVjB;YACAuB,aAAahB;YACbiB,WAAW,IAAIC,KAAKA,KAAKC,GAAG,KAAK,IAAI,KAAK,KAAK;YAC/CC,aAAarC,mBAAmBsC,KAAK,CAAC;YACtCC,UAAU,IAAIJ;YACdK,SAAS;QACX,GACA7B,mBAAmB8B,UAAU;QAG/B,OAAO;YACLC,MAAM;YACNC,MAAM;YACNC,MAAM;gBACJC,KAAK,GAAGhB,WAAWgB,GAAG,CAAC,CAAC,EAAEd,SAASe,QAAQ,IAAI;YACjD;YACAC,MAAM;gBACJhC,UAAUW;gBACVT;gBACA+B,MAAMhC;gBACNY;YACF;QACF;IACF;AACF,EAAC"}

package/dist/getFile.d.ts

@@ -1,16 +1,16 @@
 import type { ContainerClient } from '@azure/storage-blob';
-import type { CollectionConfig, PayloadRequest } from 'payload';
+import type { CollectionConfig, PayloadRequest, TypeWithID } from 'payload';
 interface GetFileArgs {
     client: ContainerClient;
-    clientUploadContext?: unknown;
     collection: CollectionConfig;
     collectionPrefix?: string;
+    doc?: TypeWithID;
     filename: string;
     incomingHeaders?: Headers;
-    prefixQueryParam?: string;
     req: PayloadRequest;
+    uploadReference?: unknown;
     useCompositePrefixes?: boolean;
 }
-export declare function getFile({ client, clientUploadContext, collection, collectionPrefix, filename, incomingHeaders, prefixQueryParam, req, useCompositePrefixes, }: GetFileArgs): Promise<Response>;
+export declare function getFile({ client, collection, collectionPrefix, doc, filename, incomingHeaders, req, uploadReference, 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,EAA8B,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACtF,OAAO,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAU/D,UAAU,WAAW;IACnB,MAAM,EAAE,eAAe,CAAA;IACvB,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,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAgCD,wBAAsB,OAAO,CAAC,EAC5B,MAAM,EACN,mBAAmB,EACnB,UAAU,EACV,gBAAqB,EACrB,QAAQ,EACR,eAAe,EACf,gBAAgB,EAChB,GAAG,EACH,oBAA4B,GAC7B,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CAuHjC"}
+{"version":3,"file":"getFile.d.ts","sourceRoot":"","sources":["../src/getFile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAA8B,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACtF,OAAO,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAU3E,UAAU,WAAW;IACnB,MAAM,EAAE,eAAe,CAAA;IACvB,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,CAAC,EAAE,OAAO,CAAA;IACzB,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAgCD,wBAAsB,OAAO,CAAC,EAC5B,MAAM,EACN,UAAU,EACV,gBAAqB,EACrB,GAAG,EACH,QAAQ,EACR,eAAe,EACf,GAAG,EACH,eAAe,EACf,oBAA4B,GAC7B,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CAyHjC"}

package/dist/getFile.js

@@ -1,6 +1,6 @@
 import { RestError } from '@azure/storage-blob';
-import { getFilePrefix as getDocPrefix, getFileKey } from '@payloadcms/plugin-cloud-storage/utilities';
-import { getRangeRequestInfo } from 'payload/internal';
+import { buildStoragePathData, getFilePrefix as getDocPrefix } from '@payloadcms/plugin-cloud-storage/utilities';
+import { getRangeRequestInfo, isXmlMimeType, uploadContentSecurityPolicy } 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';
 };
@@ -13,7 +13,7 @@ const abortRequestAndDestroyStream = ({ abortController, blob })=>{
         blob.readableStreamBody.destroy();
     }
 };
-export async function getFile({ client, clientUploadContext, collection, collectionPrefix = '', filename, incomingHeaders, prefixQueryParam, req, useCompositePrefixes = false }) {
+export async function getFile({ client, collection, collectionPrefix = '', doc, filename, incomingHeaders, req, uploadReference, useCompositePrefixes = false }) {
     let blob = undefined;
     let streamed = false;
     const abortController = new AbortController();
@@ -27,19 +27,21 @@ export async function getFile({ client, clientUploadContext, collection, collect
     }
     try {
         const docPrefix = await getDocPrefix({
-            clientUploadContext,
             collection,
+            collectionPrefix,
+            doc,
             filename,
-            prefixQueryParam,
-            req
+            req,
+            uploadReference,
+            useCompositePrefixes
         });
-        const { fileKey } = getFileKey({
+        const { storageFilePath } = buildStoragePathData({
             collectionPrefix,
             docPrefix,
             filename,
             useCompositePrefixes
         });
-        const blockBlobClient = client.getBlockBlobClient(fileKey);
+        const blockBlobClient = client.getBlockBlobClient(storageFilePath);
         // Get file size for range validation
         const properties = await blockBlobClient.getProperties();
         const fileSize = properties.contentLength;
@@ -76,9 +78,9 @@ export async function getFile({ client, clientUploadContext, collection, collect
         if (properties.etag) {
             headers.append('ETag', String(properties.etag));
         }
-        // Add Content-Security-Policy header for SVG files to prevent executable code
-        if (properties.contentType === 'image/svg+xml') {
-            headers.append('Content-Security-Policy', "script-src 'none'");
+        // Apply a restrictive policy to XML-family responses served through Payload.
+        if (isXmlMimeType(properties.contentType)) {
+            headers.append('Content-Security-Policy', uploadContentSecurityPolicy);
         }
         const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match');
         if (collection.upload && typeof collection.upload === 'object' && typeof collection.upload.modifyResponseHeaders === 'function') {

package/dist/getFile.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/getFile.ts"],"sourcesContent":["import type { BlobDownloadResponseParsed, ContainerClient } from '@azure/storage-blob'\nimport type { CollectionConfig, PayloadRequest } from 'payload'\nimport type { Readable } from 'stream'\n\nimport { RestError } from '@azure/storage-blob'\nimport {\n  getFilePrefix as getDocPrefix,\n  getFileKey,\n} from '@payloadcms/plugin-cloud-storage/utilities'\nimport { getRangeRequestInfo } from 'payload/internal'\n\ninterface GetFileArgs {\n  client: ContainerClient\n  clientUploadContext?: unknown\n  collection: CollectionConfig\n  collectionPrefix?: string\n  filename: string\n  incomingHeaders?: Headers\n  prefixQueryParam?: string\n  req: PayloadRequest\n  useCompositePrefixes?: boolean\n}\n\nconst isNodeReadableStream = (\n  body: BlobDownloadResponseParsed['readableStreamBody'],\n): 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  blob,\n}: {\n  abortController: AbortController\n  blob?: BlobDownloadResponseParsed\n}) => {\n  try {\n    abortController.abort()\n  } catch {\n    /* noop */\n  }\n  if (blob?.readableStreamBody && isNodeReadableStream(blob.readableStreamBody)) {\n    blob.readableStreamBody.destroy()\n  }\n}\n\nexport async function getFile({\n  client,\n  clientUploadContext,\n  collection,\n  collectionPrefix = '',\n  filename,\n  incomingHeaders,\n  prefixQueryParam,\n  req,\n  useCompositePrefixes = false,\n}: GetFileArgs): Promise<Response> {\n  let blob: BlobDownloadResponseParsed | undefined = undefined\n  let streamed = false\n\n  const abortController = new AbortController()\n  if (req.signal) {\n    req.signal.addEventListener('abort', () => {\n      abortRequestAndDestroyStream({ abortController, blob })\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 } = getFileKey({\n      collectionPrefix,\n      docPrefix,\n      filename,\n      useCompositePrefixes,\n    })\n\n    const blockBlobClient = client.getBlockBlobClient(fileKey)\n\n    // Get file size for range validation\n    const properties = await blockBlobClient.getProperties()\n    const fileSize = properties.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    // Download with range if partial\n    blob =\n      rangeResult.type === 'partial'\n        ? await blockBlobClient.download(\n            rangeResult.rangeStart,\n            rangeResult.rangeEnd - rangeResult.rangeStart + 1,\n            { abortSignal: abortController.signal },\n          )\n        : await blockBlobClient.download(0, undefined, { abortSignal: abortController.signal })\n\n    let headers = new Headers(incomingHeaders)\n\n    // Add range-related headers from the result\n    for (const [key, value] of Object.entries(rangeResult.headers)) {\n      headers.append(key, value)\n    }\n\n    // Add Azure-specific headers\n    headers.append('Content-Type', String(properties.contentType))\n    if (properties.etag) {\n      headers.append('ETag', String(properties.etag))\n    }\n\n    // Add Content-Security-Policy header for SVG files to prevent executable code\n    if (properties.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\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 === properties.etag) {\n      return new Response(null, {\n        headers,\n        status: 304,\n      })\n    }\n\n    if (!blob.readableStreamBody || !isNodeReadableStream(blob.readableStreamBody)) {\n      return new Response('Internal Server Error', { status: 500 })\n    }\n\n    const stream = blob.readableStreamBody\n    stream.on('error', (err: Error) => {\n      req.payload.logger.error({\n        err,\n        msg: 'Error while streaming Azure blob (aborting)',\n      })\n      abortRequestAndDestroyStream({ abortController, blob })\n    })\n\n    streamed = true\n    return new Response(stream, { headers, status: rangeResult.status })\n  } catch (err: unknown) {\n    if (err instanceof RestError && err.statusCode === 404) {\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, blob })\n    }\n  }\n}\n"],"names":["RestError","getFilePrefix","getDocPrefix","getFileKey","getRangeRequestInfo","isNodeReadableStream","body","pipe","destroy","abortRequestAndDestroyStream","abortController","blob","abort","readableStreamBody","getFile","client","clientUploadContext","collection","collectionPrefix","filename","incomingHeaders","prefixQueryParam","req","useCompositePrefixes","undefined","streamed","AbortController","signal","addEventListener","docPrefix","fileKey","blockBlobClient","getBlockBlobClient","properties","getProperties","fileSize","contentLength","Response","status","rangeHeader","headers","get","rangeResult","type","Headers","download","rangeStart","rangeEnd","abortSignal","key","value","Object","entries","append","String","contentType","etag","etagFromHeaders","upload","modifyResponseHeaders","stream","on","err","payload","logger","error","msg","statusCode","statusText"],"mappings":"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"}
+{"version":3,"sources":["../src/getFile.ts"],"sourcesContent":["import type { BlobDownloadResponseParsed, ContainerClient } from '@azure/storage-blob'\nimport type { CollectionConfig, PayloadRequest, TypeWithID } from 'payload'\nimport type { Readable } from 'stream'\n\nimport { RestError } from '@azure/storage-blob'\nimport {\n  buildStoragePathData,\n  getFilePrefix as getDocPrefix,\n} from '@payloadcms/plugin-cloud-storage/utilities'\nimport { getRangeRequestInfo, isXmlMimeType, uploadContentSecurityPolicy } from 'payload/internal'\n\ninterface GetFileArgs {\n  client: ContainerClient\n  collection: CollectionConfig\n  collectionPrefix?: string\n  doc?: TypeWithID\n  filename: string\n  incomingHeaders?: Headers\n  req: PayloadRequest\n  uploadReference?: unknown\n  useCompositePrefixes?: boolean\n}\n\nconst isNodeReadableStream = (\n  body: BlobDownloadResponseParsed['readableStreamBody'],\n): 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  blob,\n}: {\n  abortController: AbortController\n  blob?: BlobDownloadResponseParsed\n}) => {\n  try {\n    abortController.abort()\n  } catch {\n    /* noop */\n  }\n  if (blob?.readableStreamBody && isNodeReadableStream(blob.readableStreamBody)) {\n    blob.readableStreamBody.destroy()\n  }\n}\n\nexport async function getFile({\n  client,\n  collection,\n  collectionPrefix = '',\n  doc,\n  filename,\n  incomingHeaders,\n  req,\n  uploadReference,\n  useCompositePrefixes = false,\n}: GetFileArgs): Promise<Response> {\n  let blob: BlobDownloadResponseParsed | undefined = undefined\n  let streamed = false\n\n  const abortController = new AbortController()\n  if (req.signal) {\n    req.signal.addEventListener('abort', () => {\n      abortRequestAndDestroyStream({ abortController, blob })\n    })\n  }\n\n  try {\n    const docPrefix = await getDocPrefix({\n      collection,\n      collectionPrefix,\n      doc,\n      filename,\n      req,\n      uploadReference,\n      useCompositePrefixes,\n    })\n\n    const { storageFilePath } = buildStoragePathData({\n      collectionPrefix,\n      docPrefix,\n      filename,\n      useCompositePrefixes,\n    })\n\n    const blockBlobClient = client.getBlockBlobClient(storageFilePath)\n\n    // Get file size for range validation\n    const properties = await blockBlobClient.getProperties()\n    const fileSize = properties.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    // Download with range if partial\n    blob =\n      rangeResult.type === 'partial'\n        ? await blockBlobClient.download(\n            rangeResult.rangeStart,\n            rangeResult.rangeEnd - rangeResult.rangeStart + 1,\n            { abortSignal: abortController.signal },\n          )\n        : await blockBlobClient.download(0, undefined, { abortSignal: abortController.signal })\n\n    let headers = new Headers(incomingHeaders)\n\n    // Add range-related headers from the result\n    for (const [key, value] of Object.entries(rangeResult.headers)) {\n      headers.append(key, value)\n    }\n\n    // Add Azure-specific headers\n    headers.append('Content-Type', String(properties.contentType))\n    if (properties.etag) {\n      headers.append('ETag', String(properties.etag))\n    }\n\n    // Apply a restrictive policy to XML-family responses served through Payload.\n    if (isXmlMimeType(properties.contentType)) {\n      headers.append('Content-Security-Policy', uploadContentSecurityPolicy)\n    }\n\n    const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match')\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 === properties.etag) {\n      return new Response(null, {\n        headers,\n        status: 304,\n      })\n    }\n\n    if (!blob.readableStreamBody || !isNodeReadableStream(blob.readableStreamBody)) {\n      return new Response('Internal Server Error', { status: 500 })\n    }\n\n    const stream = blob.readableStreamBody\n    stream.on('error', (err: Error) => {\n      req.payload.logger.error({\n        err,\n        msg: 'Error while streaming Azure blob (aborting)',\n      })\n      abortRequestAndDestroyStream({ abortController, blob })\n    })\n\n    streamed = true\n    return new Response(stream, { headers, status: rangeResult.status })\n  } catch (err: unknown) {\n    if (err instanceof RestError && err.statusCode === 404) {\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, blob })\n    }\n  }\n}\n"],"names":["RestError","buildStoragePathData","getFilePrefix","getDocPrefix","getRangeRequestInfo","isXmlMimeType","uploadContentSecurityPolicy","isNodeReadableStream","body","pipe","destroy","abortRequestAndDestroyStream","abortController","blob","abort","readableStreamBody","getFile","client","collection","collectionPrefix","doc","filename","incomingHeaders","req","uploadReference","useCompositePrefixes","undefined","streamed","AbortController","signal","addEventListener","docPrefix","storageFilePath","blockBlobClient","getBlockBlobClient","properties","getProperties","fileSize","contentLength","Response","status","rangeHeader","headers","get","rangeResult","type","Headers","download","rangeStart","rangeEnd","abortSignal","key","value","Object","entries","append","String","contentType","etag","etagFromHeaders","upload","modifyResponseHeaders","stream","on","err","payload","logger","error","msg","statusCode","statusText"],"mappings":"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"}