Merge pull request #33 from Portabase/feat/avatar-upload

fix: Upload avatar image error for s3 storage

Author: RambokDev

app/api/images/[fileName]/route.ts

@@ -64,6 +64,7 @@ export async function GET(
         const result = await dispatchStorage(input, undefined, settings.storageChannel.id);
 
         if (!result.file || !Buffer.isBuffer(result.file)) {
+            console.error(`An error occurred while getting file :`, result);
             return NextResponse.json(
                 {error: "Invalid file payload"},
                 {status: 500}

src/features/storages/providers/s3.ts

@@ -1,5 +1,6 @@
 import * as Minio from "minio";
 import {StorageDeleteInput, StorageGetInput, StorageResult, StorageUploadInput} from "../types";
+import {getServerUrl} from "@/utils/get-server-url";
 
 type S3Config = {
     endPointUrl: string;
@@ -44,19 +45,19 @@ export async function uploadS3(config: S3Config, input: { data: StorageUploadInp
     }
 
     await client.putObject(config.bucketName, key, input.data.file as Buffer);
+    const baseUrl = getServerUrl();
 
     return {
         success: true,
-        provider: "s3",
+        provider: 's3',
+        url: `${baseUrl}/api/${input.data.path}`,
     };
 }
 
 export async function getS3(config: S3Config, input: { data: StorageGetInput }): Promise<StorageResult> {
     const client = await getS3Client(config);
 
-    // const key = input.data.path;
     const key = `${BASE_DIR}${input.data.path}`;
-
     try {
         await client.statObject(config.bucketName, key);
     } catch {

src/features/upload/public/upload.action.ts

@@ -2,22 +2,13 @@
 import {userAction} from "@/lib/safe-actions/actions";
 import {z} from "zod";
 import {v4 as uuidv4} from "uuid";
-import {mkdir, writeFile} from "fs/promises";
-import path from "path";
-import {env} from "@/env.mjs";
-import {checkMinioAlive, saveFileInBucket} from "@/utils/s3-file-management";
-//@ts-ignore
-import {getServerUrl} from "@/utils/get-server-url";
 import {db} from "@/db";
 import {eq} from "drizzle-orm";
-import {Setting} from "@/db/schema/01_setting";
 import * as drizzleDb from "@/db";
 import {ServerActionResult} from "@/types/action-type";
 import {dispatchStorage} from "@/features/storages/dispatch";
 import {StorageInput} from "@/features/storages/types";
 
-// const imageDir = "images/";
-
 
 export const uploadUserImageAction = userAction.schema(
     z.instanceof(FormData)
@@ -59,7 +50,6 @@ export const uploadUserImageAction = userAction.schema(
         }
 
         const result = await dispatchStorage(input, undefined, settings.storageChannel.id);
-
         if (!result.success) {
             return {
                 success: false,
@@ -90,74 +80,5 @@ export const uploadUserImageAction = userAction.schema(
     }
 });
 
-//
-// export const uploadImageAction = userAction
-//     .schema(z.instanceof(FormData))
-//     .action(async ({parsedInput: formData, ctx}) => {
-//         const file = formData.get("file") as File;
-//         const uuid = uuidv4();
-//         const fileFormat = file.name.split(".").pop();
-//         const arrayBuffer = await file.arrayBuffer();
-//         const buffer = Buffer.from(arrayBuffer);
-//
-//
-//         const settings = await db.query.setting.findFirst({
-//             where: eq(drizzleDb.schemas.setting.name, "system"),
-//             with: {
-//                 storageChannel: true
-//             }
-//         });
-//
-//
-//         if (!settings) throw new Error("System settings not found.");
-//
-//         let fileName: string | null = null;
-//         let result: void | UploadedObjectInfo;
-//
-//         if (settings.storage === "local") {
-//             fileName = `${imageDir}${uuid}.${fileFormat}`;
-//             result = await uploadLocal(fileName, buffer);
-//         } else if (settings.storage === "s3") {
-//             fileName = `${imageDir}${uuid}.${fileFormat}`;
-//             result = await uploadS3Compatible(env.S3_BUCKET_NAME ?? "", fileName, buffer);
-//         } else {
-//             throw new Error(`Unsupported storage type: ${settings.storage}`);
-//         }
-//
-//
-//         const url = `${getServerUrl()}/api/${fileName}`
-//         return {data: {result, url}};
-//     });
-//
-
-async function uploadLocal(fileName: string, buffer: any) {
-    const localDir = "private/uploads/";
-    try {
-        await mkdir(path.join(process.cwd(), localDir), {recursive: true});
-        return await writeFile(path.join(process.cwd(), localDir + fileName), buffer);
-    } catch (error) {
-        throw new Error("An error occured while importing image");
-    }
-}
-
-async function uploadS3Compatible(bucketName: string, fileName: string, buffer: any) {
-    return await saveFileInBucket({
-        bucketName,
-        fileName,
-        file: buffer,
-    });
-}
 
-function getUrl(fileName: string, settings: Setting, bucketName: string): string {
-    if (settings.storage === "s3") {
-        return `https://${env.S3_ENDPOINT}/${bucketName}/${fileName}`;
-    } else if (settings.storage === "local") {
-        const url = getServerUrl();
-        return `${url}/api/images/${fileName}`;
-    }
-    throw new Error("Invalid storage configuration");
-}
 
-export async function checkConnexionToS3() {
-    return await checkMinioAlive();
-}