@payloadcms/storage-s3 4.0.0-internal.c2b57ce → 4.0.0-internal.c6494b5
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/LICENSE.md +1 -1
- package/README.md +2 -2
- package/dist/adapter.d.ts.map +1 -1
- package/dist/adapter.js +41 -19
- package/dist/adapter.js.map +1 -1
- package/dist/copyFile.d.ts +13 -0
- package/dist/copyFile.d.ts.map +1 -0
- package/dist/copyFile.js +145 -0
- package/dist/copyFile.js.map +1 -0
- package/dist/deleteFile.d.ts +2 -5
- package/dist/deleteFile.d.ts.map +1 -1
- package/dist/deleteFile.js +2 -9
- package/dist/deleteFile.js.map +1 -1
- package/dist/generateURL.js +4 -4
- package/dist/generateURL.js.map +1 -1
- package/dist/generateUploadInstructions.d.ts +13 -0
- package/dist/generateUploadInstructions.d.ts.map +1 -0
- package/dist/generateUploadInstructions.js +70 -0
- package/dist/generateUploadInstructions.js.map +1 -0
- package/dist/getFile.d.ts +5 -4
- package/dist/getFile.d.ts.map +1 -1
- package/dist/getFile.js +22 -22
- package/dist/getFile.js.map +1 -1
- package/dist/index.d.ts +9 -18
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +14 -36
- package/dist/index.js.map +1 -1
- package/dist/uploadFile.d.ts +2 -5
- package/dist/uploadFile.d.ts.map +1 -1
- package/dist/uploadFile.js +3 -10
- package/dist/uploadFile.js.map +1 -1
- package/package.json +8 -8
- package/dist/client/S3ClientUploadHandler.d.ts +0 -9
- package/dist/client/S3ClientUploadHandler.d.ts.map +0 -1
- package/dist/client/S3ClientUploadHandler.js +0 -47
- package/dist/client/S3ClientUploadHandler.js.map +0 -1
- package/dist/exports/client.d.ts +0 -2
- package/dist/exports/client.d.ts.map +0 -1
- package/dist/exports/client.js +0 -3
- package/dist/exports/client.js.map +0 -1
- package/dist/generateSignedURL.d.ts +0 -15
- package/dist/generateSignedURL.d.ts.map +0 -1
- package/dist/generateSignedURL.js +0 -64
- package/dist/generateSignedURL.js.map +0 -1
|
@@ -1,64 +0,0 @@
|
|
|
1
|
-
import { PutObjectCommand } from '@aws-sdk/client-s3';
|
|
2
|
-
import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
|
|
3
|
-
import { resolveSignedURLKey } from '@payloadcms/plugin-cloud-storage/utilities';
|
|
4
|
-
import { APIError, Forbidden } from 'payload';
|
|
5
|
-
const bytesToMB = (bytes)=>{
|
|
6
|
-
return bytes / 1024 / 1024;
|
|
7
|
-
};
|
|
8
|
-
const defaultAccess = ({ req })=>!!req.user;
|
|
9
|
-
export const getGenerateSignedURLHandler = ({ access = defaultAccess, acl, bucket, collections, getStorageClient, useCompositePrefixes = false })=>{
|
|
10
|
-
return async (req)=>{
|
|
11
|
-
if (!req.json) {
|
|
12
|
-
throw new APIError('Content-Type expected to be application/json', 400);
|
|
13
|
-
}
|
|
14
|
-
let filesizeLimit = req.payload.config.upload.limits?.fileSize;
|
|
15
|
-
if (filesizeLimit === Infinity) {
|
|
16
|
-
filesizeLimit = undefined;
|
|
17
|
-
}
|
|
18
|
-
const { collectionSlug, docPrefix, filename, filesize, mimeType } = await req.json();
|
|
19
|
-
const collectionS3Config = collections[collectionSlug];
|
|
20
|
-
if (!collectionS3Config) {
|
|
21
|
-
throw new APIError(`Collection ${collectionSlug} was not found in S3 options`);
|
|
22
|
-
}
|
|
23
|
-
const collectionPrefix = typeof collectionS3Config === 'object' && collectionS3Config.prefix || '';
|
|
24
|
-
if (!await access({
|
|
25
|
-
collectionSlug,
|
|
26
|
-
req
|
|
27
|
-
})) {
|
|
28
|
-
throw new Forbidden();
|
|
29
|
-
}
|
|
30
|
-
const { fileKey, sanitizedDocPrefix, sanitizedFilename } = await resolveSignedURLKey({
|
|
31
|
-
collectionPrefix,
|
|
32
|
-
collectionSlug,
|
|
33
|
-
docPrefix,
|
|
34
|
-
filename,
|
|
35
|
-
req,
|
|
36
|
-
useCompositePrefixes
|
|
37
|
-
});
|
|
38
|
-
const signableHeaders = new Set();
|
|
39
|
-
if (filesizeLimit) {
|
|
40
|
-
if (filesize > filesizeLimit) {
|
|
41
|
-
throw new APIError(`Exceeded file size limit. Limit: ${bytesToMB(filesizeLimit).toFixed(2)}MB, got: ${bytesToMB(filesize).toFixed(2)}MB`, 400);
|
|
42
|
-
}
|
|
43
|
-
// Still force S3 to validate
|
|
44
|
-
signableHeaders.add('content-length');
|
|
45
|
-
}
|
|
46
|
-
const url = await getSignedUrl(getStorageClient(), new PutObjectCommand({
|
|
47
|
-
ACL: acl,
|
|
48
|
-
Bucket: bucket,
|
|
49
|
-
ContentLength: filesizeLimit ? Math.min(filesize, filesizeLimit) : undefined,
|
|
50
|
-
ContentType: mimeType,
|
|
51
|
-
Key: fileKey
|
|
52
|
-
}), {
|
|
53
|
-
expiresIn: 600,
|
|
54
|
-
signableHeaders
|
|
55
|
-
});
|
|
56
|
-
return Response.json({
|
|
57
|
-
docPrefix: sanitizedDocPrefix,
|
|
58
|
-
filename: sanitizedFilename,
|
|
59
|
-
url
|
|
60
|
-
});
|
|
61
|
-
};
|
|
62
|
-
};
|
|
63
|
-
|
|
64
|
-
//# sourceMappingURL=generateSignedURL.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/generateSignedURL.ts"],"sourcesContent":["import type { S3 } from '@aws-sdk/client-s3'\nimport type { ClientUploadsAccess } from '@payloadcms/plugin-cloud-storage/types'\nimport type { PayloadHandler } from 'payload'\n\nimport { PutObjectCommand } from '@aws-sdk/client-s3'\nimport { getSignedUrl } from '@aws-sdk/s3-request-presigner'\nimport { resolveSignedURLKey } from '@payloadcms/plugin-cloud-storage/utilities'\nimport { APIError, Forbidden } from 'payload'\n\nimport type { S3StorageOptions } from './index.js'\n\nconst bytesToMB = (bytes: number) => {\n return bytes / 1024 / 1024\n}\n\ninterface Args {\n access?: ClientUploadsAccess\n acl?: 'private' | 'public-read'\n bucket: string\n collections: S3StorageOptions['collections']\n getStorageClient: () => S3\n useCompositePrefixes?: boolean\n}\n\nconst defaultAccess: Args['access'] = ({ req }) => !!req.user\n\nexport const getGenerateSignedURLHandler = ({\n access = defaultAccess,\n acl,\n bucket,\n collections,\n getStorageClient,\n useCompositePrefixes = false,\n}: Args): PayloadHandler => {\n return async (req) => {\n if (!req.json) {\n throw new APIError('Content-Type expected to be application/json', 400)\n }\n\n let filesizeLimit = req.payload.config.upload.limits?.fileSize\n\n if (filesizeLimit === Infinity) {\n filesizeLimit = undefined\n }\n\n const { collectionSlug, docPrefix, filename, filesize, mimeType } = (await req.json()) as {\n collectionSlug: string\n docPrefix?: string\n filename: string\n filesize: number\n mimeType: string\n }\n\n const collectionS3Config = collections[collectionSlug]\n if (!collectionS3Config) {\n throw new APIError(`Collection ${collectionSlug} was not found in S3 options`)\n }\n\n const collectionPrefix =\n (typeof collectionS3Config === 'object' && collectionS3Config.prefix) || ''\n\n if (!(await access({ collectionSlug, req }))) {\n throw new Forbidden()\n }\n\n const { fileKey, sanitizedDocPrefix, sanitizedFilename } = await resolveSignedURLKey({\n collectionPrefix,\n collectionSlug,\n docPrefix,\n filename,\n req,\n useCompositePrefixes,\n })\n\n const signableHeaders = new Set<string>()\n\n if (filesizeLimit) {\n if (filesize > filesizeLimit) {\n throw new APIError(\n `Exceeded file size limit. Limit: ${bytesToMB(filesizeLimit).toFixed(2)}MB, got: ${bytesToMB(filesize).toFixed(2)}MB`,\n 400,\n )\n }\n\n // Still force S3 to validate\n signableHeaders.add('content-length')\n }\n\n const url = await getSignedUrl(\n getStorageClient(),\n new PutObjectCommand({\n ACL: acl,\n Bucket: bucket,\n ContentLength: filesizeLimit ? Math.min(filesize, filesizeLimit) : undefined,\n ContentType: mimeType,\n Key: fileKey,\n }),\n {\n expiresIn: 600,\n signableHeaders,\n },\n )\n\n return Response.json({\n docPrefix: sanitizedDocPrefix,\n filename: sanitizedFilename,\n url,\n })\n }\n}\n"],"names":["PutObjectCommand","getSignedUrl","resolveSignedURLKey","APIError","Forbidden","bytesToMB","bytes","defaultAccess","req","user","getGenerateSignedURLHandler","access","acl","bucket","collections","getStorageClient","useCompositePrefixes","json","filesizeLimit","payload","config","upload","limits","fileSize","Infinity","undefined","collectionSlug","docPrefix","filename","filesize","mimeType","collectionS3Config","collectionPrefix","prefix","fileKey","sanitizedDocPrefix","sanitizedFilename","signableHeaders","Set","toFixed","add","url","ACL","Bucket","ContentLength","Math","min","ContentType","Key","expiresIn","Response"],"mappings":"AAIA,SAASA,gBAAgB,QAAQ,qBAAoB;AACrD,SAASC,YAAY,QAAQ,gCAA+B;AAC5D,SAASC,mBAAmB,QAAQ,6CAA4C;AAChF,SAASC,QAAQ,EAAEC,SAAS,QAAQ,UAAS;AAI7C,MAAMC,YAAY,CAACC;IACjB,OAAOA,QAAQ,OAAO;AACxB;AAWA,MAAMC,gBAAgC,CAAC,EAAEC,GAAG,EAAE,GAAK,CAAC,CAACA,IAAIC,IAAI;AAE7D,OAAO,MAAMC,8BAA8B,CAAC,EAC1CC,SAASJ,aAAa,EACtBK,GAAG,EACHC,MAAM,EACNC,WAAW,EACXC,gBAAgB,EAChBC,uBAAuB,KAAK,EACvB;IACL,OAAO,OAAOR;QACZ,IAAI,CAACA,IAAIS,IAAI,EAAE;YACb,MAAM,IAAId,SAAS,gDAAgD;QACrE;QAEA,IAAIe,gBAAgBV,IAAIW,OAAO,CAACC,MAAM,CAACC,MAAM,CAACC,MAAM,EAAEC;QAEtD,IAAIL,kBAAkBM,UAAU;YAC9BN,gBAAgBO;QAClB;QAEA,MAAM,EAAEC,cAAc,EAAEC,SAAS,EAAEC,QAAQ,EAAEC,QAAQ,EAAEC,QAAQ,EAAE,GAAI,MAAMtB,IAAIS,IAAI;QAQnF,MAAMc,qBAAqBjB,WAAW,CAACY,eAAe;QACtD,IAAI,CAACK,oBAAoB;YACvB,MAAM,IAAI5B,SAAS,CAAC,WAAW,EAAEuB,eAAe,4BAA4B,CAAC;QAC/E;QAEA,MAAMM,mBACJ,AAAC,OAAOD,uBAAuB,YAAYA,mBAAmBE,MAAM,IAAK;QAE3E,IAAI,CAAE,MAAMtB,OAAO;YAAEe;YAAgBlB;QAAI,IAAK;YAC5C,MAAM,IAAIJ;QACZ;QAEA,MAAM,EAAE8B,OAAO,EAAEC,kBAAkB,EAAEC,iBAAiB,EAAE,GAAG,MAAMlC,oBAAoB;YACnF8B;YACAN;YACAC;YACAC;YACApB;YACAQ;QACF;QAEA,MAAMqB,kBAAkB,IAAIC;QAE5B,IAAIpB,eAAe;YACjB,IAAIW,WAAWX,eAAe;gBAC5B,MAAM,IAAIf,SACR,CAAC,iCAAiC,EAAEE,UAAUa,eAAeqB,OAAO,CAAC,GAAG,SAAS,EAAElC,UAAUwB,UAAUU,OAAO,CAAC,GAAG,EAAE,CAAC,EACrH;YAEJ;YAEA,6BAA6B;YAC7BF,gBAAgBG,GAAG,CAAC;QACtB;QAEA,MAAMC,MAAM,MAAMxC,aAChBc,oBACA,IAAIf,iBAAiB;YACnB0C,KAAK9B;YACL+B,QAAQ9B;YACR+B,eAAe1B,gBAAgB2B,KAAKC,GAAG,CAACjB,UAAUX,iBAAiBO;YACnEsB,aAAajB;YACbkB,KAAKd;QACP,IACA;YACEe,WAAW;YACXZ;QACF;QAGF,OAAOa,SAASjC,IAAI,CAAC;YACnBU,WAAWQ;YACXP,UAAUQ;YACVK;QACF;IACF;AACF,EAAC"}
|