blsmedia/bot
2
0
Fork 0
Code Activity

fix(results): 🐛 Remove storage on result delete

Browse Source
This commit is contained in:
Baptiste Arnaud
2022-06-26 18:17:50 +02:00
parent fc4db575ac
commit 56dca868c9
5 changed files with 2382 additions and 2782 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/builder/package.json
View File

@@ -58,6 +58,7 @@
"kbar": "^0.1.0-beta.34",
"micro": "^9.3.4",
"micro-cors": "^0.1.1",
"minio": "^7.0.28",
"models": "*",
"next": "^12.1.6",
"next-auth": "4.3.4",
@@ -91,6 +92,7 @@
"@types/google-spreadsheet": "^3.2.1",
"@types/jsonwebtoken": "8.5.8",
"@types/micro-cors": "^0.1.2",
"@types/minio": "^7.0.13",
"@types/node": "^17.0.33",
"@types/nodemailer": "^6.4.4",
"@types/nprogress": "^0.2.0",

37
apps/builder/pages/api/typebots/[typebotId]/results.ts
View File

@@ -55,25 +55,24 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
id: ids.length > 0 ? { in: ids } : undefined,
typebot: canWriteTypebot(typebotId, user),
}
// Weird bug waiting for https://github.com/aws/aws-sdk-js/issues/4137
// const typebot = await prisma.typebot.findFirst({
// where: canWriteTypebot(typebotId, user),
// select: { groups: true },
// })
// if (!typebot) return forbidden(res)
// const fileUploadBlockIds = (typebot as Typebot).groups
// .flatMap((g) => g.blocks)
// .filter((b) => b.type === InputBlockType.FILE)
// .map((b) => b.id)
// if (fileUploadBlockIds.length > 0) {
// const filesToDelete = await prisma.answer.findMany({
// where: { result: resultsFilter, blockId: { in: fileUploadBlockIds } },
// })
// if (filesToDelete.length > 0)
// await deleteFiles({
// urls: filesToDelete.flatMap((a) => a.content.split(', ')),
// })
// }
const typebot = await prisma.typebot.findFirst({
where: canWriteTypebot(typebotId, user),
select: { groups: true },
})
if (!typebot) return forbidden(res)
const fileUploadBlockIds = (typebot as Typebot).groups
.flatMap((g) => g.blocks)
.filter((b) => b.type === InputBlockType.FILE)
.map((b) => b.id)
if (fileUploadBlockIds.length > 0) {
const filesToDelete = await prisma.answer.findMany({
where: { result: resultsFilter, blockId: { in: fileUploadBlockIds } },
})
if (filesToDelete.length > 0)
await deleteFiles({
urls: filesToDelete.flatMap((a) => a.content.split(', ')),
})
}
await prisma.log.deleteMany({
where: {
result: resultsFilter,

42
apps/builder/services/api/storage.ts
View File

@@ -1,11 +1,10 @@
import { AWSError, config, Endpoint, S3 } from 'aws-sdk'
import { PromiseResult } from 'aws-sdk/lib/request'
import { Client } from 'minio'
export const deleteFiles = async ({
urls,
}: {
urls: string[]
}): Promise<PromiseResult<S3.DeleteObjectsOutput, AWSError>> => {
}): Promise<void> => {
if (
!process.env.S3_ENDPOINT ||
!process.env.S3_ACCESS_KEY ||
@@ -15,30 +14,23 @@ export const deleteFiles = async ({
'S3 not properly configured. Missing one of those variables: S3_ENDPOINT, S3_ACCESS_KEY, S3_SECRET_KEY'
)
const sslEnabled =
const useSSL =
process.env.S3_SSL && process.env.S3_SSL === 'false' ? false : true
config.update({
accessKeyId: process.env.S3_ACCESS_KEY,
secretAccessKey: process.env.S3_SECRET_KEY,
const minioClient = new Client({
endPoint: process.env.S3_ENDPOINT,
port: process.env.S3_PORT ? parseInt(process.env.S3_PORT) : undefined,
useSSL,
accessKey: process.env.S3_ACCESS_KEY,
secretKey: process.env.S3_SECRET_KEY,
region: process.env.S3_REGION,
sslEnabled,
})
const protocol = sslEnabled ? 'https' : 'http'
const s3 = new S3({
endpoint: new Endpoint(
`${protocol}://${process.env.S3_ENDPOINT}${
process.env.S3_PORT ? `:${process.env.S3_PORT}` : ''
}`
),
})
const Bucket = process.env.S3_BUCKET ?? 'typebot'
return s3
.deleteObjects({
Bucket,
Delete: {
Objects: urls.map((url) => ({ Key: url.split(`/${Bucket}/`)[1] })),
},
})
.promise()
const bucket = process.env.S3_BUCKET ?? 'typebot'
return minioClient.removeObjects(
bucket,
urls
.filter((url) => url.includes(process.env.S3_ENDPOINT as string))
.map((url) => url.split(`/${bucket}/`)[1])
)
}