@hed-hog/core 0.0.297 → 0.0.298

package/src/file/file.controller.ts

@@ -2,19 +2,19 @@ import { Public, Role } from '@hed-hog/api';
 import { getLocaleText, Locale } from '@hed-hog/api-locale';
 import { Pagination } from '@hed-hog/api-pagination';
 import {
-  Body,
-  Controller,
-  Delete,
-  forwardRef,
-  Get,
-  Inject,
-  Param,
-  ParseIntPipe,
-  Post,
-  Put,
-  Res,
-  UploadedFile,
-  UseInterceptors,
+    Body,
+    Controller,
+    Delete,
+    forwardRef,
+    Get,
+    Inject,
+    Param,
+    ParseIntPipe,
+    Post,
+    Put,
+    Res,
+    UploadedFile,
+    UseInterceptors,
 } from '@nestjs/common';
 import { FileInterceptor } from '@nestjs/platform-express';
 import { Response } from 'express';
@@ -127,6 +127,30 @@ export class FileController {
 
     try {
 
+      const numericId = Number(token);
+      const isNumericId = Number.isInteger(numericId) && String(numericId) === token;
+
+      if (isNumericId && numericId > 0) {
+        const { stream, filename, mimetype, size } =
+          await this.fileService.openById(locale, numericId);
+
+        const encodedFilename = encodeURIComponent(filename);
+
+        res.set({
+          'Content-Type': mimetype || 'application/octet-stream',
+          'Content-Disposition':
+            `inline; filename="${filename}"; ` +
+            `filename*=UTF-8''${encodedFilename}`,
+        });
+
+        if (typeof size === 'number') {
+          res.set('Content-Length', `${size}`);
+        }
+
+        stream.pipe(res);
+        return;
+      }
+
       const { stream, filename, mimetype, size } =
         await this.fileService.download(locale, token);
 

package/src/file/file.service.ts

@@ -258,11 +258,26 @@ export class FileService implements OnModuleInit {
 
     const provider = await this.getProvider();
 
-    const buffer = Buffer.from(
-      await provider.buffer(
-        storage === EnumProvider.LOCAL ? file.path : (new URL(file.path)).pathname
-      )
-    );
+    const providerPath =
+      storage === EnumProvider.LOCAL ? file.path : new URL(file.path).pathname;
+
+    let providerBuffer: Buffer;
+    try {
+      providerBuffer = await provider.buffer(providerPath);
+    } catch (error: any) {
+      const missingInStorage =
+        error?.name === 'NoSuchKey' ||
+        error?.Code === 'NoSuchKey' ||
+        error?.$metadata?.httpStatusCode === 404;
+
+      if (missingInStorage) {
+        throw new NotFoundException(`File not found in storage: ${fileId}`);
+      }
+
+      throw error;
+    }
+
+    const buffer = Buffer.from(providerBuffer);
 
     return {
       file,
@@ -453,6 +468,33 @@ export class FileService implements OnModuleInit {
     }
   }
 
+  async openById(locale: string, fileId: number) {
+    const file = await this.prismaService.file.findFirst({
+      where: { id: fileId },
+      include: {
+        file_mimetype: true,
+      },
+    });
+
+    if (!file) {
+      throw new NotFoundException(
+        getLocaleText('file.download.not_found', locale, `Not found: ${fileId}`),
+      );
+    }
+
+    const provider = await this.getProvider();
+    const metadata = await provider.metaData(file.path);
+    const stream = await provider.readStream(file.path);
+    const size = this.getFileSizeFromMetadata(metadata);
+
+    return {
+      stream,
+      filename: file?.filename || 'download',
+      mimetype: file?.file_mimetype?.name || 'application/octet-stream',
+      size,
+    };
+  }
+
   async tempURL(filepath: string, expires = 3600) {
     return (await this.getProvider()).tempURL(filepath, expires);
   }

package/src/file/provider/s3.provider.ts

@@ -21,15 +21,33 @@ export class S3Provider extends AbstractProvider {
     this.initValidation();
   }
 
+  private resolveS3Key(filepath: string): string {
+    if (!filepath) {
+      throw new Error('Invalid filepath for S3');
+    }
+
+    try {
+      const url = new URL(filepath);
+      const keyFromUrl = url.pathname.split('/').filter(Boolean).join('/');
+      if (!keyFromUrl) {
+        throw new Error(`Invalid filepath "${filepath}" for S3`);
+      }
+      return keyFromUrl;
+    } catch {
+      const keyFromPath = filepath.split('/').filter(Boolean).join('/');
+      if (!keyFromPath) {
+        throw new Error(`Invalid filepath "${filepath}" for S3`);
+      }
+      return keyFromPath;
+    }
+  }
+
   async buffer(filepath: string): Promise<Buffer> {
     const s3 = await this.getClient();
-    const url = new URL(filepath);
-    if (!url.pathname) {
-      throw new Error(`Invalid filepath "${filepath}" for S3`);
-    }
+    const key = this.resolveS3Key(filepath);
     const command = new GetObjectCommand({
       Bucket: this.setting['storage-s3-bucket'],
-      Key: url.pathname.split('/').slice(1).join('/'),
+      Key: key,
     });
     const result = await s3.send(command);
     // @ts-ignore
@@ -123,37 +141,38 @@ export class S3Provider extends AbstractProvider {
     fileContent: string,
   ): Promise<any> {
     const s3 = await this.getClient();
+    const storedFilename = this.getFilename(filename);
+    const key = [destination, storedFilename].join('/');
     const command = new PutObjectCommand({
       Bucket: this.setting['storage-s3-bucket'],
-      Key: [destination, this.getFilename(filename)].join('/'),
+      Key: key,
       Body: fileContent,
     });
     await s3.send(command);
     // S3 v3 não retorna Location diretamente, construa a URL:
-    return `https://${this.setting['storage-s3-bucket']}.s3.${this.setting['storage-s3-region']}.amazonaws.com/${destination}/${this.getFilename(filename)}`;
+    return `https://${this.setting['storage-s3-bucket']}.s3.${this.setting['storage-s3-region']}.amazonaws.com/${key}`;
   }
 
   async upload(destination: string, file: MulterFile): Promise<any> {
     const s3 = await this.getClient();
+    const storedFilename = this.getFilename(file.originalname);
+    const key = [destination, storedFilename].join('/');
     const command = new PutObjectCommand({
       Bucket: this.setting['storage-s3-bucket'],
-      Key: [destination, this.getFilename(file.originalname)].join('/'),
+      Key: key,
       Body: file.buffer,
     });
     await s3.send(command);
-    return `https://${this.setting['storage-s3-bucket']}.s3.${this.setting['storage-s3-region']}.amazonaws.com/${destination}/${this.getFilename(file.originalname)}`;
+    return `https://${this.setting['storage-s3-bucket']}.s3.${this.setting['storage-s3-region']}.amazonaws.com/${key}`;
   }
 
   async delete(filepath: string): Promise<any> {
     const s3 = await this.getClient();
-    const url = new URL(filepath);
-    if (!url.pathname) {
-      throw new Error(`Invalid filepath "${filepath}" for S3`);
-    }
+    const key = this.resolveS3Key(filepath);
     await s3.send(
       new DeleteObjectCommand({
         Bucket: this.setting['storage-s3-bucket'],
-        Key: url.pathname.split('/').slice(1).join('/'),
+        Key: key,
       }),
     );
     return true;
@@ -161,13 +180,10 @@ export class S3Provider extends AbstractProvider {
 
   async readStream(filepath: string): Promise<Readable> {
     const s3 = await this.getClient();
-    const url = new URL(filepath);
-    if (!url.pathname) {
-      throw new Error(`Invalid filepath "${filepath}" for S3`);
-    }
+    const key = this.resolveS3Key(filepath);
     const command = new GetObjectCommand({
       Bucket: this.setting['storage-s3-bucket'],
-      Key: url.pathname.split('/').slice(1).join('/'),
+      Key: key,
     });
     const result = await s3.send(command);
     // @ts-ignore
@@ -176,13 +192,10 @@ export class S3Provider extends AbstractProvider {
 
   async metaData(filepath: string): Promise<any> {
     const s3 = await this.getClient();
-    const url = new URL(filepath);
-    if (!url.pathname) {
-      throw new Error(`Invalid filepath "${filepath}" for S3`);
-    }
+    const key = this.resolveS3Key(filepath);
     const command = new HeadObjectCommand({
       Bucket: this.setting['storage-s3-bucket'],
-      Key: url.pathname.split('/').slice(1).join('/'),
+      Key: key,
     });
     const result = await s3.send(command);
     return result; // returns metadata
@@ -190,13 +203,10 @@ export class S3Provider extends AbstractProvider {
 
   async tempURL(filepath: string, expires = 3600): Promise<string> {
     const s3Client = await this.getS3Client();
-    const url = new URL(filepath);
-    if (!url.pathname) {
-      throw new Error(`Invalid filepath "${filepath}" for S3`);
-    }
+    const key = this.resolveS3Key(filepath);
     const command = new GetObjectCommand({
       Bucket: this.setting['storage-s3-bucket'],
-      Key: url.pathname.split('/').slice(1).join('/'),
+      Key: key,
     });
     // Use S3Client instance for getSignedUrl
     return await getSignedUrl(s3Client as any, command, { expiresIn: expires });

package/src/oauth/oauth.service.ts

@@ -1,11 +1,11 @@
 import { PrismaService, user_account_provider_52222e2ecb_enum } from '@hed-hog/api-prisma';
 import {
-    BadRequestException,
-    ConflictException,
-    Inject,
-    Injectable,
-    NotFoundException,
-    forwardRef
+  BadRequestException,
+  ConflictException,
+  Inject,
+  Injectable,
+  NotFoundException,
+  forwardRef
 } from '@nestjs/common';
 import { AuthService } from '../auth/auth.service';
 import { FileService } from '../file/file.service';
@@ -13,6 +13,7 @@ import { MailService } from '../mail/mail.service';
 import { SecurityService } from '../security/security.service';
 import { SettingService } from '../setting/setting.service';
 import { TokenService } from '../token/token.service';
+import { USER_AVATAR_UPLOAD_DESTINATION } from '../user/constants/user.constants';
 import { UserService } from '../user/user.service';
 import { OAuthProvider } from './interfaces/OAuthProvider';
 import { FacebookProvider } from './providers/facebook.provider';
@@ -385,7 +386,7 @@ export class OAuthService {
       size: buffer.length,
     } as any;
 
-    const savedFile = await this.file.upload('profile-pictures', file);
+    const savedFile = await this.file.upload(USER_AVATAR_UPLOAD_DESTINATION, file);
     return savedFile.id;
   }
 }

package/src/user/constants/user.constants.ts

@@ -1 +1,2 @@
 export const SALT_ROUNDS = 10;
+export const USER_AVATAR_UPLOAD_DESTINATION = 'profile-pictures';

package/src/user/user.service.ts

@@ -12,6 +12,7 @@ import { ChallengeService } from '../challenge/challenge.service';
 import { DeleteDTO } from '../dto/delete.dto';
 import { FileService } from '../file/file.service';
 import { SecurityService } from '../security/security.service';
+import { USER_AVATAR_UPLOAD_DESTINATION } from './constants/user.constants';
 import { CreateWithEmailAndPasswordDTO } from './dto/create-with-email-and-password.dto';
 import { ResetPasswordDTO } from './dto/reset-password.dto';
 import { UpdateDTO } from './dto/update.dto';
@@ -272,7 +273,7 @@ export class UserService {
   async changeAvatar(locale: string, userId: number, avatar: MulterFile) {
     const user = await this.validateUserExists(locale, userId);
 
-    const newFile = await this.file.upload('user/avatar', avatar);
+    const newFile = await this.file.upload(USER_AVATAR_UPLOAD_DESTINATION, avatar);
 
     await this.deleteOldAvatar(locale, user.photo_id);