♻️ Move s3-related files to specific lib folder

baptisteArno · Aug 30, 2023 · 23b629f · 23b629f
1 parent 9a79bc3
commit 23b629f
Show file tree

Hide file tree

Showing 12 changed files with 9 additions and 40 deletions.
diff --git a/apps/builder/src/components/ImageUploadContent/UploadButton.tsx b/apps/builder/src/components/ImageUploadContent/UploadButton.tsx
@@ -1,7 +1,7 @@
 import { useToast } from '@/hooks/useToast'
 import { Button, ButtonProps, chakra } from '@chakra-ui/react'
 import { ChangeEvent, useState } from 'react'
-import { uploadFiles } from '@typebot.io/lib/uploadFiles'
+import { uploadFiles } from '@typebot.io/lib/s3/uploadFiles'
 import { compressFile } from '@/helpers/compressFile'
 
 type UploadButtonProps = {

diff --git a/apps/builder/src/pages/api/storage/upload-url.ts b/apps/builder/src/pages/api/storage/upload-url.ts
@@ -2,10 +2,10 @@ import { NextApiRequest, NextApiResponse } from 'next'
 import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'
 import {
   badRequest,
-  generatePresignedUrl,
   methodNotAllowed,
   notAuthenticated,
 } from '@typebot.io/lib/api'
+import { generatePresignedUrl } from '@typebot.io/lib/s3/generatePresignedUrl'
 import { env } from '@typebot.io/env'
 
 const handler = async (

diff --git a/apps/viewer/src/features/blocks/inputs/fileUpload/api/getUploadUrl.ts b/apps/viewer/src/features/blocks/inputs/fileUpload/api/getUploadUrl.ts
@@ -10,7 +10,7 @@ import {
 } from '@typebot.io/schemas'
 import { byId, isDefined } from '@typebot.io/lib'
 import { z } from 'zod'
-import { generatePresignedUrl } from '@typebot.io/lib/api/generatePresignedUrl'
+import { generatePresignedUrl } from '@typebot.io/lib/s3/generatePresignedUrl'
 import { env } from '@typebot.io/env'
 
 export const getUploadUrl = publicProcedure

diff --git a/apps/viewer/src/features/whatsApp/helpers/downloadMedia.ts b/apps/viewer/src/features/whatsApp/helpers/downloadMedia.ts
@@ -1,6 +1,6 @@
 import got from 'got'
 import { TRPCError } from '@trpc/server'
-import { uploadFileToBucket } from '@typebot.io/lib/api/uploadFileToBucket'
+import { uploadFileToBucket } from '@typebot.io/lib/s3/uploadFileToBucket'
 
 type Props = {
   mediaId: string

diff --git a/...deprecated/bot-engine/src/features/blocks/inputs/fileUpload/components/FileUploadForm.tsx b/...deprecated/bot-engine/src/features/blocks/inputs/fileUpload/components/FileUploadForm.tsx
@@ -4,7 +4,7 @@ import { useTypebot } from '@/providers/TypebotProvider'
 import { InputSubmitContent } from '@/types'
 import { defaultFileInputOptions, FileInputBlock } from '@typebot.io/schemas'
 import React, { ChangeEvent, FormEvent, useState, DragEvent } from 'react'
-import { uploadFiles } from '@typebot.io/lib/uploadFiles'
+import { uploadFiles } from '@typebot.io/lib/s3/uploadFiles'
 
 type Props = {
   block: FileInputBlock

diff --git a/packages/embeds/js/src/features/blocks/inputs/fileUpload/components/FileUploadForm.tsx b/packages/embeds/js/src/features/blocks/inputs/fileUpload/components/FileUploadForm.tsx
@@ -4,7 +4,7 @@ import { guessApiHost } from '@/utils/guessApiHost'
 import { FileInputBlock } from '@typebot.io/schemas'
 import { defaultFileInputOptions } from '@typebot.io/schemas/features/blocks/inputs/file'
 import { createSignal, Match, Show, Switch } from 'solid-js'
-import { uploadFiles } from '@typebot.io/lib/uploadFiles'
+import { uploadFiles } from '@typebot.io/lib/s3/uploadFiles'
 import { Button } from '@/components/Button'
 import { Spinner } from '@/components/Spinner'
 

diff --git a/packages/lib/api/helpers/archiveResults.ts b/packages/lib/api/helpers/archiveResults.ts
@@ -1,7 +1,6 @@
-import { env } from '@typebot.io/env'
 import { Prisma, PrismaClient } from '@typebot.io/prisma'
 import { InputBlockType, Typebot } from '@typebot.io/schemas'
-import { Client } from 'minio'
+import { deleteFilesFromBucket } from '../../s3/deleteFilesFromBucket'
 
 type ArchiveResultsProps = {
   typebot: Pick<Typebot, 'groups'>
@@ -90,32 +89,3 @@ export const archiveResults =
 
     return { success: true }
   }
-
-const deleteFilesFromBucket = async ({
-  urls,
-}: {
-  urls: string[]
-}): Promise<void> => {
-  if (!env.S3_ENDPOINT || !env.S3_ACCESS_KEY || !env.S3_SECRET_KEY)
-    throw new Error(
-      'S3 not properly configured. Missing one of those variables: S3_ENDPOINT, S3_ACCESS_KEY, S3_SECRET_KEY'
-    )
-
-  const minioClient = new Client({
-    endPoint: env.S3_ENDPOINT,
-    port: env.S3_PORT,
-    useSSL: env.S3_SSL ?? true,
-    accessKey: env.S3_ACCESS_KEY,
-    secretKey: env.S3_SECRET_KEY,
-    region: env.S3_REGION,
-  })
-
-  const bucket = env.S3_BUCKET ?? 'typebot'
-
-  return minioClient.removeObjects(
-    bucket,
-    urls
-      .filter((url) => url.includes(env.S3_ENDPOINT as string))
-      .map((url) => url.split(`/${bucket}/`)[1])
-  )
-}
diff --git a/packages/lib/api/index.ts b/packages/lib/api/index.ts
@@ -1,3 +1,2 @@
 export * from './utils'
-export * from './generatePresignedUrl'
 export * from './encryption'
diff --git a/packages/lib/api/deleteFilesFromBucket.ts → packages/lib/s3/deleteFilesFromBucket.ts b/packages/lib/api/deleteFilesFromBucket.ts → packages/lib/s3/deleteFilesFromBucket.ts
@@ -20,7 +20,7 @@ export const deleteFilesFromBucket = async ({
     region: env.S3_REGION,
   })
 
-  const bucket = env.S3_BUCKET ?? 'typebot'
+  const bucket = env.S3_BUCKET
 
   return minioClient.removeObjects(
     bucket,

diff --git a/packages/lib/api/generatePresignedUrl.ts → packages/lib/s3/generatePresignedUrl.ts b/packages/lib/api/generatePresignedUrl.ts → packages/lib/s3/generatePresignedUrl.ts
diff --git a/packages/lib/api/uploadFileToBucket.ts → packages/lib/s3/uploadFileToBucket.ts b/packages/lib/api/uploadFileToBucket.ts → packages/lib/s3/uploadFileToBucket.ts
diff --git a/packages/lib/uploadFiles.ts → packages/lib/s3/uploadFiles.ts b/packages/lib/uploadFiles.ts → packages/lib/s3/uploadFiles.ts
@@ -1,4 +1,4 @@
-import { sendRequest } from './utils'
+import { sendRequest } from '../utils'
 
 type UploadFileProps = {
   basePath?: string