6 Commits

Author SHA1 Message Date
Mathis HERRIOT
b6b37ebc6b docs(api): update /media endpoint documentation to use path query parameter
Some checks failed
CI/CD Pipeline / Valider backend (push) Failing after 56s
CI/CD Pipeline / Valider frontend (push) Successful in 1m38s
CI/CD Pipeline / Valider documentation (push) Successful in 1m41s
CI/CD Pipeline / Déploiement en Production (push) Has been skipped
2026-01-20 21:28:23 +01:00
Mathis HERRIOT
d647a585c8 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`.
2026-01-20 21:28:10 +01:00
Mathis HERRIOT
6a2abf115f fix(s3): update public URL to include path query parameter
- Updated `getPublicUrl` to use `?path=<key>` format in public URLs.
- Adjusted corresponding test cases to reflect the new URL structure.
2026-01-20 21:27:49 +01:00
Mathis HERRIOT
ded2d3220d build(release): bump package versions to 1.0.5
All checks were successful
CI/CD Pipeline / Valider backend (push) Successful in 1m39s
CI/CD Pipeline / Valider frontend (push) Successful in 1m46s
CI/CD Pipeline / Valider documentation (push) Successful in 1m50s
CI/CD Pipeline / Déploiement en Production (push) Successful in 1m57s
2026-01-20 20:00:36 +01:00
Mathis HERRIOT
162d53630d refactor(theme): organize imports and format components for consistency
All checks were successful
CI/CD Pipeline / Valider backend (push) Successful in 1m38s
CI/CD Pipeline / Valider frontend (push) Successful in 1m42s
CI/CD Pipeline / Valider documentation (push) Successful in 1m48s
CI/CD Pipeline / Déploiement en Production (push) Successful in 2m5s
- Reorganized imports in multiple files for better readability.
- Fixed formatting issues in `mode-toggle` and `settings` components to improve maintainability.
2026-01-20 19:59:16 +01:00
Mathis HERRIOT
0e8a2e3986 build(release): bump package versions to 1.0.4
Some checks failed
CI/CD Pipeline / Valider frontend (push) Failing after 58s
CI/CD Pipeline / Valider backend (push) Successful in 1m33s
CI/CD Pipeline / Valider documentation (push) Successful in 1m38s
CI/CD Pipeline / Déploiement en Production (push) Has been skipped
2026-01-20 16:28:37 +01:00
14 changed files with 60 additions and 30 deletions

View File

@@ -1,6 +1,6 @@
{ {
"name": "@memegoat/backend", "name": "@memegoat/backend",
"version": "1.0.3", "version": "1.0.5",
"description": "", "description": "",
"author": "", "author": "",
"private": true, "private": true,

View File

@@ -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;

View File

@@ -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é");
} }
} }

View File

@@ -192,7 +192,7 @@ describe("S3Service", () => {
return null; return null;
}); });
const url = service.getPublicUrl("test.webp"); const url = service.getPublicUrl("test.webp");
expect(url).toBe("https://api.test.com/media/test.webp"); expect(url).toBe("https://api.test.com/media?path=test.webp");
}); });
it("should use DOMAIN_NAME and PORT for localhost", () => { it("should use DOMAIN_NAME and PORT for localhost", () => {
@@ -205,7 +205,7 @@ describe("S3Service", () => {
}, },
); );
const url = service.getPublicUrl("test.webp"); const url = service.getPublicUrl("test.webp");
expect(url).toBe("http://localhost:3000/media/test.webp"); expect(url).toBe("http://localhost:3000/media?path=test.webp");
}); });
it("should use api.DOMAIN_NAME for production", () => { it("should use api.DOMAIN_NAME for production", () => {
@@ -217,7 +217,7 @@ describe("S3Service", () => {
}, },
); );
const url = service.getPublicUrl("test.webp"); const url = service.getPublicUrl("test.webp");
expect(url).toBe("https://api.memegoat.fr/media/test.webp"); expect(url).toBe("https://api.memegoat.fr/media?path=test.webp");
}); });
}); });
}); });

View File

@@ -173,6 +173,6 @@ export class S3Service implements OnModuleInit, IStorageService {
baseUrl = `https://api.${domain}`; baseUrl = `https://api.${domain}`;
} }
return `${baseUrl}/media/${storageKey}`; return `${baseUrl}/media?path=${storageKey}`;
} }
} }

View File

@@ -239,7 +239,7 @@ Cette page documente tous les points de terminaison disponibles sur l'API Memego
</Accordion> </Accordion>
<Accordion title="Médias (/media)"> <Accordion title="Médias (/media)">
- `GET /media/*key` : Accès direct aux fichiers stockés sur S3. Supporte la mise en cache agressive. - `GET /media?path=key` : Accès direct aux fichiers stockés sur S3 via le paramètre `path`. Supporte la mise en cache agressive.
</Accordion> </Accordion>
<Accordion title="Administration (/admin)"> <Accordion title="Administration (/admin)">

View File

