fix(media): handle missing path parameter and improve error logging
- Updated `getFile` method to validate `path` query parameter. - Added improved logging for file retrieval errors. - Updated test cases to cover scenarios with missing `path`.
This commit is contained in:
@@ -49,6 +49,13 @@ describe("MediaController", () => {
|
|||||||
expect(stream.pipe).toHaveBeenCalledWith(res);
|
expect(stream.pipe).toHaveBeenCalledWith(res);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("should throw NotFoundException if path is missing", async () => {
|
||||||
|
const res = {} as unknown as Response;
|
||||||
|
await expect(controller.getFile("", res)).rejects.toThrow(
|
||||||
|
NotFoundException,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
it("should throw NotFoundException if file is not found", async () => {
|
it("should throw NotFoundException if file is not found", async () => {
|
||||||
mockS3Service.getFileInfo.mockRejectedValue(new Error("Not found"));
|
mockS3Service.getFileInfo.mockRejectedValue(new Error("Not found"));
|
||||||
const res = {} as unknown as Response;
|
const res = {} as unknown as Response;
|
||||||
|
|||||||
@@ -1,27 +1,47 @@
|
|||||||
import { Controller, Get, NotFoundException, Param, Res } from "@nestjs/common";
|
import {
|
||||||
|
Controller,
|
||||||
|
Get,
|
||||||
|
Logger,
|
||||||
|
NotFoundException,
|
||||||
|
Query,
|
||||||
|
Res,
|
||||||
|
} from "@nestjs/common";
|
||||||
import type { Response } from "express";
|
import type { Response } from "express";
|
||||||
import type { BucketItemStat } from "minio";
|
import type { BucketItemStat } from "minio";
|
||||||
import { S3Service } from "../s3/s3.service";
|
import { S3Service } from "../s3/s3.service";
|
||||||
|
|
||||||
@Controller("media")
|
@Controller("media")
|
||||||
export class MediaController {
|
export class MediaController {
|
||||||
|
private readonly logger = new Logger(MediaController.name);
|
||||||
|
|
||||||
constructor(private readonly s3Service: S3Service) {}
|
constructor(private readonly s3Service: S3Service) {}
|
||||||
|
|
||||||
@Get("*key")
|
@Get()
|
||||||
async getFile(@Param("key") key: string, @Res() res: Response) {
|
async getFile(@Query("path") path: string, @Res() res: Response) {
|
||||||
try {
|
if (!path) {
|
||||||
const stats = (await this.s3Service.getFileInfo(key)) as BucketItemStat;
|
this.logger.warn("Tentative d'accès à un média sans paramètre 'path'");
|
||||||
const stream = await this.s3Service.getFile(key);
|
throw new NotFoundException("Paramètre 'path' manquant");
|
||||||
|
}
|
||||||
|
|
||||||
const contentType =
|
try {
|
||||||
stats.metaData?.["content-type"] || "application/octet-stream";
|
this.logger.log(`Récupération du fichier : ${path}`);
|
||||||
|
const stats = (await this.s3Service.getFileInfo(path)) as BucketItemStat;
|
||||||
|
const stream = await this.s3Service.getFile(path);
|
||||||
|
|
||||||
|
const contentType: string =
|
||||||
|
stats.metaData?.["content-type"] ||
|
||||||
|
stats.metaData?.["Content-Type"] ||
|
||||||
|
"application/octet-stream";
|
||||||
|
|
||||||
res.setHeader("Content-Type", contentType);
|
res.setHeader("Content-Type", contentType);
|
||||||
res.setHeader("Content-Length", stats.size);
|
res.setHeader("Content-Length", stats.size);
|
||||||
res.setHeader("Cache-Control", "public, max-age=31536000, immutable");
|
res.setHeader("Cache-Control", "public, max-age=31536000, immutable");
|
||||||
|
|
||||||
stream.pipe(res);
|
stream.pipe(res);
|
||||||
} catch (_error) {
|
} catch (error) {
|
||||||
|
this.logger.error(
|
||||||
|
`Erreur lors de la récupération du fichier ${path} : ${error.message}`,
|
||||||
|
);
|
||||||
throw new NotFoundException("Fichier non trouvé");
|
throw new NotFoundException("Fichier non trouvé");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user