Merge pull request #1471 from javiteri95/newParametersDataTransfer

new parameters in data transfer file

Author: Hirobreak

electron_app/src/__integrations__/Account.integration.js

@@ -2,6 +2,14 @@
 
 const DBManager = require('../database');
 jest.mock('./../Account.js');
+jest.mock('../windows/mailbox', () => ({
+  getShowPreview: () => {
+    return Promise.resolve(true);
+  },
+  setShowPreview: () => {
+    return Promise.resolve();
+  }
+}));
 
 const account = {
   recipientId: 'user',

electron_app/src/__integrations__/Contact.integration.js

@@ -1,6 +1,15 @@
 /* eslint-env node, jest */
 const DBManager = require('../database');
 
+jest.mock('../windows/mailbox', () => ({
+  getShowPreview: () => {
+    return Promise.resolve(true);
+  },
+  setShowPreview: () => {
+    return Promise.resolve();
+  }
+}));
+
 let accountId;
 let accountId2;
 

electron_app/src/__integrations__/DbExporter.integration.js

@@ -24,6 +24,15 @@ const myAccount = require('../Account');
 const PARSED_SAMPLE_FILEPATH = `${__dirname}/parsed_sample_file.txt`;
 const TEMP_DIRECTORY = '/tmp/criptext-tests';
 
+jest.mock('../windows/mailbox', () => ({
+  getShowPreview: () => {
+    return Promise.resolve(true);
+  },
+  setShowPreview: () => {
+    return Promise.resolve();
+  }
+}));
+
 let accountId;
 let username;
 const account = {
@@ -105,11 +114,20 @@ const email = {
     }
   ]
 };
+const settings = {
+  language: 'en',
+  opened: false,
+  theme: 'dark'
+};
 
 const insertAccount = async () => {
   return await DBManager.createAccount(account);
 };
 
+const insertSettings = async () => {
+  return await DBManager.createSettings(settings);
+};
+
 const insertContacts = async params => {
   return await DBManager.createContact({ contacts: params, accountId });
 };
@@ -167,6 +185,7 @@ beforeAll(async () => {
   });
   globalManager.databaseKey.set(dbKey);
   const [account] = await insertAccount();
+  await insertSettings();
   myAccount.initialize([account.dataValues]);
   accountId = account.dataValues.id;
   username = myAccount.email;
@@ -321,11 +340,21 @@ describe('Import Database: ', () => {
     };
     const same =
       emailChecked1.id === emailChecked2.id && emailChecked1.id === rawEmail.id;
+
+    const { language, theme } = await DBManager.getSettings();
+
+    const [account] = await DBManager.getAccount();
+    const { signature, signFooter } = account;
+
     expect(same).toBe(true);
     expect(emailResult).toMatchObject(expect.objectContaining(email.email));
     expect(fileResult).toMatchObject(email.files[0]);
     expect(firstContact).toMatchObject(contacts[0]);
     expect(secondContact).toMatchObject(contacts[1]);
     expect(thirdContact).toMatchObject(contacts[2]);
+    expect(language).toBe('en');
+    expect(theme).toBe('dark');
+    expect(signature).toBe('');
+    expect(signFooter).toBe(true);
   });
 });

electron_app/src/__integrations__/Email.integration.js

@@ -2,6 +2,17 @@
 const DBManager = require('../database');
 const systemLabels = require('./../systemLabels');
 
+jest.mock('../windows/mailbox', () => ({
+  getShowPreview: () => {
+    return Promise.resolve(true);
+  },
+  setShowPreview: () => {
+    return Promise.resolve();
+  }
+}));
+
+jest.setTimeout(7000);
+
 let accountId;
 let emailIdToDelete;
 

electron_app/src/__integrations__/Feeditem.integration.js

@@ -1,6 +1,15 @@
 /* eslint-env node, jest */
 const DBManager = require('../database');
 
