From bcbb5030ec684a56981848bd3dbc6d94e3dbf2ab Mon Sep 17 00:00:00 2001 From: Gitea Actions <-2+gitea-actions@noreply.localhost> Date: Fri, 16 Oct 2026 18:51:27 +0000 Subject: [PATCH] feat(chat,files): salon par dossier, favoris, cloisonnement des droits admin (#8) - chat: salon attache a un dossier, membres = comptes ayant acces au dossier - securite: suppression du passage automatique admin sur fichiers/dossiers/ corbeille/recherche/galerie/chat ; l'admin n'accede qu'a ses partages - favoris: tri en tete dans l'explorateur + page dediee (GET /favorites) - ui: retrait des pastilles Systeme/Public sur la carte dossier - migration 007_chat : table chat_messages --------- Co-authored-by: xEsiah Reviewed-on: https://git.cohaise.dev/Esiah/CoHaiSe-CLOUD/pulls/8 Reviewed-by: Esiah Co-authored-by: Gitea Actions <-2+gitea-actions@noreply.localhost> --- backend/README.md | 5 +- backend/migrations/007_chat.sql | 28 ++ backend/src/access.ts | 14 +- backend/src/index.ts | 2 + backend/src/routes/chat.ts | 214 ++++++++++++ backend/src/routes/files.ts | 49 ++- backend/src/routes/folders.ts | 4 +- backend/src/routes/media.ts | 2 +- backend/src/routes/search.ts | 5 +- backend/src/routes/trash.ts | 34 +- docker/reset-cloud.sql | 1 + docs/api.md | 25 +- frontend/src/App.tsx | 2 + frontend/src/components/AppShell.tsx | 30 +- frontend/src/components/Avatar.tsx | 46 +++ frontend/src/components/FolderChat.tsx | 442 +++++++++++++++++++++++++ frontend/src/components/icons.tsx | 14 + frontend/src/lib/api.ts | 39 +++ frontend/src/pages/Browser.tsx | 35 +- frontend/src/pages/Favorites.tsx | 116 +++++++ 20 files changed, 1035 insertions(+), 72 deletions(-) create mode 100644 backend/migrations/007_chat.sql create mode 100644 backend/src/routes/chat.ts create mode 100644 frontend/src/components/Avatar.tsx create mode 100644 frontend/src/components/FolderChat.tsx create mode 100644 frontend/src/pages/Favorites.tsx diff --git a/backend/README.md b/backend/README.md index 178b91c..e0317b8 100644 --- a/backend/README.md +++ b/backend/README.md @@ -22,6 +22,7 @@ erDiagram users ||--o{ folders : "proprietaire" users ||--o{ files : "proprietaire" users ||--o{ folder_permissions : "beneficie" + users ||--o{ chat_messages : "ecrit" users ||--o{ audit_logs : "trace" storage_locations ||--o{ folders : "contient" storage_locations ||--o{ files : "contient" @@ -35,7 +36,7 @@ erDiagram ## Tables -15 tables en base après `005` (`share_links` ayant été supprimée par `004`). +16 tables en base après `007` (`share_links` ayant été supprimée par `004`). Seules celles marquées « `/…` » sont atteignables depuis le front. | Table | Rôle | Exposée par l'API | @@ -52,6 +53,7 @@ Seules celles marquées « `/…` » sont atteignables depuis le front. | `files` | Métadonnées de l'original, jamais ré-écrit | `/files` | | `media_metadata` | Dimensions, durée, codecs, EXIF, couleur dominante | non (galerie non exposée) | | `file_variants` | Miniatures et aperçus WebP dérivés | non | +| `chat_messages` | Salon d'un dossier : dossier (`ON DELETE CASCADE`), auteur (`ON DELETE SET NULL`), soft-delete | `/folders/:id/chat` | | `settings` | Configuration clé-valeur | non | | `audit_logs` | Piste d'audit | non (écrit par `audit()`) | | `schema_migrations` | Versions appliquées | non | @@ -163,6 +165,7 @@ plus grande marge disponible. | `004_cloud_requirements.sql` | identité complète, sessions, validation d'e-mail, avatar, `access_type`, médias, variantes, budget par compte, suppression des liens publics | | `005_storage_location_realign.sql` | `mount_path` réaligné sur `/data/media`, quota 400 Go, garde-fou sur les emplacements sans quota | | `006_public_folder.sql` | crée le dossier système « Public », retire les réglages devenus morts | +| `007_chat.sql` | crée `chat_messages`, le salon d'un dossier (FK dossier `ON DELETE CASCADE`) | `004` porte le passage d'un modèle de partage public vers un stockage privé : elle supprime `share_links`, scinde `display_name` en `first_name` et diff --git a/backend/migrations/007_chat.sql b/backend/migrations/007_chat.sql new file mode 100644 index 0000000..3691ca7 --- /dev/null +++ b/backend/migrations/007_chat.sql @@ -0,0 +1,28 @@ +-- 007_chat.sql +-- +-- Chat attache a un dossier : chaque dossier possede son propre salon, et ses +-- membres sont les comptes qui ont acces a ce dossier (proprietaire, permission +-- nominative, dossier public pour tout compte authentifie, ou role admin). +-- +-- Le salon suit la vie du dossier : `ON DELETE CASCADE` emporte les messages a +-- la purge definitive. Une mise a la corbeille est un simple `deleted_at`, donc +-- le chat est conserve tant que le dossier peut etre restaure. +-- +-- L'auteur est reference par `user_id` (`ON DELETE SET NULL`) : la suppression +-- d'un compte ne doit jamais effacer l'historique. L'interface affiche +-- « Compte supprime » quand l'auteur n'existe plus. + +CREATE TABLE chat_messages ( + id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, + folder_id CHAR(36) NOT NULL, + user_id CHAR(36) NULL, + body TEXT NOT NULL, + created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3), + deleted_at DATETIME(3) NULL, + PRIMARY KEY (id), + KEY idx_chat_messages_folder (folder_id, id), + KEY idx_chat_messages_user (user_id), + CONSTRAINT chk_chat_messages_body CHECK (CHAR_LENGTH(body) > 0 AND CHAR_LENGTH(body) <= 2000), + CONSTRAINT fk_chat_messages_folder FOREIGN KEY (folder_id) REFERENCES folders (id) ON DELETE CASCADE, + CONSTRAINT fk_chat_messages_user FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE SET NULL +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; diff --git a/backend/src/access.ts b/backend/src/access.ts index 18cd6bf..f971506 100644 --- a/backend/src/access.ts +++ b/backend/src/access.ts @@ -5,6 +5,12 @@ import { clientIp as sharedClientIp, type Db, type SessionUser } from "./lib/ind * Les droits sont toujours recalcules depuis la session serveur. Le role de * l'utilisateur ne vient jamais d'un en-tete client : une requete qui se * declare admin n'a aucun effet sur cette evaluation. + * + * Le role `admin` ne donne aucun droit special sur les dossiers ni sur les + * fichiers : un administrateur n'accede qu'a ses propres dossiers et a ceux + * partages nominativement avec lui, exactement comme un compte ordinaire. Son + * role ne sert qu'au panneau d'administration. Consequence directe : il n'est + * membre que des salons de discussion des dossiers auxquels il a acces. */ /** @@ -19,7 +25,6 @@ export const READ_SQL = `( f.owner_id = ? AND ( fp.expires_at IS NULL OR fp.expires_at > UTC_TIMESTAMP() ) ) )`; export const canWrite = async (db: Db, user: SessionUser, folderId: string): Promise => { - if (user.role_slug === "admin") return true; const row = await db.one( `SELECT 1 AS granted FROM folders f @@ -37,7 +42,6 @@ export const canWrite = async (db: Db, user: SessionUser, folderId: string): Pro }; export const canRead = async (db: Db, user: SessionUser, folderId: string): Promise => { - if (user.role_slug === "admin") return true; const row = await db.one( `SELECT 1 AS granted FROM folders f @@ -64,7 +68,6 @@ export const canWriteExplicit = async ( user: SessionUser, folderId: string, ): Promise => { - if (user.role_slug === "admin") return true; const row = await db.one( `SELECT 1 AS granted FROM folders f @@ -81,8 +84,8 @@ export const canWriteExplicit = async ( }; /** - * Gestion du dossier (renommer, deplacer, supprimer, regler les permissions) : - * reservee au proprietaire ou a un administrateur. Un dossier public permet + * Gestion du dossier (renommer, deplacer, supprimer, regler les permissions, + * moderer le salon) : reservee au proprietaire. Un dossier public permet * d'ajouter, pas de reorganiser l'espace commun. */ export const canManageFolder = async ( @@ -90,7 +93,6 @@ export const canManageFolder = async ( user: SessionUser, folderId: string, ): Promise => { - if (user.role_slug === "admin") return true; const row = await db.one( `SELECT 1 AS granted FROM folders WHERE id = ? AND deleted_at IS NULL AND owner_id = ? LIMIT 1`, diff --git a/backend/src/index.ts b/backend/src/index.ts index 2f6c234..a66e6d7 100644 --- a/backend/src/index.ts +++ b/backend/src/index.ts @@ -4,6 +4,7 @@ import { purgeExpiredSessions, startService } from "./lib/index.js"; import { registerAccountRoutes } from "./routes/account.js"; import { registerAdminRoutes } from "./routes/admin.js"; import { registerAuthRoutes } from "./routes/auth.js"; +import { registerChatRoutes } from "./routes/chat.js"; import { registerFileRoutes } from "./routes/files.js"; import { registerFolderRoutes } from "./routes/folders.js"; import { registerMediaRoutes } from "./routes/media.js"; @@ -21,6 +22,7 @@ void startService({ routes: (app, { db, config }) => { registerAuthRoutes(app, db, config); registerAccountRoutes(app, db, config); + registerChatRoutes(app, db, config); registerFolderRoutes(app, db, config); registerFileRoutes(app, db, config); registerMediaRoutes(app, db); diff --git a/backend/src/routes/chat.ts b/backend/src/routes/chat.ts new file mode 100644 index 0000000..e43dca8 --- /dev/null +++ b/backend/src/routes/chat.ts @@ -0,0 +1,214 @@ +import { z } from "zod"; +import { + AppError, + createRateLimiter, + currentUser, + requireAuth, + type App, + type Config, + type Db, +} from "../lib/index.js"; +import { audit, canManageFolder, canRead } from "../access.js"; + +/** + * Chat attache a un dossier. Le salon ne se lit et ne s'ecrit qu'avec l'acces + * au dossier : le role global ne suffit jamais, `admin` compris. + * + * Les membres du salon sont exactement les comptes qui ont acces au dossier + * (proprietaire, permissions nominatives, dossier public). Un administrateur + * n'est donc membre que des salons des dossiers partages avec lui. + */ + +const uuid = z + .string() + .regex( + /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i, + "Identifiant invalide.", + ); + +const sendInput = z.object({ + body: z.string().trim().min(1, "Message vide.").max(2000, "Message trop long."), +}); + +interface MessageRow { + id: number; + user_id: string | null; + body: string; + created_at: string; + first_name: string | null; + last_name: string | null; + avatar_updated_at: Date | null; +} + +/** Auteur joint a la ligne : meme jointure que la lecture, pour la reponse du POST. */ +const SELECT_MESSAGE = ` + SELECT m.id, m.user_id, m.body, m.created_at, + u.first_name, u.last_name, ua.updated_at AS avatar_updated_at + FROM chat_messages m + LEFT JOIN users u ON u.id = m.user_id + LEFT JOIN user_avatars ua ON ua.user_id = m.user_id`; + +const publicMessage = (row: MessageRow) => ({ + id: row.id, + user_id: row.user_id, + first_name: row.first_name, + last_name: row.last_name, + body: row.body, + created_at: row.created_at, + has_avatar: row.user_id !== null && row.avatar_updated_at !== null, + avatar_updated_at: row.avatar_updated_at, +}); + +export const registerChatRoutes = (app: App, db: Db, config: Config): void => { + // Ecriture bornee par compte : le salon reste utilisable meme si un client + // s'emballe. La lecture (interrogation periodique) n'est pas limitee ici. + const limiter = createRateLimiter(20, 10_000); + + /** + * Le dossier doit exister et etre accessible : `canRead` rejette une session + * sans acces comme un dossier inexistant (404, pour ne rien confirmer). + */ + const assertFolder = async ( + folderId: string, + ): Promise<{ id: string; owner_id: string | null; access_type: string }> => { + if (!uuid.safeParse(folderId).success) throw AppError.notFound("Dossier introuvable."); + const folder = await db.one<{ id: string; owner_id: string | null; access_type: string }>( + "SELECT id, owner_id, access_type FROM folders WHERE id = ? AND deleted_at IS NULL", + [folderId], + ); + if (!folder) throw AppError.notFound("Dossier introuvable."); + return folder; + }; + + app.get("/api/cloud/folders/:folderId/chat/members", requireAuth, async (context) => { + const user = currentUser(context); + const folderId = context.req.param("folderId") ?? ""; + const folder = await assertFolder(folderId); + if (!(await canRead(db, user, folderId))) throw AppError.notFound("Dossier introuvable."); + + // Les membres sont ceux qui ont acces au dossier : proprietaire, + // permission nominative non expiree, et tous les comptes actifs si le + // dossier est public. Le role global ne compte pas. + const rows = await db.query<{ + id: string; + first_name: string; + last_name: string; + role_slug: string; + avatar_updated_at: Date | null; + last_login_at: string | null; + }>( + `SELECT u.id, u.first_name, u.last_name, r.slug AS role_slug, + ua.updated_at AS avatar_updated_at, u.last_login_at + FROM users u + JOIN roles r ON r.id = u.role_id + LEFT JOIN user_avatars ua ON ua.user_id = u.id + WHERE u.deleted_at IS NULL AND u.is_active = 1 + AND ( u.id = ? + OR ? = 1 + OR EXISTS ( SELECT 1 FROM folder_permissions fp + WHERE fp.folder_id = ? AND fp.user_id = u.id + AND fp.level IN ('read', 'write', 'admin') + AND ( fp.expires_at IS NULL OR fp.expires_at > UTC_TIMESTAMP() ) ) ) + ORDER BY u.first_name ASC, u.last_name ASC`, + [folder.owner_id, folder.access_type === "public" ? 1 : 0, folderId], + ); + + return context.json({ + members: rows.map((row) => ({ + id: row.id, + first_name: row.first_name, + last_name: row.last_name, + role_slug: row.role_slug, + has_avatar: row.avatar_updated_at !== null, + avatar_updated_at: row.avatar_updated_at, + last_login_at: row.last_login_at, + is_self: row.id === user.id, + })), + }); + }); + + app.get("/api/cloud/folders/:folderId/chat/messages", requireAuth, async (context) => { + const user = currentUser(context); + const folderId = context.req.param("folderId") ?? ""; + await assertFolder(folderId); + if (!(await canRead(db, user, folderId))) throw AppError.notFound("Dossier introuvable."); + + const limit = Math.min(200, Math.max(1, Number(context.req.query("limit")) || 50)); + const after = Math.max(0, Number(context.req.query("after")) || 0); + + // `after` sert a la synchronisation incrementale (polling) : on ne remonte + // que les messages posterieurs au dernier connu, dans l'ordre du temps. + // Sans `after` : les `limit` derniers, remis dans l'ordre croissant. + const rows = + after > 0 + ? await db.query( + `${SELECT_MESSAGE} + WHERE m.folder_id = ? AND m.deleted_at IS NULL AND m.id > ? + ORDER BY m.id ASC + LIMIT ${limit}`, + [folderId, after], + ) + : ( + await db.query( + `${SELECT_MESSAGE} + WHERE m.folder_id = ? AND m.deleted_at IS NULL + ORDER BY m.id DESC + LIMIT ${limit}`, + [folderId], + ) + ).reverse(); + + return context.json({ messages: rows.map(publicMessage) }); + }); + + app.post("/api/cloud/folders/:folderId/chat/messages", requireAuth, async (context) => { + const user = currentUser(context); + const folderId = context.req.param("folderId") ?? ""; + await assertFolder(folderId); + // Etre membre du salon suffit a ecrire : un acces `read` participe a la + // discussion, exactement comme le proprietaire. + if (!(await canRead(db, user, folderId))) throw AppError.notFound("Dossier introuvable."); + + if (!limiter.allow(user.id)) { + throw AppError.unprocessable("Vous envoyez des messages trop rapidement."); + } + const parsed = sendInput.safeParse(await context.req.json().catch(() => null)); + if (!parsed.success) { + throw AppError.badRequest(parsed.error.issues[0]?.message ?? "Message invalide."); + } + + const result = await db.exec( + "INSERT INTO chat_messages (folder_id, user_id, body) VALUES (?, ?, ?)", + [folderId, user.id, parsed.data.body], + ); + const row = await db.required(`${SELECT_MESSAGE} WHERE m.id = ?`, [result.insertId]); + return context.json({ message: publicMessage(row) }, 201); + }); + + app.delete( + "/api/cloud/folders/:folderId/chat/messages/:id", + requireAuth, + async (context) => { + const user = currentUser(context); + const folderId = context.req.param("folderId") ?? ""; + const id = Number(context.req.param("id")); + await assertFolder(folderId); + if (!(await canRead(db, user, folderId))) throw AppError.notFound("Dossier introuvable."); + if (!Number.isSafeInteger(id) || id <= 0) throw AppError.notFound("Message introuvable."); + + const row = await db.one<{ user_id: string | null }>( + "SELECT user_id FROM chat_messages WHERE id = ? AND folder_id = ? AND deleted_at IS NULL", + [id, folderId], + ); + // Auteur ou gestionnaire du dossier (proprietaire) : meme reponse qu'un + // message inexistant pour ne rien laisser deviner. + if (!row || (row.user_id !== user.id && !(await canManageFolder(db, user, folderId)))) { + throw AppError.notFound("Message introuvable."); + } + + await db.exec("UPDATE chat_messages SET deleted_at = UTC_TIMESTAMP(3) WHERE id = ?", [id]); + await audit(db, context, user, "chat.delete", "message", String(id), { folderId }, config.TRUST_PROXY); + return context.json({ ok: true }); + }, + ); +}; diff --git a/backend/src/routes/files.ts b/backend/src/routes/files.ts index 65240db..c031a7a 100644 --- a/backend/src/routes/files.ts +++ b/backend/src/routes/files.ts @@ -387,7 +387,7 @@ export const registerFileRoutes = (app: App, db: Db, config: Config): void => { // Contre l'IDOR : un dossier qui n'appartient pas a la session rend une // liste vide plutot que de confirmer son existence. - if (folderId !== null && user.role_slug !== "admin" && !(await canRead(db, user, folderId))) { + if (folderId !== null && !(await canRead(db, user, folderId))) { const readable = await db.one( `SELECT 1 AS granted FROM folders f WHERE f.id = ? AND f.deleted_at IS NULL AND f.owner_id = ? LIMIT 1`, @@ -412,13 +412,49 @@ export const registerFileRoutes = (app: App, db: Db, config: Config): void => { AND fp.level IN ('read', 'write', 'admin') AND ( fp.expires_at IS NULL OR fp.expires_at > UTC_TIMESTAMP() ) ) ) ) - ORDER BY name`, - [folderId, user.role_slug === "admin" ? 1 : 0, user.id, user.id], + ORDER BY is_starred DESC, name`, + [folderId, 0, user.id, user.id], ); return context.json({ folderId, files: rows.map(publicFile) }); }); + /** + * Favoris : tous les fichiers etoiles accessibles a la session, tous dossiers + * confondus. Le filtre reprend exactement les droits de lecture de + * l'explorateur (proprietaire, dossier public, permission nominative), sans + * exception pour le role global. + */ + app.get("/api/cloud/favorites", requireAuth, async (context) => { + const user = currentUser(context); + const rows = await db.query( + `SELECT fi.id, fi.folder_id, fi.name, fi.mime_type, fi.size_bytes, fi.checksum_sha256, + fi.relative_path, fi.owner_id, fi.is_starred, fi.download_count, + fi.created_at, fi.updated_at, fo.name AS folder_name + FROM files fi + LEFT JOIN folders fo ON fo.id = fi.folder_id + WHERE fi.deleted_at IS NULL + AND fi.is_starred = 1 + AND ( fi.owner_id = ? + OR ( fi.folder_id IS NOT NULL + AND EXISTS ( SELECT 1 FROM folders f + WHERE f.id = fi.folder_id AND f.deleted_at IS NULL + AND f.access_type = 'public' ) ) + OR ( fi.folder_id IS NOT NULL + AND EXISTS ( SELECT 1 FROM folder_permissions fp + WHERE fp.folder_id = fi.folder_id AND fp.user_id = ? + AND fp.level IN ('read', 'write', 'admin') + AND ( fp.expires_at IS NULL + OR fp.expires_at > UTC_TIMESTAMP() ) ) ) ) + ORDER BY fi.created_at DESC`, + [user.id, user.id], + ); + + return context.json({ + files: rows.map((row) => ({ ...publicFile(row), folder_name: row.folder_name })), + }); + }); + app.get("/api/cloud/files/:id/download", requireAuth, async (context) => { const user = currentUser(context); const rawId = context.req.param("id"); @@ -428,7 +464,6 @@ export const registerFileRoutes = (app: App, db: Db, config: Config): void => { if (!row) throw AppError.notFound("Fichier introuvable."); const allowed = - user.role_slug === "admin" || (row.owner_id !== null && row.owner_id === user.id) || (row.folder_id !== null && (await canRead(db, user, row.folder_id))); if (!allowed) throw AppError.notFound("Fichier introuvable."); @@ -468,7 +503,6 @@ export const registerFileRoutes = (app: App, db: Db, config: Config): void => { if (!row) throw AppError.notFound("Fichier introuvable."); const allowed = - user.role_slug === "admin" || (row.owner_id !== null && row.owner_id === user.id) || (row.folder_id !== null && (await canRead(db, user, row.folder_id))); if (!allowed) throw AppError.notFound("Fichier introuvable."); @@ -498,7 +532,6 @@ export const registerFileRoutes = (app: App, db: Db, config: Config): void => { if (!row) throw AppError.notFound("Image introuvable."); const allowed = - user.role_slug === "admin" || (row.owner_id !== null && row.owner_id === user.id) || (row.folder_id !== null && (await canRead(db, user, row.folder_id))); if (!allowed) throw AppError.notFound("Image introuvable."); @@ -535,7 +568,6 @@ export const registerFileRoutes = (app: App, db: Db, config: Config): void => { const owner = row.owner_id !== null && row.owner_id === user.id; const permitted = - user.role_slug === "admin" || owner || (row.folder_id !== null && (await canWriteExplicit(db, user, row.folder_id))); if (!permitted) throw AppError.notFound("Fichier introuvable."); @@ -571,7 +603,6 @@ export const registerFileRoutes = (app: App, db: Db, config: Config): void => { const owner = row.owner_id !== null && row.owner_id === user.id; const canLeave = - user.role_slug === "admin" || owner || (row.folder_id !== null && (await canWriteExplicit(db, user, row.folder_id))); if (!canLeave) throw AppError.notFound("Fichier introuvable."); @@ -607,7 +638,6 @@ export const registerFileRoutes = (app: App, db: Db, config: Config): void => { if (!row) throw AppError.notFound("Fichier introuvable."); const allowed = - user.role_slug === "admin" || (row.owner_id !== null && row.owner_id === user.id) || (row.folder_id !== null && (await canRead(db, user, row.folder_id))); if (!allowed) throw AppError.notFound("Fichier introuvable."); @@ -627,7 +657,6 @@ export const registerFileRoutes = (app: App, db: Db, config: Config): void => { const owner = row.owner_id !== null && row.owner_id === user.id; const permitted = - user.role_slug === "admin" || owner || (row.folder_id !== null && (await canWriteExplicit(db, user, row.folder_id))); if (!permitted) throw AppError.notFound("Fichier introuvable."); diff --git a/backend/src/routes/folders.ts b/backend/src/routes/folders.ts index 7f8d7b2..f2885de 100644 --- a/backend/src/routes/folders.ts +++ b/backend/src/routes/folders.ts @@ -118,7 +118,7 @@ export const registerFolderRoutes = (app: App, db: Db, config: Config): void => throw AppError.badRequest("Identifiant de dossier invalide."); } - if (user.role_slug !== "admin" && parentId !== null) { + if (parentId !== null) { // Contre l'IDOR : on ne liste un dossier que si la session y a acces. if (!(await canRead(db, user, parentId))) { throw AppError.notFound("Dossier introuvable."); @@ -136,7 +136,7 @@ export const registerFolderRoutes = (app: App, db: Db, config: Config): void => WHERE fp.folder_id = f.id AND fp.user_id = ? AND ( fp.expires_at IS NULL OR fp.expires_at > UTC_TIMESTAMP() ) ) ) ORDER BY f.name`, - [parentId, user.role_slug === "admin" ? 1 : 0, user.id, user.id], + [parentId, 0, user.id, user.id], ); return context.json({ parentId, folders: rows.map(publicFolder) }); diff --git a/backend/src/routes/media.ts b/backend/src/routes/media.ts index 2e66aa0..c5a8ddc 100644 --- a/backend/src/routes/media.ts +++ b/backend/src/routes/media.ts @@ -61,7 +61,7 @@ export const registerMediaRoutes = (app: App, db: Db): void => { AND ( fp.expires_at IS NULL OR fp.expires_at > UTC_TIMESTAMP() ) ) ) ) ORDER BY fi.created_at DESC LIMIT ${limit} OFFSET ${offset}`, - [kind, kind, user.role_slug === "admin" ? 1 : 0, user.id, user.id], + [kind, kind, 0, user.id, user.id], ); return context.json({ diff --git a/backend/src/routes/search.ts b/backend/src/routes/search.ts index dd18329..6227151 100644 --- a/backend/src/routes/search.ts +++ b/backend/src/routes/search.ts @@ -26,7 +26,6 @@ export const registerSearchRoutes = (app: App, db: Db): void => { const user = currentUser(context); const q = (context.req.query("q") ?? "").trim(); if (q.length < 1) throw AppError.badRequest("Indiquez un terme de recherche."); - const admin = user.role_slug === "admin"; const pattern = `%${escapeLike(q).slice(0, 110)}%`; const folders = await db.query<{ @@ -52,7 +51,7 @@ export const registerSearchRoutes = (app: App, db: Db): void => { AND ( fp.expires_at IS NULL OR fp.expires_at > UTC_TIMESTAMP() ) ) ) ORDER BY f.name LIMIT ${LIMIT}`, - [pattern, admin ? 1 : 0, user.id, user.id], + [pattern, 0, user.id, user.id], ); const files = await db.query<{ @@ -82,7 +81,7 @@ export const registerSearchRoutes = (app: App, db: Db): void => { AND ( fp.expires_at IS NULL OR fp.expires_at > UTC_TIMESTAMP() ) ) ) ) ORDER BY fi.name LIMIT ${LIMIT}`, - [pattern, admin ? 1 : 0, user.id, user.id], + [pattern, 0, user.id, user.id], ); return context.json({ diff --git a/backend/src/routes/trash.ts b/backend/src/routes/trash.ts index fd0dc4b..ec793c7 100644 --- a/backend/src/routes/trash.ts +++ b/backend/src/routes/trash.ts @@ -19,10 +19,10 @@ const uuid = z ); /** - * La corbeille se prete a l'echelle d'un utilisateur : un proprietaire voit ses - * propres elements supprimes, un administrateur voit tout. Un element supprime - * dont le parent est lui aussi supprime n'est pas liste : c'est la racine de la - * suppression qui porte l'action. + * La corbeille se prete a l'echelle d'un compte : chacun ne voit et ne gere + * que ses propres elements supprimes. Un element supprime dont le parent est + * lui aussi supprime n'est pas liste : c'est la racine de la suppression qui + * porte l'action. */ const subtreeIds = async (db: Db, rootId: string): Promise => { const rows = await db.query<{ id: string }>( @@ -157,7 +157,6 @@ export const registerTrashRoutes = (app: App, db: Db, config: Config): void => { app.get("/api/cloud/trash", requireAuth, async (context) => { const user = currentUser(context); - const admin = user.role_slug === "admin"; // Seuls les elements dont le parent n'est pas lui-meme supprime figurent en // tete de corbeille : le reste suit la suppression du parent. @@ -169,9 +168,9 @@ export const registerTrashRoutes = (app: App, db: Db, config: Config): void => { WHERE f.deleted_at IS NOT NULL AND f.is_system = 0 AND (p.id IS NULL OR p.deleted_at IS NULL) - AND ( ? = 1 OR f.owner_id = ? ) + AND f.owner_id = ? ORDER BY f.deleted_at DESC`, - [admin ? 1 : 0, user.id], + [user.id], ); const files = await db.query( @@ -181,9 +180,9 @@ export const registerTrashRoutes = (app: App, db: Db, config: Config): void => { LEFT JOIN folders p ON p.id = fi.folder_id WHERE fi.deleted_at IS NOT NULL AND (p.id IS NULL OR p.deleted_at IS NULL) - AND ( ? = 1 OR fi.owner_id = ? ) + AND fi.owner_id = ? ORDER BY fi.deleted_at DESC`, - [admin ? 1 : 0, user.id], + [user.id], ); const retentionDays = await db.one<{ setting_value: string }>( @@ -208,7 +207,7 @@ export const registerTrashRoutes = (app: App, db: Db, config: Config): void => { [id], ); if (!row) throw AppError.notFound("Dossier introuvable."); - if (user.role_slug !== "admin" && row.owner_id !== user.id) { + if (row.owner_id !== user.id) { throw AppError.notFound("Dossier introuvable."); } @@ -247,7 +246,7 @@ export const registerTrashRoutes = (app: App, db: Db, config: Config): void => { [id], ); if (!row) throw AppError.notFound("Fichier introuvable."); - if (user.role_slug !== "admin" && row.owner_id !== user.id) { + if (row.owner_id !== user.id) { throw AppError.notFound("Fichier introuvable."); } @@ -275,7 +274,7 @@ export const registerTrashRoutes = (app: App, db: Db, config: Config): void => { [id], ); if (!row) throw AppError.notFound("Dossier introuvable."); - if (user.role_slug !== "admin" && row.owner_id !== user.id) { + if (row.owner_id !== user.id) { throw AppError.notFound("Dossier introuvable."); } @@ -294,7 +293,7 @@ export const registerTrashRoutes = (app: App, db: Db, config: Config): void => { [id], ); if (!row) throw AppError.notFound("Fichier introuvable."); - if (user.role_slug !== "admin" && row.owner_id !== user.id) { + if (row.owner_id !== user.id) { throw AppError.notFound("Fichier introuvable."); } @@ -306,23 +305,22 @@ export const registerTrashRoutes = (app: App, db: Db, config: Config): void => { /** Vide la corbeille du compte appelant (tous les elements purges). */ app.delete("/api/cloud/trash", requireAuth, async (context) => { const user = currentUser(context); - const admin = user.role_slug === "admin"; const folders = await db.query<{ id: string }>( `SELECT f.id FROM folders f LEFT JOIN folders p ON p.id = f.parent_id WHERE f.deleted_at IS NOT NULL AND f.is_system = 0 AND (p.id IS NULL OR p.deleted_at IS NULL) - AND ( ? = 1 OR f.owner_id = ? )`, - [admin ? 1 : 0, user.id], + AND f.owner_id = ?`, + [user.id], ); const files = await db.query<{ id: string }>( `SELECT fi.id FROM files fi LEFT JOIN folders p ON p.id = fi.folder_id WHERE fi.deleted_at IS NOT NULL AND (p.id IS NULL OR p.deleted_at IS NULL) - AND ( ? = 1 OR fi.owner_id = ? )`, - [admin ? 1 : 0, user.id], + AND fi.owner_id = ?`, + [user.id], ); for (const folder of folders) await purgeFolderTree(db, config, folder.id); diff --git a/docker/reset-cloud.sql b/docker/reset-cloud.sql index ebbf195..5fcf3ee 100644 --- a/docker/reset-cloud.sql +++ b/docker/reset-cloud.sql @@ -8,6 +8,7 @@ DELETE FROM share_links; DELETE FROM files; DELETE FROM folder_permissions; DELETE FROM folders; +DELETE FROM chat_messages; DELETE FROM user_avatars; DELETE FROM password_reset_tokens; DELETE FROM email_change_requests; diff --git a/docs/api.md b/docs/api.md index 03945f6..2933365 100644 --- a/docs/api.md +++ b/docs/api.md @@ -67,6 +67,26 @@ d'adresse). | GET | `/api/cloud/search` | `requireAuth` | | GET | `/api/cloud/media` | `requireAuth` | +### Discussion (chat d'un dossier et membres) + +Chaque dossier possède son propre salon. Le droit d'accès au dossier fait loi : +lecture comme écriture passent par `canRead` (`backend/src/access.ts`), donc le +salon d'un dossier `public` est ouvert à tout compte authentifié. La lecture est +en texte brut, React échappe le rendu. La synchronisation est incrémentale par +identifiant (`after`), sans WebSocket. + +| Méthode | Chemin | Garde | +| --- | --- | --- | +| GET | `/api/cloud/folders/:folderId/chat/members` | `requireAuth` + `canRead` | +| GET | `/api/cloud/folders/:folderId/chat/messages?after=&limit=` | `requireAuth` + `canRead` | +| POST | `/api/cloud/folders/:folderId/chat/messages` | `requireAuth` + `canRead` (limiteur 20 / 10 s par compte) | +| DELETE | `/api/cloud/folders/:folderId/chat/messages/:id` | `requireAuth` + `canRead` (auteur ou gestionnaire du dossier, soft-delete) | + +`GET .../chat/members` renvoie les membres du salon, c'est-à-dire les comptes qui +ont accès au dossier : propriétaire, titulaires d'une permission nominative non +expirée, rôle global `admin`, et tous les comptes actifs si le dossier est +`public` (prénom, nom, rôle, présence d'avatar, `last_login_at`). + ### Administration (`role_slug = admin`) | Méthode | Chemin | @@ -142,10 +162,11 @@ par fichier, dérive refusée au démarrage. | `004_cloud_requirements.sql` | `first_name`/`last_name`, `used_bytes`, `max_file_bytes`, `user_sessions`, `media_metadata`, `file_variants`, **suppression de `share_links`** | | `005_storage_location_realign.sql` | réalignement des emplacements | | `006_public_folder.sql` | `folders.access_type` / `is_system`, dossier `Public` | +| `007_chat.sql` | `chat_messages` (salon global, auteur `ON DELETE SET NULL`) | Tables actives : `users, user_sessions, folders, folder_permissions, files, -media_metadata, file_variants, user_avatars, storage_locations, settings, -password_reset_tokens, email_change_requests, audit_logs`. +media_metadata, file_variants, user_avatars, chat_messages, storage_locations, +settings, password_reset_tokens, email_change_requests, audit_logs`. ## Erreurs métier diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index e0673bc..d620a92 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -8,6 +8,7 @@ import { ResetPassword } from "./pages/ResetPassword.js"; import { ConfirmEmail } from "./pages/ConfirmEmail.js"; import { ChangePassword } from "./pages/ChangePassword.js"; import { Browser } from "./pages/Browser.js"; +import { Favorites } from "./pages/Favorites.js"; import { Search } from "./pages/Search.js"; import { Gallery } from "./pages/Gallery.js"; import { Trash } from "./pages/Trash.js"; @@ -52,6 +53,7 @@ export const App = () => ( }> }> } /> + } /> } /> } /> } /> diff --git a/frontend/src/components/AppShell.tsx b/frontend/src/components/AppShell.tsx index 10ef239..4c8d59c 100644 --- a/frontend/src/components/AppShell.tsx +++ b/frontend/src/components/AppShell.tsx @@ -1,8 +1,8 @@ import { useState } from "react"; import { NavLink, Outlet } from "react-router-dom"; import { Button, cn } from "../ui/index.js"; -import { api } from "../lib/api.js"; import { useSession } from "../lib/session.js"; +import { Avatar } from "./Avatar.js"; import { ActivityIcon, CloseIcon, @@ -14,6 +14,7 @@ import { SearchNavIcon, SettingsIcon, ShieldIcon, + StarIcon, TrashIcon, } from "./icons.js"; @@ -25,6 +26,7 @@ interface NavItem { const NAV: NavItem[] = [ { to: "/files", label: "Fichiers", icon: FolderIcon }, + { to: "/favorites", label: "Favoris", icon: StarIcon }, { to: "/search", label: "Recherche", icon: SearchNavIcon }, { to: "/gallery", label: "Galerie", icon: ImageIcon }, { to: "/trash", label: "Corbeille", icon: TrashIcon }, @@ -38,9 +40,6 @@ const ADMIN_NAV: NavItem[] = [ const ACCOUNT_NAV: NavItem = { to: "/profile", label: "Mon compte", icon: SettingsIcon }; -const initials = (first: string, last: string): string => - `${first.charAt(0)}${last.charAt(0)}`.toUpperCase() || "?"; - const navClass = ({ isActive }: { isActive: boolean }) => cn( "flex items-center gap-3 rounded-md px-3 py-2 text-sm font-medium transition-colors", @@ -127,22 +126,13 @@ export const AppShell = () => { {user.role_name}

- + +
+

+ Discussion · {folder.name} +

+

+ Membres ayant accès à ce dossier +

+
+ + + + {error ? ( +
+ {error} +
+ ) : null} + +
+ {loading ? ( +
+ +
+ ) : messages.length === 0 ? ( + } + title="Aucun message" + description="Lancez la discussion : les membres du dossier verront votre message." + /> + ) : ( +
    + {rendered.map(({ message, newDay, continuation, own, canDelete }) => ( +
  1. + {newDay ? ( +
    + + + {dayOf(message.created_at)} + + +
    + ) : null} +
    + {continuation ? ( +
    +
  2. + ))} +
+ )} +
+ +
void send(event)} + className="flex shrink-0 items-end gap-2 border-t border-border bg-background px-4 py-3" + > +