ETAPI delete/patch, refactoring

src/routes/api/etapi.js

@@ -3,320 +3,17 @@ const utils = require("../../services/utils");
 const noteService = require("../../services/notes");
 const attributeService = require("../../services/attributes");
 const Branch = require("../../becca/entities/branch");
-const cls = require("../../services/cls");
-const sql = require("../../services/sql");
-const log = require("../../services/log");
 const specialNotesService = require("../../services/special_notes");
 const dateNotesService = require("../../services/date_notes");
 const entityChangesService = require("../../services/entity_changes.js");
-
-const GENERIC_CODE = "GENERIC";
-
-function sendError(res, statusCode, code, message) {
-    return res
-        .set('Content-Type', 'application/json')
-        .status(statusCode)
-        .send(JSON.stringify({
-            "status": statusCode,
-            "code": code,
-            "message": message
-        }));
-}
-
-const sendNoteNotFoundError = (res, noteId) => sendError(res, 404, "NOTE_NOT_FOUND", `Note ${noteId} not found`);
-const sendBranchNotFoundError = (res, branchId) => sendError(res, 404, "BRANCH_NOT_FOUND", `Branch ${branchId} not found`);
-const sendAttributeNotFoundError = (res, attributeId) => sendError(res, 404, "ATTRIBUTE_NOT_FOUND", `Attribute ${attributeId} not found`);
-const sendDateInvalidError = (res, date) => sendError(res, 400, "DATE_INVALID", `Date "${date}" is not valid.`);
-const sendMonthInvalidError = (res, month) => sendError(res, 400, "MONTH_INVALID", `Month "${month}" is not valid.`);
-const sendYearInvalidError = (res, year) => sendError(res, 400, "YEAR_INVALID", `Year "${year}" is not valid.`);
-
-function isValidDate(date) {
-    if (!/[0-9]{4}-[0-9]{2}-[0-9]{2}/.test(date)) {
-        return false;
-    }
-    
-    return !!Date.parse(date);
-}
-
-function checkEtapiAuth(req, res, next) {
-    if (false) {
-        sendError(res, 401, "NOT_AUTHENTICATED", "Not authenticated");
-    }
-    else {
-        next();
-    }
-}
+const TaskContext = require("../../services/task_context.js");
 
 function register(router) {
-    function route(method, path, routeHandler) {
-        router[method](path, checkEtapiAuth, (req, res, next) => {
-            try {
-                cls.namespace.bindEmitter(req);
-                cls.namespace.bindEmitter(res);
-
-                cls.init(() => {
-                    cls.set('sourceId', "etapi");
-                    cls.set('localNowDateTime', req.headers['trilium-local-now-datetime']);
-
-                    const cb = () => routeHandler(req, res, next);
-
-                    return sql.transactional(cb);
-                });
-            }
-            catch (e) {
-                log.error(`${method} ${path} threw exception: ` + e.stack);
-
-                res.status(500).send(e.message);
-            }
-        });
-    }
-
-    route('get', '/etapi/inbox/:date', (req, res, next) => {
-        const {date} = req.params;
-        
-        if (!isValidDate(date)) {
-            return sendDateInvalidError(res, date);
-        }
-        
-        const note = specialNotesService.getInboxNote(date);
-        res.json(mapNoteToPojo(note));
-    });
     
-    route('get', '/etapi/date/:date', (req, res, next) => {
-        const {date} = req.params;
 
-        if (!isValidDate(date)) {
-            return sendDateInvalidError(res, date);
-        }
-
-        const note = dateNotesService.getDateNote(date);
-        res.json(mapNoteToPojo(note));
-    });
     
-    route('get', '/etapi/week/:date', (req, res, next) => {
-        const {date} = req.params;
 
-        if (!isValidDate(date)) {
-            return sendDateInvalidError(res, date);
-        }
-
-        const note = dateNotesService.getWeekNote(date);
-        res.json(mapNoteToPojo(note));
-    });
     
-    route('get', '/etapi/month/:month', (req, res, next) => {
-        const {month} = req.params;
-
-        if (!/[0-9]{4}-[0-9]{2}/.test(month)) {
-            return sendMonthInvalidError(res, month);
-        }
-
-        const note = dateNotesService.getMonthNote(month);
-        res.json(mapNoteToPojo(note));
-    });
-    
-    route('get', '/etapi/year/:year', (req, res, next) => {
-        const {year} = req.params;
-
-        if (!/[0-9]{4}/.test(year)) {
-            return sendYearInvalidError(res, year);
-        }
-
-        const note = dateNotesService.getYearNote(year);
-        res.json(mapNoteToPojo(note));
-    });
-     
-    route('get', '/etapi/notes/:noteId', (req, res, next) => {
-        const {noteId} = req.params;
-        const note = becca.getNote(noteId);
-
-        if (!note) {
-            return sendNoteNotFoundError(res, noteId);
-        }
-
-        res.json(mapNoteToPojo(note));
-    });
-    
-    route('get', '/etapi/notes/:noteId', (req, res, next) => {
-        const {noteId} = req.params;
-        const note = becca.getNote(noteId);
-
-        if (!note) {
-            return sendNoteNotFoundError(res, noteId);
-        }
-
-        res.json(mapNoteToPojo(note));
-    });
-
-    route('get', '/etapi/notes/:noteId/content', (req, res, next) => {
-        const {noteId} = req.params;
-        const note = becca.getNote(noteId);
-
-        if (!note) {
-            return sendNoteNotFoundError(res, noteId);
-        }
-
-        const filename = utils.formatDownloadTitle(note.title, note.type, note.mime);
-
-        res.setHeader('Content-Disposition', utils.getContentDisposition(filename));
-
-        res.setHeader("Cache-Control", "no-cache, no-store, must-revalidate");
-        res.setHeader('Content-Type', note.mime);
-
-        res.send(note.getContent());
-    });
-
-    route('get', '/etapi/branches/:branchId', (req, res, next) => {
-        const {branchId} = req.params;
-        const branch = becca.getBranch(branchId);
-
-        if (!branch) {
-            return sendBranchNotFoundError(res, branchId);
-        }
-
-        res.json(mapBranchToPojo(branch));
-    });
-
-    route('get', '/etapi/attributes/:attributeId', (req, res, next) => {
-        const {attributeId} = req.params;
-        const attribute = becca.getAttribute(attributeId);
-
-        if (!attribute) {
-            return sendAttributeNotFoundError(res, attributeId);
-        }
-
-        res.json(mapAttributeToPojo(attribute));
-    });
-
-    route('post' ,'/etapi/notes', (req, res, next) => {
-        const params = req.body;
-
-        if (!becca.getNote(params.parentNoteId)) {
-            return sendNoteNotFoundError(res, params.parentNoteId);
-        }
-
-        try {
-            const resp = noteService.createNewNote(params);
-
-            res.json({
-                note: mapNoteToPojo(resp.note),
-                branch: mapBranchToPojo(resp.branch)
-            });
-        }
-        catch (e) {
-            return sendError(res, 400, GENERIC_CODE, e.message);
-        }
-    });
-
-    route('post' ,'/etapi/branches', (req, res, next) => {
-        const params = req.body;
-
-        if (!becca.getNote(params.noteId)) {
-            return sendNoteNotFoundError(res, params.noteId);
-        }
-
-        if (!becca.getNote(params.parentNoteId)) {
-            return sendNoteNotFoundError(res, params.parentNoteId);
-        }
-
-        const existing = becca.getBranchFromChildAndParent(params.noteId, params.parentNoteId);
-
-        if (existing) {
-            existing.notePosition = params.notePosition;
-            existing.prefix = params.prefix;
-            existing.save();
-
-            return res.json(mapBranchToPojo(existing));
-        }
-
-        try {
-            const branch = new Branch(params).save();
-
-            res.json(mapBranchToPojo(branch));
-        }
-        catch (e) {
-            return sendError(res, 400, GENERIC_CODE, e.message);
-        }
-    });
-
-    route('post' ,'/etapi/attributes', (req, res, next) => {
-        const params = req.body;
-
-        if (!becca.getNote(params.noteId)) {
-            return sendNoteNotFoundError(res, params.noteId);
-        }
-
-        if (params.type === 'relation' && !becca.getNote(params.value)) {
-            return sendNoteNotFoundError(res, params.value);
-        }
-
-        if (params.type !== 'relation' && params.type !== 'label') {
-            return sendError(res, 400, GENERIC_CODE, `Only "relation" and "label" are supported attribute types, "${params.type}" given.`);
-        }
-
-        try {
-            const attr = attributeService.createAttribute(params);
-
-            res.json(mapAttributeToPojo(attr));
-        }
-        catch (e) {
-            return sendError(res, 400, GENERIC_CODE, e.message);
-        }
-    });
-
-    route('post' ,'/etapi/refresh-note-ordering/:parentNoteId', (req, res, next) => {
-        const {parentNoteId} = req.params;
-        
-        if (!becca.getNote(parentNoteId)) {
-            return sendNoteNotFoundError(res, parentNoteId);
-        }
-        
-        entityChangesService.addNoteReorderingEntityChange(parentNoteId, "etapi");
-    });
-}
-
-function mapNoteToPojo(note) {
-    return {
-        noteId: note.noteId,
-        isProtected: note.isProtected,
-        title: note.title,
-        type: note.type,
-        mime: note.mime,
-        dateCreated: note.dateCreated,
-        dateModified: note.dateModified,
-        utcDateCreated: note.utcDateCreated,
-        utcDateModified: note.utcDateModified,
-        parentNoteIds: note.getParentNotes().map(p => p.noteId),
-        childNoteIds: note.getChildNotes().map(ch => ch.noteId),
-        parentBranchIds: note.getParentBranches().map(p => p.branchId),
-        childBranchIds: note.getChildBranches().map(ch => ch.branchId),
-        attributes: note.getAttributes().map(attr => mapAttributeToPojo(attr))
-    };
-}
-
-function mapBranchToPojo(branch) {
-    return {
-        branchId: branch.branchId,
-        noteId: branch.noteId,
-        parentNoteId: branch.parentNoteId,
-        prefix: branch.prefix,
-        notePosition: branch.notePosition,
-        isExpanded: branch.isExpanded,
-        utcDateModified: branch.utcDateModified
-    };
-}
-
-function mapAttributeToPojo(attr) {
-    return {
-        attributeId: attr.attributeId,
-        noteId: attr.noteId,
-        type: attr.type,
-        name: attr.name,
-        value: attr.value,
-        position: attr.position,
-        isInheritable: attr.isInheritable,
-        utcDateModified: attr.utcDateModified
-    };
 }
 
 module.exports = {

src/routes/api/login.js

@@ -10,7 +10,6 @@ const appInfo = require('../../services/app_info');
 const eventService = require('../../services/events');
 const sqlInit = require('../../services/sql_init');
 const sql = require('../../services/sql');
-const optionService = require('../../services/options');
 const ApiToken = require('../../becca/entities/api_token');
 const ws = require("../../services/ws");
 
@@ -92,6 +91,8 @@ function token(req) {
     }
 
     const apiToken = new ApiToken({
+        // for backwards compatibility with Sender which does not send the name
+        name: req.body.tokenName || "Trilium Sender",
         token: utils.randomSecureToken()
     }).save();
 

src/routes/api/notes.js

@@ -73,9 +73,7 @@ function deleteNote(req) {
 
     const taskContext = TaskContext.getInstance(taskId, 'delete-notes');
 
-    for (const branch of note.getParentBranches()) {
-        noteService.deleteBranch(branch, deleteId, taskContext);
-    }
+    noteService.deleteNote(note, deleteId, taskContext);
 
     if (eraseNotes) {
         noteService.eraseNotesWithDeleteId(deleteId);

src/routes/routes.js

@@ -40,7 +40,10 @@ const backendLogRoute = require('./api/backend_log');
 const statsRoute = require('./api/stats');
 const fontsRoute = require('./api/fonts');
 const shareRoutes = require('../share/routes');
-const etapiRoutes = require('./api/etapi');
+const etapiAttributeRoutes = require('../etapi/attributes');
+const etapiBranchRoutes = require('../etapi/branches');
+const etapiNoteRoutes = require('../etapi/notes');
+const etapiSpecialNoteRoutes = require('../etapi/special_notes');
 
 const log = require('../services/log');
 const express = require('express');
@@ -376,7 +379,10 @@ function register(app) {
     route(GET, '/api/fonts', [auth.checkApiAuthOrElectron], fontsRoute.getFontCss);
 
     shareRoutes.register(router);
-    etapiRoutes.register(router);
+    etapiAttributeRoutes.register(router);
+    etapiBranchRoutes.register(router);
+    etapiNoteRoutes.register(router);
+    etapiSpecialNoteRoutes.register(router);
 
     app.use('', router);
 }