Skip to content

Commit 1c1d9ae

Browse files
committed
fix: permissions checking in emptyBucket
1 parent a153ea7 commit 1c1d9ae

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

src/routes/bucket/emptyBucket.ts

+12-9
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ export default async function routes(fastify: FastifyInstance) {
5858
const { data: bucket } = bucketResponse
5959
const bucketName = bucket.name
6060

61-
let deleteError, objectError, objects, objectStatus
61+
let deleteError, deleteData, objectError, objects, objectStatus
6262
do {
6363
;({ data: objects, error: objectError, status: objectStatus } = await postgrest
6464
.from<Obj>('objects')
@@ -73,14 +73,7 @@ export default async function routes(fastify: FastifyInstance) {
7373
request.log.info({ results: objects }, 'results')
7474

7575
if (objects && objects.length > 0) {
76-
const params = objects.map((ele) => {
77-
return {
78-
Key: `${projectRef}/${bucketName}/${ele.name}`,
79-
}
80-
})
81-
// delete files from s3 asynchronously
82-
deleteObjects(client, globalS3Bucket, params)
83-
;({ error: deleteError } = await postgrest
76+
;({ error: deleteError, data: deleteData } = await postgrest
8477
.from<Obj>('objects')
8578
.delete()
8679
.in(
@@ -91,6 +84,16 @@ export default async function routes(fastify: FastifyInstance) {
9184
if (deleteError) {
9285
request.log.error({ error: deleteError }, 'error bucket')
9386
}
87+
88+
if (deleteData && deleteData.length > 0) {
89+
const params = deleteData.map((ele) => {
90+
return {
91+
Key: `${projectRef}/${bucketName}/${ele.name}`,
92+
}
93+
})
94+
// delete files from s3 asynchronously
95+
deleteObjects(client, globalS3Bucket, params)
96+
}
9497
}
9598
} while (!deleteError && !objectError && objects && objects.length > 0)
9699

0 commit comments

Comments
 (0)