@@ -24,7 +24,7 @@ Le système utilise plusieurs méthodes d'authentification sécurisées pour ré
Memegoat utilise une architecture de stockage d'objets compatible S3 (MinIO). Les interactions se font de deux manières : Memegoat utilise une architecture de stockage d'objets compatible S3 (MinIO). Les interactions se font de deux manières :
1. **Proxification Backend** : Pour l'accès public via `/media/*`. 1. **Proxification Backend** : Pour l'accès public via `/media?path=...`.
2. **URLs Présignées** : Pour l'upload sécurisé direct depuis le client (via `/contents/upload-url`). 2. **URLs Présignées** : Pour l'upload sécurisé direct depuis le client (via `/contents/upload-url`).
### Notifications (Mail) ### Notifications (Mail)

View File

@@ -1,6 +1,6 @@
{ {
"name": "@memegoat/frontend", "name": "@memegoat/frontend",
"version": "1.0.3", "version": "1.0.5",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "next dev", "dev": "next dev",

View File

@@ -1,6 +1,7 @@
import * as React from "react"; import * as React from "react";
import { AppSidebar } from "@/components/app-sidebar"; import { AppSidebar } from "@/components/app-sidebar";
import { MobileFilters } from "@/components/mobile-filters"; import { MobileFilters } from "@/components/mobile-filters";
import { ModeToggle } from "@/components/mode-toggle";
import { SearchSidebar } from "@/components/search-sidebar"; import { SearchSidebar } from "@/components/search-sidebar";
import { import {
SidebarInset, SidebarInset,
@@ -8,7 +9,6 @@ import {
SidebarTrigger, SidebarTrigger,
} from "@/components/ui/sidebar"; } from "@/components/ui/sidebar";
import { UserNavMobile } from "@/components/user-nav-mobile"; import { UserNavMobile } from "@/components/user-nav-mobile";
import { ModeToggle } from "@/components/mode-toggle";
export default function DashboardLayout({ export default function DashboardLayout({
children, children,

View File

@@ -1,7 +1,15 @@
"use client"; "use client";
import { zodResolver } from "@hookform/resolvers/zod"; import { zodResolver } from "@hookform/resolvers/zod";
import { Loader2, Moon, Laptop, Palette, Save, Sun, User as UserIcon } from "lucide-react"; import {
Laptop,
Loader2,
Moon,
Palette,
Save,
Sun,
User as UserIcon,
} from "lucide-react";
import { useTheme } from "next-themes"; import { useTheme } from "next-themes";
import * as React from "react"; import * as React from "react";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
@@ -194,7 +202,7 @@ export default function SettingsPage() {
</Form> </Form>
</CardContent> </CardContent>
</Card> </Card>
<Card className="mt-8"> <Card className="mt-8">
<CardHeader> <CardHeader>
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
<Palette className="h-5 w-5 text-primary" /> <Palette className="h-5 w-5 text-primary" />

View File

@@ -19,8 +19,8 @@ import {
import Link from "next/link"; import Link from "next/link";
import { usePathname, useSearchParams } from "next/navigation"; import { usePathname, useSearchParams } from "next/navigation";
import * as React from "react"; import * as React from "react";
import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
import { ModeToggle } from "@/components/mode-toggle"; import { ModeToggle } from "@/components/mode-toggle";
import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
import { import {
Collapsible, Collapsible,
CollapsibleContent, CollapsibleContent,

View File

@@ -2,7 +2,6 @@
import { Moon, Sun } from "lucide-react"; import { Moon, Sun } from "lucide-react";
import { useTheme } from "next-themes"; import { useTheme } from "next-themes";
import * as React from "react";
import { Button } from "@/components/ui/button"; import { Button } from "@/components/ui/button";
import { import {
DropdownMenu, DropdownMenu,
@@ -24,12 +23,8 @@ export function ModeToggle() {
</Button> </Button>
</DropdownMenuTrigger> </DropdownMenuTrigger>
<DropdownMenuContent align="end"> <DropdownMenuContent align="end">
<DropdownMenuItem onClick={() => setTheme("light")}> <DropdownMenuItem onClick={() => setTheme("light")}>Clair</DropdownMenuItem>
Clair <DropdownMenuItem onClick={() => setTheme("dark")}>Sombre</DropdownMenuItem>
</DropdownMenuItem>
<DropdownMenuItem onClick={() => setTheme("dark")}>
Sombre
</DropdownMenuItem>
<DropdownMenuItem onClick={() => setTheme("system")}> <DropdownMenuItem onClick={() => setTheme("system")}>
Système Système
</DropdownMenuItem> </DropdownMenuItem>

View File

@@ -1,7 +1,7 @@
"use client"; "use client";
import type * as React from "react";
import { ThemeProvider as NextThemesProvider } from "next-themes"; import { ThemeProvider as NextThemesProvider } from "next-themes";
import type * as React from "react";
export function ThemeProvider({ export function ThemeProvider({
children, children,

View File

@@ -1,6 +1,6 @@
{ {
"name": "@memegoat/source", "name": "@memegoat/source",
"version": "1.0.3", "version": "1.0.5",
"description": "", "description": "",
"scripts": { "scripts": {
"version:get": "cmake -P version.cmake GET", "version:get": "cmake -P version.cmake GET",