From a06aa9df8a54e8d28620fe95f86e99d7c1099593 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 17 Feb 2024 19:02:14 +0200 Subject: [PATCH] server-ts: Port anonymization service --- bin/create-anonymization-script.js | 2 +- src/anonymize.js | 2 +- .../app/widgets/type_widgets/content_widget.js | 2 +- src/routes/api/database.js | 2 +- .../{anonymization.js => anonymization.ts} | 16 ++++++++-------- src/services/attributes.js | 2 +- ...iltin_attributes.js => builtin_attributes.ts} | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) rename src/services/{anonymization.js => anonymization.ts} (90%) rename src/services/{builtin_attributes.js => builtin_attributes.ts} (99%) diff --git a/bin/create-anonymization-script.js b/bin/create-anonymization-script.js index b16a038de..4c71d6071 100755 --- a/bin/create-anonymization-script.js +++ b/bin/create-anonymization-script.js @@ -1,6 +1,6 @@ #!/usr/bin/env node -const anonymizationService = require('../src/services/anonymization.js'); +const anonymizationService = require('../src/services/anonymization'); const fs = require('fs'); const path = require('path'); diff --git a/src/anonymize.js b/src/anonymize.js index 5099b32b0..d857c4ef0 100644 --- a/src/anonymize.js +++ b/src/anonymize.js @@ -1,4 +1,4 @@ -const anonymizationService = require('./services/anonymization.js'); +const anonymizationService = require('./services/anonymization'); const sqlInit = require('./services/sql_init.js'); require('./becca/entity_constructor.js'); diff --git a/src/public/app/widgets/type_widgets/content_widget.js b/src/public/app/widgets/type_widgets/content_widget.js index fe7f105af..f8e8fe119 100644 --- a/src/public/app/widgets/type_widgets/content_widget.js +++ b/src/public/app/widgets/type_widgets/content_widget.js @@ -28,7 +28,7 @@ import AdvancedSyncOptions from "./options/advanced/sync.js"; import DatabaseIntegrityCheckOptions from "./options/advanced/database_integrity_check.js"; import ConsistencyChecksOptions from "./options/advanced/consistency_checks.js"; import VacuumDatabaseOptions from "./options/advanced/vacuum_database.js"; -import DatabaseAnonymizationOptions from "./options/advanced/database_anonymization.js"; +import DatabaseAnonymizationOptions from "./options/advanced/database_anonymization"; import BackendLogWidget from "./content/backend_log.js"; import AttachmentErasureTimeoutOptions from "./options/other/attachment_erasure_timeout.js"; import RibbonOptions from "./options/appearance/ribbon.js"; diff --git a/src/routes/api/database.js b/src/routes/api/database.js index 6c8063fe1..566e2e468 100644 --- a/src/routes/api/database.js +++ b/src/routes/api/database.js @@ -3,7 +3,7 @@ const sql = require('../../services/sql'); const log = require('../../services/log'); const backupService = require('../../services/backup.js'); -const anonymizationService = require('../../services/anonymization.js'); +const anonymizationService = require('../../services/anonymization'); const consistencyChecksService = require('../../services/consistency_checks.js'); function getExistingBackups() { diff --git a/src/services/anonymization.js b/src/services/anonymization.ts similarity index 90% rename from src/services/anonymization.js rename to src/services/anonymization.ts index 6a223ec4e..09599dcd4 100644 --- a/src/services/anonymization.js +++ b/src/services/anonymization.ts @@ -1,10 +1,10 @@ -const BUILTIN_ATTRIBUTES = require('./builtin_attributes.js'); -const fs = require("fs-extra"); -const dataDir = require('./data_dir'); -const dateUtils = require('./date_utils'); -const Database = require("better-sqlite3"); -const sql = require('./sql'); -const path = require("path"); +import BUILTIN_ATTRIBUTES = require('./builtin_attributes'); +import fs = require("fs-extra"); +import dataDir = require('./data_dir'); +import dateUtils = require('./date_utils'); +import Database = require("better-sqlite3"); +import sql = require('./sql'); +import path = require("path"); function getFullAnonymizationScript() { // we want to delete all non-builtin attributes because they can contain sensitive names and values @@ -48,7 +48,7 @@ function getLightAnonymizationScript() { AND value != '';`; } -async function createAnonymizedCopy(type) { +async function createAnonymizedCopy(type: "full" | "light") { if (!['full', 'light'].includes(type)) { throw new Error(`Unrecognized anonymization type '${type}'`); } diff --git a/src/services/attributes.js b/src/services/attributes.js index 685225ae7..69e12faa1 100644 --- a/src/services/attributes.js +++ b/src/services/attributes.js @@ -5,7 +5,7 @@ const sql = require('./sql'); const becca = require('../becca/becca'); const BAttribute = require('../becca/entities/battribute'); const {formatAttrForSearch} = require('./attribute_formatter.js'); -const BUILTIN_ATTRIBUTES = require('./builtin_attributes.js'); +const BUILTIN_ATTRIBUTES = require('./builtin_attributes'); const ATTRIBUTE_TYPES = ['label', 'relation']; diff --git a/src/services/builtin_attributes.js b/src/services/builtin_attributes.ts similarity index 99% rename from src/services/builtin_attributes.js rename to src/services/builtin_attributes.ts index eb21f04f3..6ccabb4e1 100644 --- a/src/services/builtin_attributes.js +++ b/src/services/builtin_attributes.ts @@ -1,4 +1,4 @@ -module.exports = [ +export = [ // label names { type: 'label', name: 'inbox' }, { type: 'label', name: 'disableVersioning' },