Merge pull request #1500 from Hirobreak/geoff

removing duplicated keys
Criptext · Aug 3, 2020 · e0e6017 · e0e6017
2 parents cba5d1d + 613e5d7
commit e0e6017
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 14 deletions.
diff --git a/electron_app/package.json b/electron_app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "criptext",
-  "version": "0.30.0",
+  "version": "0.30.1",
   "author": {
     "name": "Criptext Inc",
     "email": "support@criptext.com",

diff --git a/electron_app/src/backup/exporter.js b/electron_app/src/backup/exporter.js
@@ -41,7 +41,7 @@ const start = async () => {
   try {
     await initDatabaseEncrypted({
       key: key,
-      path: path.join(tempBackupDirectory, 'CriptextEncrypt.db'),
+      dbpath: path.join(tempBackupDirectory, 'CriptextEncrypt.db'),
       sync: false
     });
     account = await Account().findOne({

diff --git a/electron_app/src/database/DBEmigrations/20200512111423_addBlockAllColumn.js b/electron_app/src/database/DBEmigrations/20200512111423_addBlockAllColumn.js
@@ -48,7 +48,28 @@ const handleDuplicatedMessageIds = async (queryInterface, transaction) => {
   });
   await Email().destroy({
     where: {
-      id: idsToDelete
+      id: [].concat.apply([], idsToDelete)
+    },
+    transaction
+  });
+};
+
+const handleDuplicatedKeys = async (queryInterface, transaction) => {
+  const query = `SELECT key, messageId, COUNT(*), GROUP_CONCAT(id) as 'ids' FROM ${
+    Table.EMAIL
+  } GROUP BY key HAVING COUNT(*) > 1 `;
+  const [results] = await queryInterface.sequelize.query(query, {
+    transaction
+  });
+  const idsToDelete = [];
+  results.forEach(row => {
+    const ids = row.ids.split(',');
+    ids.shift();
+    idsToDelete.push(ids);
+  });
+  await Email().destroy({
+    where: {
+      id: [].concat.apply([], idsToDelete)
     },
     transaction
   });
@@ -76,6 +97,7 @@ module.exports = {
 
     try {
       await migrateBlockRemoteContent(queryInterface, Sequelize, transaction);
+      await handleDuplicatedKeys(queryInterface, transaction);
       await handleDuplicatedMessageIds(queryInterface, transaction);
       await addUniqueIndexes(queryInterface, transaction);
       await transaction.commit();

diff --git a/electron_app/src/database/DBEmodel.js b/electron_app/src/database/DBEmodel.js
@@ -121,23 +121,23 @@ class Version extends Model {}
 
 const getDB = () => sequelize;
 
-const setConfiguration = (key, path, dialectPath) => {
+const setConfiguration = (key, path) => {
   sequelize = new Sequelize(null, null, key, {
     dialect: 'sqlite',
-    dialectModulePath: dialectPath || '@journeyapps/sqlcipher',
+    dialectModulePath: '@journeyapps/sqlcipher',
     storage: path || myDBEncryptPath(),
     logging: false,
     transactionType: 'IMMEDIATE'
   });
 };
 
 const initDatabaseEncrypted = async (
-  { key, shouldReset, path, sync = true, dialectPath },
+  { key, shouldReset, dbpath, sync = true },
   migrationStartCallback
 ) => {
   if (shouldReset) sequelize = undefined;
   if (sequelize) return;
-  await setConfiguration(key, path, dialectPath);
+  await setConfiguration(key, dbpath);
 
   Account.init(
     {
@@ -607,10 +607,11 @@ const initDatabaseEncrypted = async (
 
   try {
     const migrationPath = path.join(__dirname, '/DBEmigrations');
+    const umzugPath = getUmzugPath(process.env.NODE_ENV);
     const migrator = new umzug({
       storage: 'json',
       storageOptions: {
-        path: getUmzugPath(process.env.NODE_ENV)
+        path: umzugPath
       },
       logging: false,
       upName: 'up',
@@ -634,7 +635,7 @@ const initDatabaseEncrypted = async (
   } catch (ex) {
     logger.error({
       message: 'Migrating Database',
-      error: ex
+      error: ex.toString()
     });
   }
 };

diff --git a/email_composer/package.json b/email_composer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "email_composer",
-  "version": "0.30.0",
+  "version": "0.30.1",
   "private": true,
   "dependencies": {
     "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",

diff --git a/email_loading/package.json b/email_loading/package.json
@@ -1,6 +1,6 @@
 {
   "name": "email_loading",
-  "version": "0.30.0",
+  "version": "0.30.1",
   "private": true,
   "dependencies": {
     "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",

diff --git a/email_login/package.json b/email_login/package.json
@@ -1,6 +1,6 @@
 {
   "name": "email_login",
-  "version": "0.30.0",
+  "version": "0.30.1",
   "private": true,
   "dependencies": {
     "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",

diff --git a/email_mailbox/package.json b/email_mailbox/package.json
@@ -1,6 +1,6 @@
 {
   "name": "email_mailbox",
-  "version": "0.30.0",
+  "version": "0.30.1",
   "private": true,
   "dependencies": {
     "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",

diff --git a/email_pin/package.json b/email_pin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "email_pin",
-  "version": "0.30.0",
+  "version": "0.30.1",
   "private": true,
   "dependencies": {
     "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",