blsmedia/bot
2
0
Fork 0
Code Activity

🐛 (s3) Skip object removals when S3 not configured

Browse Source 
Closes #1763
This commit is contained in:
Baptiste Arnaud
2024-09-04 11:54:55 +02:00
parent 5fa946c0eb
commit fa14029fed
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/builder/src/features/typebot/api/deleteTypebot.ts
View File

@ -6,6 +6,7 @@ import { z } from 'zod'
import { isWriteTypebotForbidden } from '../helpers/isWriteTypebotForbidden' import { isWriteTypebotForbidden } from '../helpers/isWriteTypebotForbidden'
import { archiveResults } from '@typebot.io/results/archiveResults' import { archiveResults } from '@typebot.io/results/archiveResults'
import { removeObjectsFromTypebot } from '@typebot.io/lib/s3/removeObjectsRecursively' import { removeObjectsFromTypebot } from '@typebot.io/lib/s3/removeObjectsRecursively'
import { env } from '@typebot.io/env'
export const deleteTypebot = authenticatedProcedure export const deleteTypebot = authenticatedProcedure
.meta({ .meta({
@ -86,10 +87,11 @@ export const deleteTypebot = authenticatedProcedure
where: { id: typebotId }, where: { id: typebotId },
data: { isArchived: true, publicId: null, customDomain: null }, data: { isArchived: true, publicId: null, customDomain: null },
}) })
await removeObjectsFromTypebot({ if (env.S3_BUCKET)
workspaceId: existingTypebot.workspace.id, await removeObjectsFromTypebot({
typebotId, workspaceId: existingTypebot.workspace.id,
}) typebotId,
})
return { return {
message: 'success', message: 'success',
} }

2
apps/builder/src/features/workspace/api/deleteWorkspace.ts
View File

@ -45,7 +45,7 @@ export const deleteWorkspace = authenticatedProcedure
where: { id: workspaceId }, where: { id: workspaceId },
}) })
await removeObjectsFromWorkspace(workspaceId) if (env.S3_BUCKET) await removeObjectsFromWorkspace(workspaceId)
if (isNotEmpty(workspace.stripeId) && env.STRIPE_SECRET_KEY) { if (isNotEmpty(workspace.stripeId) && env.STRIPE_SECRET_KEY) {
const stripe = new Stripe(env.STRIPE_SECRET_KEY, { const stripe = new Stripe(env.STRIPE_SECRET_KEY, {

5
packages/results/archiveResults.ts
View File

@ -5,6 +5,7 @@ import {
removeAllObjectsFromResult, removeAllObjectsFromResult,
removeObjectsFromResult, removeObjectsFromResult,
} from '@typebot.io/lib/s3/removeObjectsRecursively' } from '@typebot.io/lib/s3/removeObjectsRecursively'
import { env } from '../env/env'
type ArchiveResultsProps = { type ArchiveResultsProps = {
typebot: Pick<Typebot, 'groups' | 'workspaceId' | 'id'> typebot: Pick<Typebot, 'groups' | 'workspaceId' | 'id'>
@ -99,7 +100,7 @@ export const archiveResults =
}, },
}), }),
]) ])
if (!isDeletingAllResults) { if (!isDeletingAllResults && env.S3_BUCKET) {
await removeObjectsFromResult({ await removeObjectsFromResult({
workspaceId: typebot.workspaceId, workspaceId: typebot.workspaceId,
resultIds: resultIds, resultIds: resultIds,
@ -108,7 +109,7 @@ export const archiveResults =
} }
} while (currentTotalResults >= batchSize) } while (currentTotalResults >= batchSize)
if (isDeletingAllResults) { if (isDeletingAllResults && env.S3_BUCKET) {
await removeAllObjectsFromResult({ await removeAllObjectsFromResult({
workspaceId: typebot.workspaceId, workspaceId: typebot.workspaceId,
typebotId: typebot.id, typebotId: typebot.id,