ETAPI auth, spec improvements etc.

src/routes/api/clipper.js

@@ -36,7 +36,7 @@ function getClipperInboxNote() {
     let clipperInbox = attributeService.getNoteWithLabel('clipperInbox');
 
     if (!clipperInbox) {
-        clipperInbox = dateNoteService.getDateNote(dateUtils.localNowDate());
+        clipperInbox = dateNoteService.getDayNote(dateUtils.localNowDate());
     }
 
     return clipperInbox;

src/routes/api/etapi.js

@@ -1,21 +0,0 @@
-const becca = require("../../becca/becca");
-const utils = require("../../services/utils");
-const noteService = require("../../services/notes");
-const attributeService = require("../../services/attributes");
-const Branch = require("../../becca/entities/branch");
-const specialNotesService = require("../../services/special_notes");
-const dateNotesService = require("../../services/date_notes");
-const entityChangesService = require("../../services/entity_changes.js");
-const TaskContext = require("../../services/task_context.js");
-
-function register(router) {
-    
-
-    
-
-    
-}
-
-module.exports = {
-    register
-}

src/routes/api/etapi_tokens.js

@@ -0,0 +1,30 @@
+const etapiTokenService = require("../../services/etapi_tokens");
+
+function getTokens() {
+    const tokens = etapiTokenService.getTokens();
+    
+    tokens.sort((a, b) => a.utcDateCreated < b.utcDateCreated ? -1 : 1);
+    
+    return tokens;
+}
+
+function createToken(req) {
+    return {
+        authToken: etapiTokenService.createToken(req.body.tokenName)
+    };
+}
+
+function patchToken(req) {
+    etapiTokenService.renameToken(req.params.etapiTokenId, req.body.name);
+}
+
+function deleteToken(req) {
+    etapiTokenService.deleteToken(req.params.etapiTokenId);
+}
+
+module.exports = {
+    getTokens,
+    createToken,
+    patchToken,
+    deleteToken
+};

src/routes/api/login.js

@@ -10,8 +10,8 @@ const appInfo = require('../../services/app_info');
 const eventService = require('../../services/events');
 const sqlInit = require('../../services/sql_init');
 const sql = require('../../services/sql');
-const ApiToken = require('../../becca/entities/api_token');
 const ws = require("../../services/ws");
+const etapiTokenService = require("../../services/etapi_tokens");
 
 function loginSync(req) {
     if (!sqlInit.schemaExists()) {
@@ -90,15 +90,12 @@ function token(req) {
         return [401, "Incorrect password"];
     }
 
-    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();
+    // for backwards compatibility with Sender which does not send the name
+    const tokenName = req.body.tokenName || "Trilium Sender / Web Clipper";
+    
+    const {authToken} = etapiTokenService.createToken(tokenName);
 
-    return {
-        token: apiToken.token
-    };
+    return { token: authToken };
 }
 
 module.exports = {

src/routes/api/password.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const passwordService = require('../../services/password.js');
+const passwordService = require('../../services/password');
 
 function changePassword(req) {
     if (passwordService.isPasswordSet()) {

src/routes/api/sender.js

@@ -15,7 +15,7 @@ function uploadImage(req) {
 
     const originalName = "Sender image." + imageType(file.buffer).ext;
 
-    const parentNote = dateNoteService.getDateNote(req.headers['x-local-date']);
+    const parentNote = dateNoteService.getDayNote(req.headers['x-local-date']);
 
     const {note, noteId} = imageService.saveImage(parentNote.noteId, file.buffer, originalName, true);
 
@@ -35,7 +35,7 @@ function uploadImage(req) {
 }
 
 function saveNote(req) {
-    const parentNote = dateNoteService.getDateNote(req.headers['x-local-date']);
+    const parentNote = dateNoteService.getDayNote(req.headers['x-local-date']);
 
     const {note, branch} = noteService.createNewNote({
         parentNoteId: parentNote.noteId,

src/routes/api/special_notes.js

@@ -10,8 +10,8 @@ function getInboxNote(req) {
     return specialNotesService.getInboxNote(req.params.date);
 }
 
-function getDateNote(req) {
-    return dateNoteService.getDateNote(req.params.date);
+function getDayNote(req) {
+    return dateNoteService.getDayNote(req.params.date);
 }
 
 function getWeekNote(req) {
@@ -26,7 +26,7 @@ function getYearNote(req) {
     return dateNoteService.getYearNote(req.params.year);
 }
 
-function getDateNotesForMonth(req) {
+function getDayNotesForMonth(req) {
     const month = req.params.month;
 
     return sql.getMap(`
@@ -68,11 +68,11 @@ function getHoistedNote() {
 
 module.exports = {
     getInboxNote,
-    getDateNote,
+    getDayNote,
     getWeekNote,
     getMonthNote,
     getYearNote,
-    getDateNotesForMonth,
+    getDayNotesForMonth,
     createSqlConsole,
     saveSqlConsole,
     createSearchNote,