Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(storage-vercel-blob): return 404 when file is not found #10327

Merged
merged 1 commit into from
Jan 3, 2025
Merged

fix(storage-vercel-blob): return 404 when file is not found #10327

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions packages/storage-vercel-blob/src/staticHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { StaticHandler } from '@payloadcms/plugin-cloud-storage/types'
import type { CollectionConfig } from 'payload'

import { getFilePrefix } from '@payloadcms/plugin-cloud-storage/utilities'
import { head } from '@vercel/blob'
import { BlobNotFoundError, head } from '@vercel/blob'
import path from 'path'

type StaticHandlerArgs = {
Expand All @@ -24,10 +24,6 @@ export const getStaticHandler = (
const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match')

const blobMetadata = await head(fileUrl, { token })
if (!blobMetadata) {
return new Response(null, { status: 404, statusText: 'Not Found' })
}

const uploadedAtString = blobMetadata.uploadedAt.toISOString()
const ETag = `"${fileKey}-${uploadedAtString}"`

Expand Down Expand Up @@ -70,6 +66,9 @@ export const getStaticHandler = (
status: 200,
})
} catch (err: unknown) {
if (err instanceof BlobNotFoundError) {
return new Response(null, { status: 404, statusText: 'Not Found' })
}
req.payload.logger.error({ err, msg: 'Unexpected error in staticHandler' })
return new Response('Internal Server Error', { status: 500 })
}
Expand Down