diff --git a/src/becca/entities/abstract_becca_entity.ts b/src/becca/entities/abstract_becca_entity.ts index 53999be68..6be7f7d92 100644 --- a/src/becca/entities/abstract_becca_entity.ts +++ b/src/becca/entities/abstract_becca_entity.ts @@ -33,10 +33,11 @@ abstract class AbstractBeccaEntity> { protected utcDateModified?: string; protected dateCreated?: string; protected dateModified?: string; - protected isProtected?: boolean; protected isSynced?: boolean; - + protected blobId?: string; + + isProtected?: boolean; protected beforeSaving() { const constructorData = (this.constructor as unknown as ConstructorData); diff --git a/src/routes/api/revisions.js b/src/routes/api/revisions.js index e4a843016..33f6fc144 100644 --- a/src/routes/api/revisions.js +++ b/src/routes/api/revisions.js @@ -1,7 +1,7 @@ "use strict"; const beccaService = require('../../becca/becca_service.js'); -const revisionService = require('../../services/revisions.js'); +const revisionService = require('../../services/revisions'); const utils = require('../../services/utils'); const sql = require('../../services/sql'); const cls = require('../../services/cls'); diff --git a/src/routes/routes.js b/src/routes/routes.js index cd323231c..02f69d5d9 100644 --- a/src/routes/routes.js +++ b/src/routes/routes.js @@ -28,7 +28,7 @@ const branchesApiRoute = require('./api/branches.js'); const attachmentsApiRoute = require('./api/attachments.js'); const autocompleteApiRoute = require('./api/autocomplete.js'); const cloningApiRoute = require('./api/cloning.js'); -const revisionsApiRoute = require('./api/revisions.js'); +const revisionsApiRoute = require('./api/revisions'); const recentChangesApiRoute = require('./api/recent_changes.js'); const optionsApiRoute = require('./api/options.js'); const passwordApiRoute = require('./api/password'); diff --git a/src/services/bulk_actions.js b/src/services/bulk_actions.js index 3a274c688..ab8bed739 100644 --- a/src/services/bulk_actions.js +++ b/src/services/bulk_actions.js @@ -1,5 +1,5 @@ const log = require('./log'); -const revisionService = require('./revisions.js'); +const revisionService = require('./revisions'); const becca = require('../becca/becca'); const cloningService = require('./cloning.js'); const branchService = require('./branches.js'); diff --git a/src/services/consistency_checks.js b/src/services/consistency_checks.js index 5d9ef5104..60d5c57df 100644 --- a/src/services/consistency_checks.js +++ b/src/services/consistency_checks.js @@ -9,7 +9,7 @@ const cls = require('./cls'); const entityChangesService = require('./entity_changes'); const optionsService = require('./options'); const BBranch = require('../becca/entities/bbranch'); -const revisionService = require('./revisions.js'); +const revisionService = require('./revisions'); const becca = require('../becca/becca'); const utils = require('../services/utils'); const eraseService = require('../services/erase.js'); diff --git a/src/services/erase.js b/src/services/erase.js index 4c225428b..2d3fb3691 100644 --- a/src/services/erase.js +++ b/src/services/erase.js @@ -1,5 +1,5 @@ const sql = require("./sql"); -const revisionService = require("./revisions.js"); +const revisionService = require("./revisions"); const log = require("./log.ts"); const entityChangesService = require("./entity_changes"); const optionService = require("./options"); diff --git a/src/services/notes.js b/src/services/notes.js index 47fc0ab32..373af1e12 100644 --- a/src/services/notes.js +++ b/src/services/notes.js @@ -7,7 +7,7 @@ const cls = require('../services/cls'); const protectedSessionService = require('../services/protected_session'); const log = require('../services/log'); const utils = require('../services/utils'); -const revisionService = require('./revisions.js'); +const revisionService = require('./revisions'); const request = require('./request.js'); const path = require('path'); const url = require('url'); diff --git a/src/services/revisions.js b/src/services/revisions.ts similarity index 79% rename from src/services/revisions.js rename to src/services/revisions.ts index 7697a35f4..62ba45cd8 100644 --- a/src/services/revisions.js +++ b/src/services/revisions.ts @@ -1,14 +1,12 @@ "use strict"; -const log = require('./log'); -const sql = require('./sql'); -const protectedSessionService = require('./protected_session'); -const dateUtils = require('./date_utils'); +import log = require('./log'); +import sql = require('./sql'); +import protectedSessionService = require('./protected_session'); +import dateUtils = require('./date_utils'); +import BNote = require('../becca/entities/bnote'); -/** - * @param {BNote} note - */ -function protectRevisions(note) { +function protectRevisions(note: BNote) { if (!protectedSessionService.isProtectedSessionAvailable()) { throw new Error(`Cannot (un)protect revisions of note '${note.noteId}' without active protected session`); } @@ -18,7 +16,7 @@ function protectRevisions(note) { try { const content = revision.getContent(); - revision.isProtected = note.isProtected; + revision.isProtected = !!note.isProtected; // this will force de/encryption revision.setContent(content, {forceSave: true});