tabshift/payloadcms
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

fix(storage-vercel-blob): client uploads with a prefix (#12559)

Browse Source 
Fixes https://github.com/payloadcms/payload/issues/12544
This commit is contained in:
Sasha
2025-05-26 22:42:25 +03:00
committed by GitHub
parent 1731dd7c36
commit b61ef13481
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/storage-vercel-blob/src/client/VercelBlobClientUploadHandler.ts
View File

@@ -30,5 +30,7 @@ export const VercelBlobClientUploadHandler =
if (addRandomSuffix) { if (addRandomSuffix) {
updateFilename(result.url.replace(`${baseURL}/`, '')) updateFilename(result.url.replace(`${baseURL}/`, ''))
} }
return { prefix }
}, },
}) })

3
packages/storage-vercel-blob/src/index.ts
View File

@@ -112,7 +112,8 @@ export const vercelBlobStorage: VercelBlobStoragePlugin =
extraClientHandlerProps: (collection) => ({ extraClientHandlerProps: (collection) => ({
addRandomSuffix: !!optionsWithDefaults.addRandomSuffix, addRandomSuffix: !!optionsWithDefaults.addRandomSuffix,
baseURL: baseUrl, baseURL: baseUrl,
prefix: (typeof collection === 'object' && collection.prefix) || '', prefix:
(typeof collection === 'object' && collection.prefix && `${collection.prefix}/`) || '',
}), }),
serverHandler: getClientUploadRoute({ serverHandler: getClientUploadRoute({
access: access:

5
packages/storage-vercel-blob/src/staticHandler.ts
View File

@@ -15,11 +15,10 @@ export const getStaticHandler = (
{ baseUrl, cacheControlMaxAge = 0, token }: StaticHandlerArgs, { baseUrl, cacheControlMaxAge = 0, token }: StaticHandlerArgs,
collection: CollectionConfig, collection: CollectionConfig,
): StaticHandler => { ): StaticHandler => {
return async (req, { params: { filename } }) => { return async (req, { params: { clientUploadContext, filename } }) => {
try { try {
const prefix = await getFilePrefix({ collection, filename, req }) const prefix = await getFilePrefix({ clientUploadContext, collection, filename, req })
const fileKey = path.posix.join(prefix, encodeURIComponent(filename)) const fileKey = path.posix.join(prefix, encodeURIComponent(filename))
const fileUrl = `${baseUrl}/${fileKey}` const fileUrl = `${baseUrl}/${fileKey}`
const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match') const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match')
const blobMetadata = await head(fileUrl, { token }) const blobMetadata = await head(fileUrl, { token })