Skip to content

πŸ“š The open-source, offline-first Notion, Obsidian & Confluence alternative. Advanced Markdown, multi-tenant teams, OIDC/SSO, and local S3 backups. Deploy in one command.

New CDN: Allow files deletion

Smaug673902424f7cc5e5
diff --git a/backend/classes/RessourcesManager.ts b/backend/classes/RessourcesManager.ts
index 16adf77c..403135fb 100644
--- a/backend/classes/RessourcesManager.ts
+++ b/backend/classes/RessourcesManager.ts
@@ -26,6 +26,14 @@ export class RessourcesManager extends Base {
});
});
}
+ public getRessource(ressource_id: string): Promise<Ressource | undefined> {
+ return new Promise((resolve, reject) => {
+ this.app.db.query<RessourceDB[]>('SELECT * FROM ressources WHERE id = ?', [ressource_id], async (err, results) => {
+ if (err) return reject('Internal database error.');
+ resolve(results[0]);
+ });
+ });
+ }
public getUserRessourcesSize(user_id: string): Promise<number> {
return new Promise((resolve, reject) => {
@@ -61,6 +69,16 @@ export class RessourcesManager extends Base {
);
});
}
+
+ public deleteRessource(ressource_id: string): Promise<IObject> {
+ return new Promise((resolve, reject) => {
+ this.app.db.query<RessourceDB[]>('DELETE FROM ressources WHERE id = ?', [ressource_id], async err => {
+ if (err) return reject('Internal database error.');
+ resolve({ id: ressource_id });
+ });
+ });
+ }
+
public validate(data: Ressource): string | false {
if (!data.id || data.id.length > 50) return 'ressource id invalid';
if (!data.filename || data.filename.length > 50) return 'ressource filename invalid';
diff --git a/backend/controllers/cdn.controller.ts b/backend/controllers/cdn.controller.ts
index 590f0fdf..21b8184f 100644
--- a/backend/controllers/cdn.controller.ts
+++ b/backend/controllers/cdn.controller.ts
@@ -1,4 +1,4 @@
-import { access, constants } from 'fs';
+import { access, constants, unlink } from 'fs';
import sharp from 'sharp';
import BaseController from './BaseController';
import { RessourcesManager } from '../classes';
@@ -80,4 +80,33 @@ export default class RessourcesController extends BaseController<RessourcesManag
res.status(500).json(this.utils.error(err));
}
}
+
+ async delete(req: Request, res: Response) {
+ if (!req.user_id) return res.status(401).json(this.utils.error('Unauthorized'));
+ if (!req.params.id) return res.status(400).json(this.utils.error('No id provided.'));
+ const ressource = await this.manager.getRessource(req.params.id);
+ if (!ressource) return res.status(404).json(this.utils.error('Ressource not found.'));
+ if (ressource.author_id !== req.user_id) return res.status(403).json(this.utils.error('Unauthorized'));
+ try {
+ await this.manager.deleteRessource(req.params.id);
+ if (ressource.original_path) await deleteFile(`${this.app.config.upload_path}/${ressource.original_path}`);
+ if (ressource.transformed_path) await deleteFile(`${this.app.config.upload_path}/${ressource.transformed_path}`);
+ return res.status(200).json(this.utils.success('Ressource deleted.'));
+ } catch (err) {
+ return res.status(500).json(this.utils.error(err));
+ }
+ }
+}
+
+function deleteFile(path: string): Promise<void> {
+ // Check if file exists and permissions are correct before deleting
+ return new Promise((resolve, reject) => {
+ access(path, constants.F_OK, err => {
+ if (err) return reject(new Error('File not found.'));
+ unlink(path, err => {
+ if (err) return reject(new Error('Error deleting file.'));
+ resolve();
+ });
+ });
+ });
}
diff --git a/backend/routes/v1/cdn.ts b/backend/routes/v1/cdn.ts
index b95d70fc..d82e3ba4 100644
--- a/backend/routes/v1/cdn.ts
+++ b/backend/routes/v1/cdn.ts
@@ -16,6 +16,7 @@ export default (client: App): Iroute => {
CDNRouter.get('/', auth, (req: Request, res: Response) => controller.get(req, res));
CDNRouter.post('/avatar', auth, multerCdn, (req: Request, res: Response) => controller.addAvatar(req, res), multerErrors);
CDNRouter.post('/', auth, multerCdn, (req: Request, res: Response) => controller.add(req, res), multerErrors);
+ CDNRouter.delete('/:id', auth, (req: Request, res: Response) => controller.delete(req, res));
return CDNRouter;
},
};