Skip to content

Commit 9d5c09d

Browse files
authored
fix: check if object exists (#223)
1 parent 8ba3b1b commit 9d5c09d

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

src/http/error-handler.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export const setErrorHandler = (app: FastifyInstance) => {
2626
// Fastify errors
2727
if ('statusCode' in error) {
2828
const err = error as FastifyError
29-
return reply.status((error as any).statusCode).send({
29+
return reply.status((error as any).statusCode || 500).send({
3030
statusCode: `${err.statusCode}`,
3131
error: err.name,
3232
message: err.message,

src/http/routes/object/getPublicObject.ts

+6-3
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,12 @@ export default async function routes(fastify: FastifyInstance) {
4747
const objectName = request.params['*']
4848
const { download } = request.query
4949

50-
await request.storage.asSuperUser().findBucket(bucketName, 'id,public', {
51-
isPublic: true,
52-
})
50+
await Promise.all([
51+
request.storage.asSuperUser().findBucket(bucketName, 'id,public', {
52+
isPublic: true,
53+
}),
54+
request.storage.asSuperUser().from(bucketName).findObject(objectName),
55+
])
5356

5457
// send the object from s3
5558
const s3Key = `${request.tenantId}/${bucketName}/${objectName}`

0 commit comments

Comments
 (0)