Merge pull request #19 from erik1110/feature/api

[feat & fix] add file extension checking and fix updateCulinary
erik1110 · Jan 24, 2024 · 327a738 · 327a738
2 parents 298485d + 28eab30
commit 327a738
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/features/culinary/culinary.service.ts b/src/features/culinary/culinary.service.ts
@@ -55,7 +55,7 @@ export class CulinaryService {
         title: updateCulinaryDto.title,
         description: updateCulinaryDto.description,
         diningTime: updateCulinaryDto.diningTime,
-        image: updateCulinaryDto.description,
+        image: updateCulinaryDto.image,
         creator: req['user']._id,
       },
       {

diff --git a/src/features/image/image.service.ts b/src/features/image/image.service.ts
@@ -10,9 +10,14 @@ export class ImageService {
 
     async uploadImage(file): Promise<string> {
         const maxSize = 3 * 1024 * 1024; // 3 MB in bytes
+        const allowedExtensions = ['png', 'jpg', 'jpeg', 'webp'];
         if (file.size > maxSize) {
             throw new AppError(HttpStatus.BAD_REQUEST, 'UserError', '超過 3 MB');
         }
+        const fileExtension = file.name.split('.').pop()?.toLowerCase();
+        if (!fileExtension || !allowedExtensions.includes(fileExtension)) {
+            throw new AppError(HttpStatus.BAD_REQUEST, 'UserError', '不支援的檔案格式');
+        }
         const storage = this.firebaseService.getStorageInstance();
         const bucket = storage.bucket();
         const encodedOriginalName = encodeURIComponent(file.originalname);