@payloadcms/storage-azure 4.0.0-canary.34 → 4.0.0-canary.36
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.d.ts +0 -10
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +14 -2
- package/dist/index.js.map +1 -1
- package/package.json +4 -4
- package/dist/adapter.spec.d.ts +0 -2
- package/dist/adapter.spec.d.ts.map +0 -1
- package/dist/adapter.spec.js +0 -54
- package/dist/adapter.spec.js.map +0 -1
- package/dist/client/handleAzureUpload.spec.d.ts +0 -2
- package/dist/client/handleAzureUpload.spec.d.ts.map +0 -1
- package/dist/client/handleAzureUpload.spec.js +0 -65
- package/dist/client/handleAzureUpload.spec.js.map +0 -1
- package/dist/generateUploadInstructions.createOnly.spec.d.ts +0 -2
- package/dist/generateUploadInstructions.createOnly.spec.d.ts.map +0 -1
- package/dist/generateUploadInstructions.createOnly.spec.js +0 -63
- package/dist/generateUploadInstructions.createOnly.spec.js.map +0 -1
- package/dist/generateUploadInstructions.spec.d.ts +0 -2
- package/dist/generateUploadInstructions.spec.d.ts.map +0 -1
- package/dist/generateUploadInstructions.spec.js +0 -72
- package/dist/generateUploadInstructions.spec.js.map +0 -1
- package/dist/index.spec.d.ts +0 -2
- package/dist/index.spec.d.ts.map +0 -1
- package/dist/index.spec.js +0 -80
- package/dist/index.spec.js.map +0 -1
package/dist/index.d.ts
CHANGED
|
@@ -8,16 +8,6 @@ export type AzureStorageOptions = {
|
|
|
8
8
|
* @default false
|
|
9
9
|
*/
|
|
10
10
|
allowContainerCreate: boolean;
|
|
11
|
-
/**
|
|
12
|
-
* When enabled, fields (like the prefix field) will always be inserted into
|
|
13
|
-
* the collection schema regardless of whether the plugin is enabled. This
|
|
14
|
-
* ensures a consistent schema across all environments.
|
|
15
|
-
*
|
|
16
|
-
* This will be enabled by default in Payload v4.
|
|
17
|
-
*
|
|
18
|
-
* @default false
|
|
19
|
-
*/
|
|
20
|
-
alwaysInsertFields?: boolean;
|
|
21
11
|
/**
|
|
22
12
|
* Base URL for the Azure Blob storage account
|
|
23
13
|
*/
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,mBAAmB,EAEnB,iBAAiB,EAClB,MAAM,wCAAwC,CAAA;AAC/C,OAAO,KAAK,EAAU,cAAc,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAK3E,OAAO,EAAE,gBAAgB,IAAI,oBAAoB,EAAE,MAAM,6BAA6B,CAAA;AAEtF,MAAM,MAAM,mBAAmB,GAAG;IAChC;;;;OAIG;IACH,oBAAoB,EAAE,OAAO,CAAA;IAE7B
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,mBAAmB,EAEnB,iBAAiB,EAClB,MAAM,wCAAwC,CAAA;AAC/C,OAAO,KAAK,EAAU,cAAc,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAK3E,OAAO,EAAE,gBAAgB,IAAI,oBAAoB,EAAE,MAAM,6BAA6B,CAAA;AAEtF,MAAM,MAAM,mBAAmB,GAAG;IAChC;;;;OAIG;IACH,oBAAoB,EAAE,OAAO,CAAA;IAE7B;;OAEG;IACH,OAAO,EAAE,MAAM,CAAA;IAEf;;;;;OAKG;IACH,cAAc,CAAC,EAAE,MAAM,CAAA;IAEvB;;;;;;;;OAQG;IACH,aAAa,CAAC,EAAE,mBAAmB,CAAA;IAEnC;;OAEG;IACH,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,oBAAoB,EAAE,IAAI,CAAC,iBAAiB,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC,CAAC,CAAA;IAE7F;;OAEG;IACH,gBAAgB,EAAE,MAAM,CAAA;IAExB;;;;;;;;;;;;;OAaG;IACH,eAAe,CAAC,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS,CAAA;IAElD;;OAEG;IACH,aAAa,EAAE,MAAM,CAAA;IAErB;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB;;;;;;;;;;;;;OAaG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B,CAAA;AAED,KAAK,mBAAmB,GAAG,CAAC,gBAAgB,EAAE,mBAAmB,KAAK,cAAc,CAAA;AAEpF,eAAO,MAAM,YAAY,EAAE,mBAiGzB,CAAA;AAEF,OAAO,EAAE,oBAAoB,IAAI,gBAAgB,EAAE,CAAA"}
|
package/dist/index.js
CHANGED
|
@@ -11,7 +11,20 @@ export const azureStorage = (azureStorageOptions)=>({
|
|
|
11
11
|
});
|
|
12
12
|
const isPluginDisabled = azureStorageOptions.enabled === false;
|
|
13
13
|
if (isPluginDisabled) {
|
|
14
|
-
|
|
14
|
+
// Still call cloudStoragePlugin with adapter: null so fields (like prefix) are
|
|
15
|
+
// inserted into the schema, keeping it consistent across environments.
|
|
16
|
+
const collectionsWithoutAdapter = Object.entries(azureStorageOptions.collections).reduce((acc, [slug, collOptions])=>({
|
|
17
|
+
...acc,
|
|
18
|
+
[slug]: {
|
|
19
|
+
...collOptions === true ? {} : collOptions,
|
|
20
|
+
adapter: null
|
|
21
|
+
}
|
|
22
|
+
}), {});
|
|
23
|
+
return cloudStoragePlugin({
|
|
24
|
+
collections: collectionsWithoutAdapter,
|
|
25
|
+
enabled: false,
|
|
26
|
+
useCompositePrefixes: azureStorageOptions.useCompositePrefixes
|
|
27
|
+
})(incomingConfig);
|
|
15
28
|
}
|
|
16
29
|
const createContainerIfNotExists = async ()=>{
|
|
17
30
|
const containerClient = getStorageClientFunc({
|
|
@@ -62,7 +75,6 @@ export const azureStorage = (azureStorageOptions)=>({
|
|
|
62
75
|
})
|
|
63
76
|
};
|
|
64
77
|
return cloudStoragePlugin({
|
|
65
|
-
alwaysInsertFields: azureStorageOptions.alwaysInsertFields,
|
|
66
78
|
collections: collectionsWithAdapter,
|
|
67
79
|
useCompositePrefixes: azureStorageOptions.useCompositePrefixes
|
|
68
80
|
})(config);
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import type {\n ClientUploadsConfig,\n PluginOptions as CloudStoragePluginOptions,\n CollectionOptions,\n} from '@payloadcms/plugin-cloud-storage/types'\nimport type { Config, StorageAdapter, UploadCollectionSlug } from 'payload'\n\nimport { cloudStoragePlugin } from '@payloadcms/plugin-cloud-storage'\n\nimport { createAzureAdapter } from './adapter.js'\nimport { getStorageClient as getStorageClientFunc } from './utils/getStorageClient.js'\n\nexport type AzureStorageOptions = {\n /**\n * Whether or not to allow the container to be created if it does not exist\n *\n * @default false\n */\n allowContainerCreate: boolean\n\n /**\n *
|
|
1
|
+
{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import type {\n ClientUploadsConfig,\n PluginOptions as CloudStoragePluginOptions,\n CollectionOptions,\n} from '@payloadcms/plugin-cloud-storage/types'\nimport type { Config, StorageAdapter, UploadCollectionSlug } from 'payload'\n\nimport { cloudStoragePlugin } from '@payloadcms/plugin-cloud-storage'\n\nimport { createAzureAdapter } from './adapter.js'\nimport { getStorageClient as getStorageClientFunc } from './utils/getStorageClient.js'\n\nexport type AzureStorageOptions = {\n /**\n * Whether or not to allow the container to be created if it does not exist\n *\n * @default false\n */\n allowContainerCreate: boolean\n\n /**\n * Base URL for the Azure Blob storage account\n */\n baseURL: string\n\n /**\n * Optional cache key to identify the Azure Blob storage client instance.\n * If not provided, a default key will be used.\n *\n * @default `azure:containerName`\n */\n clientCacheKey?: string\n\n /**\n * Do uploads directly on the client to bypass limits on Vercel.\n *\n * Client uploads use the Azure Blob SDK, which splits large files into blocks\n * (avoiding the ~5GB limit of a single upload request). The SDK sends `x-ms-*`\n * headers, so the browser issues a CORS preflight: your storage account's CORS\n * rules must allow the `OPTIONS` and `PUT` methods and the required headers\n * (allowed headers `*`, or at minimum `x-ms-*,content-type,content-length`).\n */\n clientUploads?: ClientUploadsConfig\n\n /**\n * Collection options to apply the Azure Blob adapter to.\n */\n collections: Partial<Record<UploadCollectionSlug, Omit<CollectionOptions, 'adapter'> | true>>\n\n /**\n * Azure Blob storage connection string\n */\n connectionString: string\n\n /**\n * Public access level applied to a container that the plugin creates via\n * `allowContainerCreate`. Has no effect on containers that already exist.\n *\n * - `'private'` (default): no anonymous access. Blobs are reachable only\n * through Payload's access-controlled file route.\n * - `'blob'`: unauthenticated clients can read any blob directly from Azure.\n * - `'container'`: unauthenticated clients can read and list blobs directly.\n *\n * Only choose `'blob'` or `'container'` if you deliberately want files served\n * publicly from Azure, bypassing Payload read access control.\n *\n * @default 'private'\n */\n containerAccess?: 'blob' | 'container' | 'private'\n\n /**\n * Azure Blob storage container name\n */\n containerName: string\n\n /**\n * Whether or not to enable the plugin\n *\n * Default: true\n */\n enabled?: boolean\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 AzureStorageFactory = (azureStorageArgs: AzureStorageOptions) => StorageAdapter\n\nexport const azureStorage: AzureStorageFactory = (\n azureStorageOptions: AzureStorageOptions,\n): StorageAdapter => ({\n name: 'azure',\n collections: Object.keys(azureStorageOptions.collections),\n init: (incomingConfig: Config): Config => {\n const getStorageClient = () =>\n getStorageClientFunc({\n connectionString: azureStorageOptions.connectionString,\n containerName: azureStorageOptions.containerName,\n })\n\n const isPluginDisabled = azureStorageOptions.enabled === false\n\n if (isPluginDisabled) {\n // Still call cloudStoragePlugin with adapter: null so fields (like prefix) are\n // inserted into the schema, keeping it consistent across environments.\n const collectionsWithoutAdapter: CloudStoragePluginOptions['collections'] = Object.entries(\n azureStorageOptions.collections,\n ).reduce(\n (acc, [slug, collOptions]) => ({\n ...acc,\n [slug]: { ...(collOptions === true ? {} : collOptions), adapter: null },\n }),\n {} as Record<string, CollectionOptions>,\n )\n\n return cloudStoragePlugin({\n collections: collectionsWithoutAdapter,\n enabled: false,\n useCompositePrefixes: azureStorageOptions.useCompositePrefixes,\n })(incomingConfig)\n }\n\n const createContainerIfNotExists = async (): Promise<void> => {\n const containerClient = getStorageClientFunc({\n connectionString: azureStorageOptions.connectionString,\n containerName: azureStorageOptions.containerName,\n })\n\n // Private by default; public access is opt-in via `containerAccess`.\n const containerAccess = azureStorageOptions.containerAccess ?? 'private'\n\n if (containerAccess === 'private') {\n await containerClient.createIfNotExists()\n } else {\n await containerClient.createIfNotExists({ access: containerAccess })\n }\n }\n\n const adapter = createAzureAdapter({\n allowContainerCreate: azureStorageOptions.allowContainerCreate,\n baseURL: azureStorageOptions.baseURL,\n clientUploads: azureStorageOptions.clientUploads,\n containerName: azureStorageOptions.containerName,\n createContainerIfNotExists,\n getStorageClient,\n useCompositePrefixes: azureStorageOptions.useCompositePrefixes,\n })\n\n // Add adapter to each collection option object\n const collectionsWithAdapter: CloudStoragePluginOptions['collections'] = Object.entries(\n azureStorageOptions.collections,\n ).reduce(\n (acc, [slug, collOptions]) => ({\n ...acc,\n [slug]: {\n ...(collOptions === true ? {} : collOptions),\n adapter,\n },\n }),\n {} as Record<string, CollectionOptions>,\n )\n\n // Set disableLocalStorage: true for collections specified in the plugin options\n const config = {\n ...incomingConfig,\n collections: (incomingConfig.collections || []).map((collection) => {\n if (!collectionsWithAdapter[collection.slug]) {\n return collection\n }\n\n return {\n ...collection,\n upload: {\n ...(typeof collection.upload === 'object' ? collection.upload : {}),\n disableLocalStorage: true,\n },\n }\n }),\n }\n\n return cloudStoragePlugin({\n collections: collectionsWithAdapter,\n useCompositePrefixes: azureStorageOptions.useCompositePrefixes,\n })(config)\n },\n})\n\nexport { getStorageClientFunc as getStorageClient }\n"],"names":["cloudStoragePlugin","createAzureAdapter","getStorageClient","getStorageClientFunc","azureStorage","azureStorageOptions","name","collections","Object","keys","init","incomingConfig","connectionString","containerName","isPluginDisabled","enabled","collectionsWithoutAdapter","entries","reduce","acc","slug","collOptions","adapter","useCompositePrefixes","createContainerIfNotExists","containerClient","containerAccess","createIfNotExists","access","allowContainerCreate","baseURL","clientUploads","collectionsWithAdapter","config","map","collection","upload","disableLocalStorage"],"mappings":"AAOA,SAASA,kBAAkB,QAAQ,mCAAkC;AAErE,SAASC,kBAAkB,QAAQ,eAAc;AACjD,SAASC,oBAAoBC,oBAAoB,QAAQ,8BAA6B;AA0FtF,OAAO,MAAMC,eAAoC,CAC/CC,sBACoB,CAAA;QACpBC,MAAM;QACNC,aAAaC,OAAOC,IAAI,CAACJ,oBAAoBE,WAAW;QACxDG,MAAM,CAACC;YACL,MAAMT,mBAAmB,IACvBC,qBAAqB;oBACnBS,kBAAkBP,oBAAoBO,gBAAgB;oBACtDC,eAAeR,oBAAoBQ,aAAa;gBAClD;YAEF,MAAMC,mBAAmBT,oBAAoBU,OAAO,KAAK;YAEzD,IAAID,kBAAkB;gBACpB,+EAA+E;gBAC/E,uEAAuE;gBACvE,MAAME,4BAAsER,OAAOS,OAAO,CACxFZ,oBAAoBE,WAAW,EAC/BW,MAAM,CACN,CAACC,KAAK,CAACC,MAAMC,YAAY,GAAM,CAAA;wBAC7B,GAAGF,GAAG;wBACN,CAACC,KAAK,EAAE;4BAAE,GAAIC,gBAAgB,OAAO,CAAC,IAAIA,WAAW;4BAAGC,SAAS;wBAAK;oBACxE,CAAA,GACA,CAAC;gBAGH,OAAOtB,mBAAmB;oBACxBO,aAAaS;oBACbD,SAAS;oBACTQ,sBAAsBlB,oBAAoBkB,oBAAoB;gBAChE,GAAGZ;YACL;YAEA,MAAMa,6BAA6B;gBACjC,MAAMC,kBAAkBtB,qBAAqB;oBAC3CS,kBAAkBP,oBAAoBO,gBAAgB;oBACtDC,eAAeR,oBAAoBQ,aAAa;gBAClD;gBAEA,qEAAqE;gBACrE,MAAMa,kBAAkBrB,oBAAoBqB,eAAe,IAAI;gBAE/D,IAAIA,oBAAoB,WAAW;oBACjC,MAAMD,gBAAgBE,iBAAiB;gBACzC,OAAO;oBACL,MAAMF,gBAAgBE,iBAAiB,CAAC;wBAAEC,QAAQF;oBAAgB;gBACpE;YACF;YAEA,MAAMJ,UAAUrB,mBAAmB;gBACjC4B,sBAAsBxB,oBAAoBwB,oBAAoB;gBAC9DC,SAASzB,oBAAoByB,OAAO;gBACpCC,eAAe1B,oBAAoB0B,aAAa;gBAChDlB,eAAeR,oBAAoBQ,aAAa;gBAChDW;gBACAtB;gBACAqB,sBAAsBlB,oBAAoBkB,oBAAoB;YAChE;YAEA,+CAA+C;YAC/C,MAAMS,yBAAmExB,OAAOS,OAAO,CACrFZ,oBAAoBE,WAAW,EAC/BW,MAAM,CACN,CAACC,KAAK,CAACC,MAAMC,YAAY,GAAM,CAAA;oBAC7B,GAAGF,GAAG;oBACN,CAACC,KAAK,EAAE;wBACN,GAAIC,gBAAgB,OAAO,CAAC,IAAIA,WAAW;wBAC3CC;oBACF;gBACF,CAAA,GACA,CAAC;YAGH,gFAAgF;YAChF,MAAMW,SAAS;gBACb,GAAGtB,cAAc;gBACjBJ,aAAa,AAACI,CAAAA,eAAeJ,WAAW,IAAI,EAAE,AAAD,EAAG2B,GAAG,CAAC,CAACC;oBACnD,IAAI,CAACH,sBAAsB,CAACG,WAAWf,IAAI,CAAC,EAAE;wBAC5C,OAAOe;oBACT;oBAEA,OAAO;wBACL,GAAGA,UAAU;wBACbC,QAAQ;4BACN,GAAI,OAAOD,WAAWC,MAAM,KAAK,WAAWD,WAAWC,MAAM,GAAG,CAAC,CAAC;4BAClEC,qBAAqB;wBACvB;oBACF;gBACF;YACF;YAEA,OAAOrC,mBAAmB;gBACxBO,aAAayB;gBACbT,sBAAsBlB,oBAAoBkB,oBAAoB;YAChE,GAAGU;QACL;IACF,CAAA,EAAE;AAEF,SAAS9B,wBAAwBD,gBAAgB,GAAE"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@payloadcms/storage-azure",
|
|
3
|
-
"version": "4.0.0-canary.
|
|
3
|
+
"version": "4.0.0-canary.36",
|
|
4
4
|
"description": "Payload storage adapter for Azure Blob Storage",
|
|
5
5
|
"homepage": "https://payloadcms.com",
|
|
6
6
|
"repository": {
|
|
@@ -39,13 +39,13 @@
|
|
|
39
39
|
"dependencies": {
|
|
40
40
|
"@azure/abort-controller": "^1.1.0",
|
|
41
41
|
"@azure/storage-blob": "^12.33.0",
|
|
42
|
-
"@payloadcms/plugin-cloud-storage": "4.0.0-canary.
|
|
42
|
+
"@payloadcms/plugin-cloud-storage": "4.0.0-canary.36"
|
|
43
43
|
},
|
|
44
44
|
"devDependencies": {
|
|
45
|
-
"payload": "4.0.0-canary.
|
|
45
|
+
"payload": "4.0.0-canary.36"
|
|
46
46
|
},
|
|
47
47
|
"peerDependencies": {
|
|
48
|
-
"payload": "4.0.0-canary.
|
|
48
|
+
"payload": "4.0.0-canary.36"
|
|
49
49
|
},
|
|
50
50
|
"engines": {
|
|
51
51
|
"node": ">=24.15.0"
|
package/dist/adapter.spec.d.ts
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.spec.d.ts","sourceRoot":"","sources":["../src/adapter.spec.ts"],"names":[],"mappings":""}
|
package/dist/adapter.spec.js
DELETED
|
@@ -1,54 +0,0 @@
|
|
|
1
|
-
import { describe, expect, it, vi } from 'vitest';
|
|
2
|
-
import { createAzureAdapter } from './adapter.js';
|
|
3
|
-
const createAdapter = ()=>createAzureAdapter({
|
|
4
|
-
allowContainerCreate: false,
|
|
5
|
-
baseURL: 'https://account.blob.core.windows.net',
|
|
6
|
-
clientUploads: true,
|
|
7
|
-
containerName: 'media',
|
|
8
|
-
createContainerIfNotExists: vi.fn(),
|
|
9
|
-
getStorageClient: vi.fn()
|
|
10
|
-
});
|
|
11
|
-
describe('Azure client uploads', ()=>{
|
|
12
|
-
it.each([
|
|
13
|
-
[
|
|
14
|
-
'secure defaults',
|
|
15
|
-
{
|
|
16
|
-
upload: true
|
|
17
|
-
},
|
|
18
|
-
false
|
|
19
|
-
],
|
|
20
|
-
[
|
|
21
|
-
'explicit opt-out',
|
|
22
|
-
{
|
|
23
|
-
upload: {
|
|
24
|
-
allowRestrictedFileTypes: true
|
|
25
|
-
}
|
|
26
|
-
},
|
|
27
|
-
true
|
|
28
|
-
]
|
|
29
|
-
])('should use server uploads for %s', (_, collection, expected)=>{
|
|
30
|
-
const adapter = createAdapter()({
|
|
31
|
-
collection: collection,
|
|
32
|
-
prefix: ''
|
|
33
|
-
});
|
|
34
|
-
expect(adapter.uploadInstructions?.enabled).toBe(expected);
|
|
35
|
-
});
|
|
36
|
-
});
|
|
37
|
-
it('should generate a public URL for the stored legacy prefix', ()=>{
|
|
38
|
-
const collection = {
|
|
39
|
-
slug: 'media',
|
|
40
|
-
fields: []
|
|
41
|
-
};
|
|
42
|
-
const adapter = createAdapter()({
|
|
43
|
-
collection,
|
|
44
|
-
prefix: 'uploads'
|
|
45
|
-
});
|
|
46
|
-
expect(adapter.generateURL({
|
|
47
|
-
collection,
|
|
48
|
-
data: {},
|
|
49
|
-
filename: 'file.png',
|
|
50
|
-
prefix: 'legacy'
|
|
51
|
-
})).toBe('https://account.blob.core.windows.net/media/legacy/file.png');
|
|
52
|
-
});
|
|
53
|
-
|
|
54
|
-
//# sourceMappingURL=adapter.spec.js.map
|
package/dist/adapter.spec.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/adapter.spec.ts"],"sourcesContent":["import type { CollectionConfig } from 'payload'\n\nimport { describe, expect, it, vi } from 'vitest'\n\nimport { createAzureAdapter } from './adapter.js'\n\nconst createAdapter = () =>\n createAzureAdapter({\n allowContainerCreate: false,\n baseURL: 'https://account.blob.core.windows.net',\n clientUploads: true,\n containerName: 'media',\n createContainerIfNotExists: vi.fn(),\n getStorageClient: vi.fn(),\n })\n\ndescribe('Azure client uploads', () => {\n it.each([\n ['secure defaults', { upload: true }, false],\n ['explicit opt-out', { upload: { allowRestrictedFileTypes: true } }, true],\n ])('should use server uploads for %s', (_, collection, expected) => {\n const adapter = createAdapter()({\n collection: collection as unknown as CollectionConfig,\n prefix: '',\n })\n\n expect(adapter.uploadInstructions?.enabled).toBe(expected)\n })\n})\n\nit('should generate a public URL for the stored legacy prefix', () => {\n const collection: CollectionConfig = { slug: 'media', fields: [] }\n const adapter = createAdapter()({\n collection,\n prefix: 'uploads',\n })\n\n expect(\n adapter.generateURL!({ collection, data: {}, filename: 'file.png', prefix: 'legacy' }),\n ).toBe('https://account.blob.core.windows.net/media/legacy/file.png')\n})\n"],"names":["describe","expect","it","vi","createAzureAdapter","createAdapter","allowContainerCreate","baseURL","clientUploads","containerName","createContainerIfNotExists","fn","getStorageClient","each","upload","allowRestrictedFileTypes","_","collection","expected","adapter","prefix","uploadInstructions","enabled","toBe","slug","fields","generateURL","data","filename"],"mappings":"AAEA,SAASA,QAAQ,EAAEC,MAAM,EAAEC,EAAE,EAAEC,EAAE,QAAQ,SAAQ;AAEjD,SAASC,kBAAkB,QAAQ,eAAc;AAEjD,MAAMC,gBAAgB,IACpBD,mBAAmB;QACjBE,sBAAsB;QACtBC,SAAS;QACTC,eAAe;QACfC,eAAe;QACfC,4BAA4BP,GAAGQ,EAAE;QACjCC,kBAAkBT,GAAGQ,EAAE;IACzB;AAEFX,SAAS,wBAAwB;IAC/BE,GAAGW,IAAI,CAAC;QACN;YAAC;YAAmB;gBAAEC,QAAQ;YAAK;YAAG;SAAM;QAC5C;YAAC;YAAoB;gBAAEA,QAAQ;oBAAEC,0BAA0B;gBAAK;YAAE;YAAG;SAAK;KAC3E,EAAE,oCAAoC,CAACC,GAAGC,YAAYC;QACrD,MAAMC,UAAUd,gBAAgB;YAC9BY,YAAYA;YACZG,QAAQ;QACV;QAEAnB,OAAOkB,QAAQE,kBAAkB,EAAEC,SAASC,IAAI,CAACL;IACnD;AACF;AAEAhB,GAAG,6DAA6D;IAC9D,MAAMe,aAA+B;QAAEO,MAAM;QAASC,QAAQ,EAAE;IAAC;IACjE,MAAMN,UAAUd,gBAAgB;QAC9BY;QACAG,QAAQ;IACV;IAEAnB,OACEkB,QAAQO,WAAW,CAAE;QAAET;QAAYU,MAAM,CAAC;QAAGC,UAAU;QAAYR,QAAQ;IAAS,IACpFG,IAAI,CAAC;AACT"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"handleAzureUpload.spec.d.ts","sourceRoot":"","sources":["../../src/client/handleAzureUpload.spec.ts"],"names":[],"mappings":""}
|
|
@@ -1,65 +0,0 @@
|
|
|
1
|
-
import { beforeEach, describe, expect, it, vi } from 'vitest';
|
|
2
|
-
const uploadDataMock = vi.fn();
|
|
3
|
-
const blockBlobClientMock = vi.fn(function() {
|
|
4
|
-
return {
|
|
5
|
-
uploadData: uploadDataMock
|
|
6
|
-
};
|
|
7
|
-
});
|
|
8
|
-
vi.mock('@azure/storage-blob', ()=>({
|
|
9
|
-
BlockBlobClient: blockBlobClientMock
|
|
10
|
-
}));
|
|
11
|
-
import { handleAzureUpload } from './handleAzureUpload.js';
|
|
12
|
-
const signedURL = 'https://account.blob.core.windows.net/container/file.png?sig=abc';
|
|
13
|
-
const createFile = ()=>new File([
|
|
14
|
-
new Uint8Array([
|
|
15
|
-
1,
|
|
16
|
-
2,
|
|
17
|
-
3
|
|
18
|
-
])
|
|
19
|
-
], 'file.png', {
|
|
20
|
-
type: 'image/png'
|
|
21
|
-
});
|
|
22
|
-
describe('handleAzureUpload', ()=>{
|
|
23
|
-
beforeEach(()=>{
|
|
24
|
-
vi.clearAllMocks();
|
|
25
|
-
uploadDataMock.mockResolvedValue(undefined);
|
|
26
|
-
});
|
|
27
|
-
it('should upload via BlockBlobClient.uploadData', async ()=>{
|
|
28
|
-
const file = createFile();
|
|
29
|
-
await handleAzureUpload({
|
|
30
|
-
data: {
|
|
31
|
-
url: signedURL
|
|
32
|
-
},
|
|
33
|
-
file
|
|
34
|
-
});
|
|
35
|
-
expect(blockBlobClientMock).toHaveBeenCalledWith(signedURL);
|
|
36
|
-
expect(uploadDataMock).toHaveBeenCalledTimes(1);
|
|
37
|
-
const [uploadedFile, options] = uploadDataMock.mock.calls[0];
|
|
38
|
-
expect(uploadedFile).toBe(file);
|
|
39
|
-
expect(options.blockSize).toBeGreaterThan(0);
|
|
40
|
-
expect(options.concurrency).toBeGreaterThan(0);
|
|
41
|
-
});
|
|
42
|
-
it('should pass the file content type to the blob headers', async ()=>{
|
|
43
|
-
await handleAzureUpload({
|
|
44
|
-
data: {
|
|
45
|
-
url: signedURL
|
|
46
|
-
},
|
|
47
|
-
file: createFile()
|
|
48
|
-
});
|
|
49
|
-
const [, options] = uploadDataMock.mock.calls[0];
|
|
50
|
-
expect(options.blobHTTPHeaders).toEqual({
|
|
51
|
-
blobContentType: 'image/png'
|
|
52
|
-
});
|
|
53
|
-
});
|
|
54
|
-
it('should propagate errors from uploadData', async ()=>{
|
|
55
|
-
uploadDataMock.mockRejectedValue(new Error('block upload failed'));
|
|
56
|
-
await expect(handleAzureUpload({
|
|
57
|
-
data: {
|
|
58
|
-
url: signedURL
|
|
59
|
-
},
|
|
60
|
-
file: createFile()
|
|
61
|
-
})).rejects.toThrow('block upload failed');
|
|
62
|
-
});
|
|
63
|
-
});
|
|
64
|
-
|
|
65
|
-
//# sourceMappingURL=handleAzureUpload.spec.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/client/handleAzureUpload.spec.ts"],"sourcesContent":["import { beforeEach, describe, expect, it, vi } from 'vitest'\n\nconst uploadDataMock = vi.fn()\nconst blockBlobClientMock = vi.fn(function () {\n return { uploadData: uploadDataMock }\n})\n\nvi.mock('@azure/storage-blob', () => ({\n BlockBlobClient: blockBlobClientMock,\n}))\n\nimport { handleAzureUpload } from './handleAzureUpload.js'\n\nconst signedURL = 'https://account.blob.core.windows.net/container/file.png?sig=abc'\n\nconst createFile = () => new File([new Uint8Array([1, 2, 3])], 'file.png', { type: 'image/png' })\n\ndescribe('handleAzureUpload', () => {\n beforeEach(() => {\n vi.clearAllMocks()\n uploadDataMock.mockResolvedValue(undefined)\n })\n\n it('should upload via BlockBlobClient.uploadData', async () => {\n const file = createFile()\n\n await handleAzureUpload({ data: { url: signedURL }, file })\n\n expect(blockBlobClientMock).toHaveBeenCalledWith(signedURL)\n expect(uploadDataMock).toHaveBeenCalledTimes(1)\n\n const [uploadedFile, options] = uploadDataMock.mock.calls[0]!\n expect(uploadedFile).toBe(file)\n expect(options.blockSize).toBeGreaterThan(0)\n expect(options.concurrency).toBeGreaterThan(0)\n })\n\n it('should pass the file content type to the blob headers', async () => {\n await handleAzureUpload({ data: { url: signedURL }, file: createFile() })\n\n const [, options] = uploadDataMock.mock.calls[0]!\n expect(options.blobHTTPHeaders).toEqual({ blobContentType: 'image/png' })\n })\n\n it('should propagate errors from uploadData', async () => {\n uploadDataMock.mockRejectedValue(new Error('block upload failed'))\n\n await expect(\n handleAzureUpload({ data: { url: signedURL }, file: createFile() }),\n ).rejects.toThrow('block upload failed')\n })\n})\n"],"names":["beforeEach","describe","expect","it","vi","uploadDataMock","fn","blockBlobClientMock","uploadData","mock","BlockBlobClient","handleAzureUpload","signedURL","createFile","File","Uint8Array","type","clearAllMocks","mockResolvedValue","undefined","file","data","url","toHaveBeenCalledWith","toHaveBeenCalledTimes","uploadedFile","options","calls","toBe","blockSize","toBeGreaterThan","concurrency","blobHTTPHeaders","toEqual","blobContentType","mockRejectedValue","Error","rejects","toThrow"],"mappings":"AAAA,SAASA,UAAU,EAAEC,QAAQ,EAAEC,MAAM,EAAEC,EAAE,EAAEC,EAAE,QAAQ,SAAQ;AAE7D,MAAMC,iBAAiBD,GAAGE,EAAE;AAC5B,MAAMC,sBAAsBH,GAAGE,EAAE,CAAC;IAChC,OAAO;QAAEE,YAAYH;IAAe;AACtC;AAEAD,GAAGK,IAAI,CAAC,uBAAuB,IAAO,CAAA;QACpCC,iBAAiBH;IACnB,CAAA;AAEA,SAASI,iBAAiB,QAAQ,yBAAwB;AAE1D,MAAMC,YAAY;AAElB,MAAMC,aAAa,IAAM,IAAIC,KAAK;QAAC,IAAIC,WAAW;YAAC;YAAG;YAAG;SAAE;KAAE,EAAE,YAAY;QAAEC,MAAM;IAAY;AAE/Ff,SAAS,qBAAqB;IAC5BD,WAAW;QACTI,GAAGa,aAAa;QAChBZ,eAAea,iBAAiB,CAACC;IACnC;IAEAhB,GAAG,gDAAgD;QACjD,MAAMiB,OAAOP;QAEb,MAAMF,kBAAkB;YAAEU,MAAM;gBAAEC,KAAKV;YAAU;YAAGQ;QAAK;QAEzDlB,OAAOK,qBAAqBgB,oBAAoB,CAACX;QACjDV,OAAOG,gBAAgBmB,qBAAqB,CAAC;QAE7C,MAAM,CAACC,cAAcC,QAAQ,GAAGrB,eAAeI,IAAI,CAACkB,KAAK,CAAC,EAAE;QAC5DzB,OAAOuB,cAAcG,IAAI,CAACR;QAC1BlB,OAAOwB,QAAQG,SAAS,EAAEC,eAAe,CAAC;QAC1C5B,OAAOwB,QAAQK,WAAW,EAAED,eAAe,CAAC;IAC9C;IAEA3B,GAAG,yDAAyD;QAC1D,MAAMQ,kBAAkB;YAAEU,MAAM;gBAAEC,KAAKV;YAAU;YAAGQ,MAAMP;QAAa;QAEvE,MAAM,GAAGa,QAAQ,GAAGrB,eAAeI,IAAI,CAACkB,KAAK,CAAC,EAAE;QAChDzB,OAAOwB,QAAQM,eAAe,EAAEC,OAAO,CAAC;YAAEC,iBAAiB;QAAY;IACzE;IAEA/B,GAAG,2CAA2C;QAC5CE,eAAe8B,iBAAiB,CAAC,IAAIC,MAAM;QAE3C,MAAMlC,OACJS,kBAAkB;YAAEU,MAAM;gBAAEC,KAAKV;YAAU;YAAGQ,MAAMP;QAAa,IACjEwB,OAAO,CAACC,OAAO,CAAC;IACpB;AACF"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"generateUploadInstructions.createOnly.spec.d.ts","sourceRoot":"","sources":["../src/generateUploadInstructions.createOnly.spec.ts"],"names":[],"mappings":""}
|
|
@@ -1,63 +0,0 @@
|
|
|
1
|
-
import { describe, expect, it, vi } from 'vitest';
|
|
2
|
-
const azureMocks = vi.hoisted(()=>({
|
|
3
|
-
generateBlobSASQueryParameters: vi.fn(()=>({
|
|
4
|
-
toString: ()=>'signature'
|
|
5
|
-
})),
|
|
6
|
-
parsePermissions: vi.fn(()=>({
|
|
7
|
-
create: true
|
|
8
|
-
}))
|
|
9
|
-
}));
|
|
10
|
-
vi.mock('@azure/storage-blob', ()=>({
|
|
11
|
-
BlobSASPermissions: {
|
|
12
|
-
parse: azureMocks.parsePermissions
|
|
13
|
-
},
|
|
14
|
-
generateBlobSASQueryParameters: azureMocks.generateBlobSASQueryParameters
|
|
15
|
-
}));
|
|
16
|
-
vi.mock('@payloadcms/plugin-cloud-storage/utilities', ()=>({
|
|
17
|
-
resolveSignedURLKey: vi.fn(async ()=>({
|
|
18
|
-
storageFilePath: 'reference.png',
|
|
19
|
-
sanitizedDocPrefix: '',
|
|
20
|
-
sanitizedFilename: 'reference.png'
|
|
21
|
-
}))
|
|
22
|
-
}));
|
|
23
|
-
import { generateUploadInstructions } from './generateUploadInstructions.js';
|
|
24
|
-
describe('generateUploadInstructions', ()=>{
|
|
25
|
-
it('should issue create-only Azure upload instructions', async ()=>{
|
|
26
|
-
const generate = generateUploadInstructions({
|
|
27
|
-
collectionPrefix: '',
|
|
28
|
-
containerName: 'media',
|
|
29
|
-
getStorageClient: ()=>({
|
|
30
|
-
credential: {},
|
|
31
|
-
getBlobClient: ()=>({
|
|
32
|
-
url: 'https://example.com/reference.png'
|
|
33
|
-
})
|
|
34
|
-
})
|
|
35
|
-
});
|
|
36
|
-
await generate({
|
|
37
|
-
collectionSlug: 'media',
|
|
38
|
-
filename: 'reference.png',
|
|
39
|
-
filesize: 100,
|
|
40
|
-
mimeType: 'image/png',
|
|
41
|
-
overrideAccess: true,
|
|
42
|
-
req: {
|
|
43
|
-
payload: {
|
|
44
|
-
collections: {
|
|
45
|
-
media: {
|
|
46
|
-
config: {
|
|
47
|
-
upload: {
|
|
48
|
-
allowRestrictedFileTypes: true
|
|
49
|
-
}
|
|
50
|
-
}
|
|
51
|
-
}
|
|
52
|
-
}
|
|
53
|
-
}
|
|
54
|
-
}
|
|
55
|
-
});
|
|
56
|
-
expect(azureMocks.parsePermissions).toHaveBeenCalledExactlyOnceWith('c');
|
|
57
|
-
expect(azureMocks.generateBlobSASQueryParameters).toHaveBeenCalledWith(expect.objectContaining({
|
|
58
|
-
version: '2026-04-06'
|
|
59
|
-
}), expect.anything());
|
|
60
|
-
});
|
|
61
|
-
});
|
|
62
|
-
|
|
63
|
-
//# sourceMappingURL=generateUploadInstructions.createOnly.spec.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/generateUploadInstructions.createOnly.spec.ts"],"sourcesContent":["import type { ContainerClient } from '@azure/storage-blob'\nimport type { PayloadRequest } from 'payload'\n\nimport { describe, expect, it, vi } from 'vitest'\n\nconst azureMocks = vi.hoisted(() => ({\n generateBlobSASQueryParameters: vi.fn(() => ({ toString: () => 'signature' })),\n parsePermissions: vi.fn(() => ({ create: true })),\n}))\n\nvi.mock('@azure/storage-blob', () => ({\n BlobSASPermissions: { parse: azureMocks.parsePermissions },\n generateBlobSASQueryParameters: azureMocks.generateBlobSASQueryParameters,\n}))\n\nvi.mock('@payloadcms/plugin-cloud-storage/utilities', () => ({\n resolveSignedURLKey: vi.fn(async () => ({\n storageFilePath: 'reference.png',\n sanitizedDocPrefix: '',\n sanitizedFilename: 'reference.png',\n })),\n}))\n\nimport { generateUploadInstructions } from './generateUploadInstructions.js'\n\ndescribe('generateUploadInstructions', () => {\n it('should issue create-only Azure upload instructions', async () => {\n const generate = generateUploadInstructions({\n collectionPrefix: '',\n containerName: 'media',\n getStorageClient: () =>\n ({\n credential: {},\n getBlobClient: () => ({ url: 'https://example.com/reference.png' }),\n }) as unknown as ContainerClient,\n })\n\n await generate({\n collectionSlug: 'media',\n filename: 'reference.png',\n filesize: 100,\n mimeType: 'image/png',\n overrideAccess: true,\n req: {\n payload: {\n collections: {\n media: {\n config: {\n upload: { allowRestrictedFileTypes: true },\n },\n },\n },\n },\n } as unknown as PayloadRequest,\n })\n\n expect(azureMocks.parsePermissions).toHaveBeenCalledExactlyOnceWith('c')\n expect(azureMocks.generateBlobSASQueryParameters).toHaveBeenCalledWith(\n expect.objectContaining({ version: '2026-04-06' }),\n expect.anything(),\n )\n })\n})\n"],"names":["describe","expect","it","vi","azureMocks","hoisted","generateBlobSASQueryParameters","fn","toString","parsePermissions","create","mock","BlobSASPermissions","parse","resolveSignedURLKey","storageFilePath","sanitizedDocPrefix","sanitizedFilename","generateUploadInstructions","generate","collectionPrefix","containerName","getStorageClient","credential","getBlobClient","url","collectionSlug","filename","filesize","mimeType","overrideAccess","req","payload","collections","media","config","upload","allowRestrictedFileTypes","toHaveBeenCalledExactlyOnceWith","toHaveBeenCalledWith","objectContaining","version","anything"],"mappings":"AAGA,SAASA,QAAQ,EAAEC,MAAM,EAAEC,EAAE,EAAEC,EAAE,QAAQ,SAAQ;AAEjD,MAAMC,aAAaD,GAAGE,OAAO,CAAC,IAAO,CAAA;QACnCC,gCAAgCH,GAAGI,EAAE,CAAC,IAAO,CAAA;gBAAEC,UAAU,IAAM;YAAY,CAAA;QAC3EC,kBAAkBN,GAAGI,EAAE,CAAC,IAAO,CAAA;gBAAEG,QAAQ;YAAK,CAAA;IAChD,CAAA;AAEAP,GAAGQ,IAAI,CAAC,uBAAuB,IAAO,CAAA;QACpCC,oBAAoB;YAAEC,OAAOT,WAAWK,gBAAgB;QAAC;QACzDH,gCAAgCF,WAAWE,8BAA8B;IAC3E,CAAA;AAEAH,GAAGQ,IAAI,CAAC,8CAA8C,IAAO,CAAA;QAC3DG,qBAAqBX,GAAGI,EAAE,CAAC,UAAa,CAAA;gBACtCQ,iBAAiB;gBACjBC,oBAAoB;gBACpBC,mBAAmB;YACrB,CAAA;IACF,CAAA;AAEA,SAASC,0BAA0B,QAAQ,kCAAiC;AAE5ElB,SAAS,8BAA8B;IACrCE,GAAG,sDAAsD;QACvD,MAAMiB,WAAWD,2BAA2B;YAC1CE,kBAAkB;YAClBC,eAAe;YACfC,kBAAkB,IACf,CAAA;oBACCC,YAAY,CAAC;oBACbC,eAAe,IAAO,CAAA;4BAAEC,KAAK;wBAAoC,CAAA;gBACnE,CAAA;QACJ;QAEA,MAAMN,SAAS;YACbO,gBAAgB;YAChBC,UAAU;YACVC,UAAU;YACVC,UAAU;YACVC,gBAAgB;YAChBC,KAAK;gBACHC,SAAS;oBACPC,aAAa;wBACXC,OAAO;4BACLC,QAAQ;gCACNC,QAAQ;oCAAEC,0BAA0B;gCAAK;4BAC3C;wBACF;oBACF;gBACF;YACF;QACF;QAEApC,OAAOG,WAAWK,gBAAgB,EAAE6B,+BAA+B,CAAC;QACpErC,OAAOG,WAAWE,8BAA8B,EAAEiC,oBAAoB,CACpEtC,OAAOuC,gBAAgB,CAAC;YAAEC,SAAS;QAAa,IAChDxC,OAAOyC,QAAQ;IAEnB;AACF"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"generateUploadInstructions.spec.d.ts","sourceRoot":"","sources":["../src/generateUploadInstructions.spec.ts"],"names":[],"mappings":""}
|
|
@@ -1,72 +0,0 @@
|
|
|
1
|
-
import { StorageSharedKeyCredential } from '@azure/storage-blob';
|
|
2
|
-
import { describe, expect, it, vi } from 'vitest';
|
|
3
|
-
import { generateUploadInstructions } from './generateUploadInstructions.js';
|
|
4
|
-
const createRequest = (allowRestrictedFileTypes)=>({
|
|
5
|
-
payload: {
|
|
6
|
-
collections: {
|
|
7
|
-
media: {
|
|
8
|
-
config: {
|
|
9
|
-
slug: 'media',
|
|
10
|
-
upload: {
|
|
11
|
-
allowRestrictedFileTypes
|
|
12
|
-
}
|
|
13
|
-
}
|
|
14
|
-
}
|
|
15
|
-
},
|
|
16
|
-
config: {
|
|
17
|
-
upload: {}
|
|
18
|
-
},
|
|
19
|
-
db: {
|
|
20
|
-
findOne: ()=>Promise.resolve(null)
|
|
21
|
-
}
|
|
22
|
-
},
|
|
23
|
-
user: {
|
|
24
|
-
id: 'user-id'
|
|
25
|
-
}
|
|
26
|
-
});
|
|
27
|
-
const createGenerator = (getStorageClient)=>generateUploadInstructions({
|
|
28
|
-
collectionPrefix: '',
|
|
29
|
-
containerName: 'media',
|
|
30
|
-
getStorageClient
|
|
31
|
-
});
|
|
32
|
-
describe('generateUploadInstructions', ()=>{
|
|
33
|
-
it('should use Payload uploads under secure defaults', async ()=>{
|
|
34
|
-
const getStorageClient = vi.fn();
|
|
35
|
-
await expect(createGenerator(getStorageClient)({
|
|
36
|
-
collectionSlug: 'media',
|
|
37
|
-
filename: 'reference.png',
|
|
38
|
-
filesize: 1,
|
|
39
|
-
mimeType: 'image/png',
|
|
40
|
-
overrideAccess: false,
|
|
41
|
-
req: createRequest(false)
|
|
42
|
-
})).rejects.toThrow('Azure client uploads require allowRestrictedFileTypes to be enabled.');
|
|
43
|
-
expect(getStorageClient).not.toHaveBeenCalled();
|
|
44
|
-
});
|
|
45
|
-
it('should generate direct instructions for the explicit opt-out', async ()=>{
|
|
46
|
-
const credential = new StorageSharedKeyCredential('account', Buffer.alloc(32, 'a').toString('base64'));
|
|
47
|
-
const getStorageClient = ()=>({
|
|
48
|
-
credential,
|
|
49
|
-
getBlobClient: (key)=>({
|
|
50
|
-
url: `https://account.blob.core.windows.net/media/${key}`
|
|
51
|
-
})
|
|
52
|
-
});
|
|
53
|
-
await expect(createGenerator(getStorageClient)({
|
|
54
|
-
collectionSlug: 'media',
|
|
55
|
-
filename: 'reference.png',
|
|
56
|
-
filesize: 1,
|
|
57
|
-
mimeType: 'image/png',
|
|
58
|
-
overrideAccess: false,
|
|
59
|
-
req: createRequest(true)
|
|
60
|
-
})).resolves.toMatchObject({
|
|
61
|
-
file: {
|
|
62
|
-
filename: 'reference.png',
|
|
63
|
-
mimeType: 'image/png',
|
|
64
|
-
size: 1
|
|
65
|
-
},
|
|
66
|
-
name: 'uploadToAzure',
|
|
67
|
-
type: 'dispatch'
|
|
68
|
-
});
|
|
69
|
-
});
|
|
70
|
-
});
|
|
71
|
-
|
|
72
|
-
//# sourceMappingURL=generateUploadInstructions.spec.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/generateUploadInstructions.spec.ts"],"sourcesContent":["import type { ContainerClient } from '@azure/storage-blob'\nimport type { PayloadRequest } from 'payload'\n\nimport { StorageSharedKeyCredential } from '@azure/storage-blob'\nimport { describe, expect, it, vi } from 'vitest'\n\nimport { generateUploadInstructions } from './generateUploadInstructions.js'\n\nconst createRequest = (allowRestrictedFileTypes: boolean): PayloadRequest =>\n ({\n payload: {\n collections: {\n media: {\n config: {\n slug: 'media',\n upload: { allowRestrictedFileTypes },\n },\n },\n },\n config: { upload: {} },\n db: { findOne: () => Promise.resolve(null) },\n },\n user: { id: 'user-id' },\n }) as unknown as PayloadRequest\n\nconst createGenerator = (getStorageClient: () => ContainerClient) =>\n generateUploadInstructions({\n collectionPrefix: '',\n containerName: 'media',\n getStorageClient,\n })\n\ndescribe('generateUploadInstructions', () => {\n it('should use Payload uploads under secure defaults', async () => {\n const getStorageClient = vi.fn()\n\n await expect(\n createGenerator(getStorageClient)({\n collectionSlug: 'media',\n filename: 'reference.png',\n filesize: 1,\n mimeType: 'image/png',\n overrideAccess: false,\n req: createRequest(false),\n }),\n ).rejects.toThrow('Azure client uploads require allowRestrictedFileTypes to be enabled.')\n\n expect(getStorageClient).not.toHaveBeenCalled()\n })\n\n it('should generate direct instructions for the explicit opt-out', async () => {\n const credential = new StorageSharedKeyCredential(\n 'account',\n Buffer.alloc(32, 'a').toString('base64'),\n )\n const getStorageClient = () =>\n ({\n credential,\n getBlobClient: (key: string) => ({\n url: `https://account.blob.core.windows.net/media/${key}`,\n }),\n }) as unknown as ContainerClient\n\n await expect(\n createGenerator(getStorageClient)({\n collectionSlug: 'media',\n filename: 'reference.png',\n filesize: 1,\n mimeType: 'image/png',\n overrideAccess: false,\n req: createRequest(true),\n }),\n ).resolves.toMatchObject({\n file: {\n filename: 'reference.png',\n mimeType: 'image/png',\n size: 1,\n },\n name: 'uploadToAzure',\n type: 'dispatch',\n })\n })\n})\n"],"names":["StorageSharedKeyCredential","describe","expect","it","vi","generateUploadInstructions","createRequest","allowRestrictedFileTypes","payload","collections","media","config","slug","upload","db","findOne","Promise","resolve","user","id","createGenerator","getStorageClient","collectionPrefix","containerName","fn","collectionSlug","filename","filesize","mimeType","overrideAccess","req","rejects","toThrow","not","toHaveBeenCalled","credential","Buffer","alloc","toString","getBlobClient","key","url","resolves","toMatchObject","file","size","name","type"],"mappings":"AAGA,SAASA,0BAA0B,QAAQ,sBAAqB;AAChE,SAASC,QAAQ,EAAEC,MAAM,EAAEC,EAAE,EAAEC,EAAE,QAAQ,SAAQ;AAEjD,SAASC,0BAA0B,QAAQ,kCAAiC;AAE5E,MAAMC,gBAAgB,CAACC,2BACpB,CAAA;QACCC,SAAS;YACPC,aAAa;gBACXC,OAAO;oBACLC,QAAQ;wBACNC,MAAM;wBACNC,QAAQ;4BAAEN;wBAAyB;oBACrC;gBACF;YACF;YACAI,QAAQ;gBAAEE,QAAQ,CAAC;YAAE;YACrBC,IAAI;gBAAEC,SAAS,IAAMC,QAAQC,OAAO,CAAC;YAAM;QAC7C;QACAC,MAAM;YAAEC,IAAI;QAAU;IACxB,CAAA;AAEF,MAAMC,kBAAkB,CAACC,mBACvBhB,2BAA2B;QACzBiB,kBAAkB;QAClBC,eAAe;QACfF;IACF;AAEFpB,SAAS,8BAA8B;IACrCE,GAAG,oDAAoD;QACrD,MAAMkB,mBAAmBjB,GAAGoB,EAAE;QAE9B,MAAMtB,OACJkB,gBAAgBC,kBAAkB;YAChCI,gBAAgB;YAChBC,UAAU;YACVC,UAAU;YACVC,UAAU;YACVC,gBAAgB;YAChBC,KAAKxB,cAAc;QACrB,IACAyB,OAAO,CAACC,OAAO,CAAC;QAElB9B,OAAOmB,kBAAkBY,GAAG,CAACC,gBAAgB;IAC/C;IAEA/B,GAAG,gEAAgE;QACjE,MAAMgC,aAAa,IAAInC,2BACrB,WACAoC,OAAOC,KAAK,CAAC,IAAI,KAAKC,QAAQ,CAAC;QAEjC,MAAMjB,mBAAmB,IACtB,CAAA;gBACCc;gBACAI,eAAe,CAACC,MAAiB,CAAA;wBAC/BC,KAAK,CAAC,4CAA4C,EAAED,KAAK;oBAC3D,CAAA;YACF,CAAA;QAEF,MAAMtC,OACJkB,gBAAgBC,kBAAkB;YAChCI,gBAAgB;YAChBC,UAAU;YACVC,UAAU;YACVC,UAAU;YACVC,gBAAgB;YAChBC,KAAKxB,cAAc;QACrB,IACAoC,QAAQ,CAACC,aAAa,CAAC;YACvBC,MAAM;gBACJlB,UAAU;gBACVE,UAAU;gBACViB,MAAM;YACR;YACAC,MAAM;YACNC,MAAM;QACR;IACF;AACF"}
|
package/dist/index.spec.d.ts
DELETED
package/dist/index.spec.d.ts.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"index.spec.d.ts","sourceRoot":"","sources":["../src/index.spec.ts"],"names":[],"mappings":""}
|
package/dist/index.spec.js
DELETED
|
@@ -1,80 +0,0 @@
|
|
|
1
|
-
import { describe, expect, it, vi } from 'vitest';
|
|
2
|
-
// Inspect the access level the adapter passes when it provisions a container.
|
|
3
|
-
const { createIfNotExists } = vi.hoisted(()=>({
|
|
4
|
-
createIfNotExists: vi.fn()
|
|
5
|
-
}));
|
|
6
|
-
// Capture the closure index.ts hands to the adapter (normally run via onInit).
|
|
7
|
-
const captured = vi.hoisted(()=>({
|
|
8
|
-
createContainerIfNotExists: undefined
|
|
9
|
-
}));
|
|
10
|
-
vi.mock('./utils/getStorageClient.js', ()=>({
|
|
11
|
-
getStorageClient: ()=>({
|
|
12
|
-
createIfNotExists
|
|
13
|
-
})
|
|
14
|
-
}));
|
|
15
|
-
vi.mock('./adapter.js', ()=>({
|
|
16
|
-
createAzureAdapter: (args)=>{
|
|
17
|
-
captured.createContainerIfNotExists = args.createContainerIfNotExists;
|
|
18
|
-
return ()=>({
|
|
19
|
-
name: 'azure'
|
|
20
|
-
});
|
|
21
|
-
}
|
|
22
|
-
}));
|
|
23
|
-
vi.mock('@payloadcms/plugin-cloud-storage', ()=>({
|
|
24
|
-
cloudStoragePlugin: ()=>(config)=>config
|
|
25
|
-
}));
|
|
26
|
-
const { azureStorage } = await import('./index.js');
|
|
27
|
-
const runContainerCreate = (containerAccess)=>{
|
|
28
|
-
createIfNotExists.mockClear();
|
|
29
|
-
const adapter = azureStorage({
|
|
30
|
-
allowContainerCreate: true,
|
|
31
|
-
baseURL: 'https://account.blob.core.windows.net',
|
|
32
|
-
collections: {
|
|
33
|
-
media: true
|
|
34
|
-
},
|
|
35
|
-
connectionString: 'UseDevelopmentStorage=true',
|
|
36
|
-
containerAccess,
|
|
37
|
-
containerName: 'media'
|
|
38
|
-
});
|
|
39
|
-
adapter.init({
|
|
40
|
-
collections: []
|
|
41
|
-
});
|
|
42
|
-
captured.createContainerIfNotExists?.();
|
|
43
|
-
return createIfNotExists.mock.calls[0]?.[0];
|
|
44
|
-
};
|
|
45
|
-
describe('azureStorage container creation', ()=>{
|
|
46
|
-
it('should not create the container with anonymous public blob access by default', ()=>{
|
|
47
|
-
const options = runContainerCreate();
|
|
48
|
-
expect(createIfNotExists).toHaveBeenCalledTimes(1);
|
|
49
|
-
// No access level == private. Any public value would bypass Payload's
|
|
50
|
-
// access-controlled route, so the default must stay private.
|
|
51
|
-
expect(options?.access).toBeUndefined();
|
|
52
|
-
});
|
|
53
|
-
it('should create a private container when containerAccess is private', ()=>{
|
|
54
|
-
const options = runContainerCreate('private');
|
|
55
|
-
expect(options?.access).toBeUndefined();
|
|
56
|
-
});
|
|
57
|
-
it('should apply public access only when explicitly opted in', ()=>{
|
|
58
|
-
expect(runContainerCreate('blob')?.access).toBe('blob');
|
|
59
|
-
expect(runContainerCreate('container')?.access).toBe('container');
|
|
60
|
-
});
|
|
61
|
-
it('should surface a creation failure as an awaitable rejection, not a swallowed promise', async ()=>{
|
|
62
|
-
createIfNotExists.mockClear();
|
|
63
|
-
createIfNotExists.mockRejectedValueOnce(new Error('AuthorizationFailure: public access is not permitted on this storage account'));
|
|
64
|
-
const adapter = azureStorage({
|
|
65
|
-
allowContainerCreate: true,
|
|
66
|
-
baseURL: 'https://account.blob.core.windows.net',
|
|
67
|
-
collections: {
|
|
68
|
-
media: true
|
|
69
|
-
},
|
|
70
|
-
connectionString: 'UseDevelopmentStorage=true',
|
|
71
|
-
containerName: 'media'
|
|
72
|
-
});
|
|
73
|
-
adapter.init({
|
|
74
|
-
collections: []
|
|
75
|
-
});
|
|
76
|
-
await expect(captured.createContainerIfNotExists?.()).rejects.toThrow('AuthorizationFailure');
|
|
77
|
-
});
|
|
78
|
-
});
|
|
79
|
-
|
|
80
|
-
//# sourceMappingURL=index.spec.js.map
|
package/dist/index.spec.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/index.spec.ts"],"sourcesContent":["import type { Config } from 'payload'\n\nimport { describe, expect, it, vi } from 'vitest'\n\n// Inspect the access level the adapter passes when it provisions a container.\nconst { createIfNotExists } = vi.hoisted(() => ({ createIfNotExists: vi.fn() }))\n\n// Capture the closure index.ts hands to the adapter (normally run via onInit).\nconst captured = vi.hoisted(\n () => ({ createContainerIfNotExists: undefined }) as { createContainerIfNotExists?: () => void },\n)\n\nvi.mock('./utils/getStorageClient.js', () => ({\n getStorageClient: () => ({ createIfNotExists }),\n}))\n\nvi.mock('./adapter.js', () => ({\n createAzureAdapter: (args: { createContainerIfNotExists: () => void }) => {\n captured.createContainerIfNotExists = args.createContainerIfNotExists\n return () => ({ name: 'azure' })\n },\n}))\n\nvi.mock('@payloadcms/plugin-cloud-storage', () => ({\n cloudStoragePlugin: () => (config: Config) => config,\n}))\n\nconst { azureStorage } = await import('./index.js')\n\nconst runContainerCreate = (\n containerAccess?: 'blob' | 'container' | 'private',\n): { access?: string } | undefined => {\n createIfNotExists.mockClear()\n\n const adapter = azureStorage({\n allowContainerCreate: true,\n baseURL: 'https://account.blob.core.windows.net',\n collections: { media: true },\n connectionString: 'UseDevelopmentStorage=true',\n containerAccess,\n containerName: 'media',\n })\n\n adapter.init({ collections: [] } as unknown as Config)\n\n captured.createContainerIfNotExists?.()\n\n return createIfNotExists.mock.calls[0]?.[0] as { access?: string } | undefined\n}\n\ndescribe('azureStorage container creation', () => {\n it('should not create the container with anonymous public blob access by default', () => {\n const options = runContainerCreate()\n\n expect(createIfNotExists).toHaveBeenCalledTimes(1)\n // No access level == private. Any public value would bypass Payload's\n // access-controlled route, so the default must stay private.\n expect(options?.access).toBeUndefined()\n })\n\n it('should create a private container when containerAccess is private', () => {\n const options = runContainerCreate('private')\n\n expect(options?.access).toBeUndefined()\n })\n\n it('should apply public access only when explicitly opted in', () => {\n expect(runContainerCreate('blob')?.access).toBe('blob')\n expect(runContainerCreate('container')?.access).toBe('container')\n })\n\n it('should surface a creation failure as an awaitable rejection, not a swallowed promise', async () => {\n createIfNotExists.mockClear()\n createIfNotExists.mockRejectedValueOnce(\n new Error('AuthorizationFailure: public access is not permitted on this storage account'),\n )\n\n const adapter = azureStorage({\n allowContainerCreate: true,\n baseURL: 'https://account.blob.core.windows.net',\n collections: { media: true },\n connectionString: 'UseDevelopmentStorage=true',\n containerName: 'media',\n })\n\n adapter.init({ collections: [] } as unknown as Config)\n\n await expect(captured.createContainerIfNotExists?.()).rejects.toThrow('AuthorizationFailure')\n })\n})\n"],"names":["describe","expect","it","vi","createIfNotExists","hoisted","fn","captured","createContainerIfNotExists","undefined","mock","getStorageClient","createAzureAdapter","args","name","cloudStoragePlugin","config","azureStorage","runContainerCreate","containerAccess","mockClear","adapter","allowContainerCreate","baseURL","collections","media","connectionString","containerName","init","calls","options","toHaveBeenCalledTimes","access","toBeUndefined","toBe","mockRejectedValueOnce","Error","rejects","toThrow"],"mappings":"AAEA,SAASA,QAAQ,EAAEC,MAAM,EAAEC,EAAE,EAAEC,EAAE,QAAQ,SAAQ;AAEjD,8EAA8E;AAC9E,MAAM,EAAEC,iBAAiB,EAAE,GAAGD,GAAGE,OAAO,CAAC,IAAO,CAAA;QAAED,mBAAmBD,GAAGG,EAAE;IAAG,CAAA;AAE7E,+EAA+E;AAC/E,MAAMC,WAAWJ,GAAGE,OAAO,CACzB,IAAO,CAAA;QAAEG,4BAA4BC;IAAU,CAAA;AAGjDN,GAAGO,IAAI,CAAC,+BAA+B,IAAO,CAAA;QAC5CC,kBAAkB,IAAO,CAAA;gBAAEP;YAAkB,CAAA;IAC/C,CAAA;AAEAD,GAAGO,IAAI,CAAC,gBAAgB,IAAO,CAAA;QAC7BE,oBAAoB,CAACC;YACnBN,SAASC,0BAA0B,GAAGK,KAAKL,0BAA0B;YACrE,OAAO,IAAO,CAAA;oBAAEM,MAAM;gBAAQ,CAAA;QAChC;IACF,CAAA;AAEAX,GAAGO,IAAI,CAAC,oCAAoC,IAAO,CAAA;QACjDK,oBAAoB,IAAM,CAACC,SAAmBA;IAChD,CAAA;AAEA,MAAM,EAAEC,YAAY,EAAE,GAAG,MAAM,MAAM,CAAC;AAEtC,MAAMC,qBAAqB,CACzBC;IAEAf,kBAAkBgB,SAAS;IAE3B,MAAMC,UAAUJ,aAAa;QAC3BK,sBAAsB;QACtBC,SAAS;QACTC,aAAa;YAAEC,OAAO;QAAK;QAC3BC,kBAAkB;QAClBP;QACAQ,eAAe;IACjB;IAEAN,QAAQO,IAAI,CAAC;QAAEJ,aAAa,EAAE;IAAC;IAE/BjB,SAASC,0BAA0B;IAEnC,OAAOJ,kBAAkBM,IAAI,CAACmB,KAAK,CAAC,EAAE,EAAE,CAAC,EAAE;AAC7C;AAEA7B,SAAS,mCAAmC;IAC1CE,GAAG,gFAAgF;QACjF,MAAM4B,UAAUZ;QAEhBjB,OAAOG,mBAAmB2B,qBAAqB,CAAC;QAChD,sEAAsE;QACtE,6DAA6D;QAC7D9B,OAAO6B,SAASE,QAAQC,aAAa;IACvC;IAEA/B,GAAG,qEAAqE;QACtE,MAAM4B,UAAUZ,mBAAmB;QAEnCjB,OAAO6B,SAASE,QAAQC,aAAa;IACvC;IAEA/B,GAAG,4DAA4D;QAC7DD,OAAOiB,mBAAmB,SAASc,QAAQE,IAAI,CAAC;QAChDjC,OAAOiB,mBAAmB,cAAcc,QAAQE,IAAI,CAAC;IACvD;IAEAhC,GAAG,wFAAwF;QACzFE,kBAAkBgB,SAAS;QAC3BhB,kBAAkB+B,qBAAqB,CACrC,IAAIC,MAAM;QAGZ,MAAMf,UAAUJ,aAAa;YAC3BK,sBAAsB;YACtBC,SAAS;YACTC,aAAa;gBAAEC,OAAO;YAAK;YAC3BC,kBAAkB;YAClBC,eAAe;QACjB;QAEAN,QAAQO,IAAI,CAAC;YAAEJ,aAAa,EAAE;QAAC;QAE/B,MAAMvB,OAAOM,SAASC,0BAA0B,MAAM6B,OAAO,CAACC,OAAO,CAAC;IACxE;AACF"}
|