ETAPI auth, spec improvements etc.

yousongsun · Jan 10, 2022 · 91dec23 · 91dec23
1 parent 2d2641d
commit 91dec23
Show file tree

Hide file tree

Showing 90 changed files with 1,468 additions and 11,753 deletions.
diff --git a/TODO b/TODO
diff --git a/db/migrations/0190__add_token_name.sql b/db/migrations/0190__add_token_name.sql
diff --git a/db/migrations/0190__change_to_etapi_tokens.sql b/db/migrations/0190__change_to_etapi_tokens.sql
@@ -0,0 +1,13 @@
+CREATE TABLE IF NOT EXISTS "etapi_tokens"
+(
+    etapiTokenId TEXT PRIMARY KEY NOT NULL,
+    name TEXT NOT NULL,
+    tokenHash TEXT NOT NULL,
+    utcDateCreated TEXT NOT NULL,
+    utcDateModified TEXT NOT NULL,
+    isDeleted INT NOT NULL DEFAULT 0);
+
+INSERT INTO etapi_tokens (etapiTokenId, name, tokenHash, utcDateCreated, utcDateModified, isDeleted) 
+SELECT apiTokenId, 'Trilium Sender', token, utcDateCreated, utcDateCreated, isDeleted FROM api_tokens;
+
+DROP TABLE api_tokens;
diff --git a/db/migrations/0191__hash_tokens.js b/db/migrations/0191__hash_tokens.js
@@ -0,0 +1,10 @@
+module.exports = () => {
+    const sql = require('../../src/services/sql');
+    const crypto = require('crypto');
+
+    for (const {etapiTokenId, token} of sql.getRows("SELECT etapiTokenId, tokenHash AS token FROM etapi_tokens")) {
+        const tokenHash = crypto.createHash('sha256').update(token).digest('base64');
+
+        sql.execute(`UPDATE etapi_tokens SET tokenHash = ? WHERE etapiTokenId = ?`, [tokenHash, etapiTokenId]);
+    }
+};
diff --git a/.../0191__add_memberId_to_entity_changes.sql → .../0192__add_memberId_to_entity_changes.sql b/.../0191__add_memberId_to_entity_changes.sql → .../0192__add_memberId_to_entity_changes.sql
diff --git a/...igrations/0192__add_index_to_changeId.sql → ...igrations/0193__add_index_to_changeId.sql b/...igrations/0192__add_index_to_changeId.sql → ...igrations/0193__add_index_to_changeId.sql
diff --git a/...189__add_excludeFromNoteMap_to_journal.js → ...194__add_excludeFromNoteMap_to_journal.js b/...189__add_excludeFromNoteMap_to_journal.js → ...194__add_excludeFromNoteMap_to_journal.js
diff --git a/db/schema.sql b/db/schema.sql
@@ -10,11 +10,11 @@ CREATE TABLE IF NOT EXISTS "entity_changes" (
                                                 `isSynced` INTEGER NOT NULL,
                                                 `utcDateChanged` TEXT NOT NULL
                                                 );
-CREATE TABLE IF NOT EXISTS "api_tokens"
+CREATE TABLE IF NOT EXISTS "etapi_tokens"
 (
-    apiTokenId TEXT PRIMARY KEY NOT NULL,
+    etapiTokenId TEXT PRIMARY KEY NOT NULL,
     name TEXT NOT NULL,
-    token TEXT NOT NULL,
+    tokenHash TEXT NOT NULL,
     utcDateCreated TEXT NOT NULL,
     isDeleted INT NOT NULL DEFAULT 0);
 CREATE TABLE IF NOT EXISTS "branches" (