+jest.mock('../windows/mailbox', () => ({
+  getShowPreview: () => {
+    return Promise.resolve(true);
+  },
+  setShowPreview: () => {
+    return Promise.resolve();
+  }
+}));
+
 let accountId;
 
 const account = {

electron_app/src/__integrations__/File.integration.js

@@ -1,6 +1,15 @@
 /* eslint-env node, jest */
 const DBManager = require('../database');
 
+jest.mock('../windows/mailbox', () => ({
+  getShowPreview: () => {
+    return Promise.resolve(true);
+  },
+  setShowPreview: () => {
+    return Promise.resolve();
+  }
+}));
+
 let accountId;
 
 const account = {

electron_app/src/__integrations__/Label.integration.js

@@ -2,6 +2,15 @@
 const DBManager = require('../database');
 const systemLabels = require('../systemLabels');
 
+jest.mock('../windows/mailbox', () => ({
+  getShowPreview: () => {
+    return Promise.resolve(true);
+  },
+  setShowPreview: () => {
+    return Promise.resolve();
+  }
+}));
+
 let accountId;
 
 const account = {

electron_app/src/__integrations__/parsed_sample_file.txt

@@ -1,4 +1,4 @@
-{"fileVersion":"6","recipientId":"test","domain":"criptext.com"}
+{"fileVersion":"6","recipientId":"test","domain":"criptext.com","signature":"","hasCriptextFooter":true,"language":"en","darkTheme":true,"showPreview":true}
 {"table":"contact","object":{"id":1,"email":"[email protected]","name":"Alice","isTrusted":false,"spamScore":0}}
 {"table":"contact","object":{"id":2,"email":"[email protected]","name":"Bob","isTrusted":false,"spamScore":0}}
 {"table":"contact","object":{"id":3,"email":"[email protected]","name":"Charlie","isTrusted":false,"spamScore":0}}

electron_app/src/database/DBEexporter.js

@@ -25,7 +25,10 @@ const {
   Signedprekeyrecord,
   getDB,
   Table,
-  deleteAccountNotSignalRelatedData
+  deleteAccountNotSignalRelatedData,
+  getSettings,
+  updateSettings,
+  updateAccount
 } = require('./DBEmanager');
 const myAccount = require('./../Account');
 const systemLabels = require('./../systemLabels');
@@ -37,6 +40,7 @@ const {
   replaceEmailsWithCopy,
   saveEmailBody
 } = require('./../utils/FileUtils');
+const { getShowPreview, setShowPreview } = require('../windows/mailbox');
 
 const CIPHER_ALGORITHM = 'aes-128-cbc';
 const STREAM_SIZE = 512 * 1024;
@@ -844,10 +848,28 @@ const exportEncryptDatabaseToFile = async ({
     ? accountObj.recipientId.split('@')
     : myAccount.recipientId.split('@');
   const accountId = accountObj ? accountObj.id : myAccount.id;
+  const signature =
+    accountObj && accountObj.signature !== undefined
+      ? accountObj.signature
+      : myAccount.signature;
+
+  const hasCriptextFooter =
+    accountObj && accountObj.signFooter !== undefined
+      ? accountObj.signFooter
+      : myAccount.signFooter;
+  const showPreview = await getShowPreview();
+
+  const { language, theme } = await getSettings();
+
   const fileInformation = JSON.stringify({
     fileVersion: LINK_DEVICES_FILE_VERSION,
     recipientId: recipientId,
-    domain: domain || APP_DOMAIN
+    domain: domain || APP_DOMAIN,
+    signature: signature,
+    hasCriptextFooter: hasCriptextFooter,
+    language: language,
+    darkTheme: theme === 'dark',
+    showPreview: showPreview
   });
 
   exportProgress += 100 / PROGRESS_TOTAL_STEPS;
@@ -947,6 +969,10 @@ const importDatabaseFromFile = async ({
   let signedprekeyrecords = [];
   let aliases = [];
   let customDomains = [];
+  // eslint-disable-next-line prefer-const
+  let accountObject = {};
+  // eslint-disable-next-line prefer-const
+  let settingsObject = {};
 
   const sequelize = getDB();
 
@@ -959,12 +985,19 @@ const importDatabaseFromFile = async ({
     }
 
     if (isStrict) {
-      getCustomLinesByStream(filepath, 1, (err, lines) => {
+      getCustomLinesByStream(filepath, 1, async (err, lines) => {
         if (err) throw new Error('Failed to read file information');
         const fileInformation = lines[0];
-        const { fileVersion, recipientId, domain } = JSON.parse(
-          fileInformation
-        );
+        const {
+          fileVersion,
+          recipientId,
+          domain,
+          signature,
+          hasCriptextFooter,
+          language,
+          darkTheme,
+          showPreview
+        } = JSON.parse(fileInformation);
 
         if (recipientId && domain) {
           const fileOwner = `${recipientId}@${domain}`;
@@ -976,6 +1009,32 @@ const importDatabaseFromFile = async ({
           const currentVersion = Number(LINK_DEVICES_FILE_VERSION);
           if (version !== currentVersion) return;
         }
+
+        if (signature !== undefined) {
+          accountObject.signature = signature;
+        }
+
+        if (hasCriptextFooter !== undefined) {
+          accountObject.signFooter = hasCriptextFooter;
+        }
+
+        if (language) {
+          settingsObject.language = language;
+        }
+
+        if (darkTheme !== undefined) {
+          settingsObject.theme = darkTheme ? 'dark' : 'light';
+        }
+
+        if (showPreview !== undefined) {
+          await setShowPreview(showPreview);
+        }
+        if (Object.keys(settingsObject).length !== 0) {
+          await updateSettings(settingsObject, trx);
+        }
+        if (Object.keys(accountObj).length !== 0) {
+          await updateAccount(accountObj, trx);
+        }
       });
 
       if (accountId) {

electron_app/src/database/DBEmanager.js

@@ -112,30 +112,33 @@ const getAccountByParams = params => {
     .map(account => account.toJSON());
 };
 
-const updateAccount = ({
-  id,
-  deviceId,
-  jwt,
-  refreshToken,
-  name,
-  blockRemoteContent,
-  customerType,
-  privKey,
-  pubKey,
-  recipientId,
-  registrationId,
-  signature,
-  signatureEnabled,
-  signFooter,
-  isLoggedIn,
-  isActive,
-  autoBackupEnable,
-  autoBackupFrequency,
-  autoBackupLastDate,
-  autoBackupLastSize,
-  autoBackupNextDate,
-  autoBackupPath
-}) => {
+const updateAccount = (
+  {
+    id,
+    deviceId,
+    jwt,
+    refreshToken,
+    name,
+    blockRemoteContent,
+    customerType,
+    privKey,
+    pubKey,
+    recipientId,
+    registrationId,
+    signature,
+    signatureEnabled,
+    signFooter,
+    isLoggedIn,
+    isActive,
+    autoBackupEnable,
+    autoBackupFrequency,
+    autoBackupLastDate,
+    autoBackupLastSize,
+    autoBackupNextDate,
+    autoBackupPath
+  },
+  trx
+) => {
   const params = noNulls({
     deviceId,
     jwt,
@@ -163,7 +166,8 @@ const updateAccount = ({
   const whereParam = id ? { id } : { recipientId };
   myAccount.update({ ...params, ...whereParam });
   return Account().update(params, {
-    where: whereParam
+    where: whereParam,
+    transaction: trx
   });
 };
 
@@ -1382,7 +1386,7 @@ const getSettings = () => {
     });
 };
 
-const updateSettings = async ({ language, opened, theme }) => {
+const updateSettings = async ({ language, opened, theme }, trx) => {
   const params = noNulls({
     language,
     opened,
@@ -1391,7 +1395,11 @@ const updateSettings = async ({ language, opened, theme }) => {
   if (Object.keys(params).length < 1) {
     return Promise.resolve([1]);
   }
-  const result = await Settings().update(params, { where: {} });
+  const result = await Settings().update(
+    params,
+    { where: {} },
+    { transaction: trx }
+  );
   mySettings.update(params);
   if (params.language) setLanguage(params.language);
   return result;