Merge pull request #1163 from erikaperugachi/fix

Fix

Author: Erika Perugachi

electron_app/electron-starter.js

@@ -17,6 +17,7 @@ const {
   isFromStore,
   getSystemLanguage
 } = require('./src/windows/windowUtils');
+const {initNucleus} = require('./src/nucleusManager');
 require('./src/ipc/composer.js');
 require('./src/ipc/loading.js');
 require('./src/ipc/login.js');
@@ -25,6 +26,7 @@ require('./src/ipc/database.js');
 require('./src/ipc/manager.js');
 require('./src/ipc/dataTransfer.js');
 require('./src/ipc/backup.js');
+require('./src/ipc/nucleus.js');
 const ipcUtils = require('./src/ipc/utils.js');
 
 globalManager.forcequit.set(false);
@@ -36,24 +38,27 @@ async function initApp() {
   } catch (ex) {
     console.log(ex);
   }
-
+  
   const [existingAccount] = await dbManager.getAccount();
   if (existingAccount) {
     if (!!existingAccount.deviceId) {
       const appSettings = await dbManager.getSettings();
       const settings = Object.assign(appSettings, { isFromStore });
       myAccount.initialize(existingAccount);
       mySettings.initialize(settings);
+      initNucleus({language: mySettings.language});
       wsClient.start(myAccount);
       createAppMenu();
       mailboxWindow.show({ firstOpenApp: true });
     } else {
-      await getUserLanguage();
+      const language = await getUserLanguage();
+      initNucleus({language});
       createAppMenu();
       loginWindow.show();
     }
   } else {
-    await getUserLanguage();
+    const language = await getUserLanguage();
+    initNucleus({language});
     createAppMenu();
     loginWindow.show({});
   }
@@ -97,6 +102,7 @@ if ((isWindows || isLinux) && !isDev) {
 const getUserLanguage = async () => {
   const osLanguage = await getSystemLanguage();
   await dbManager.updateSettings({ language: osLanguage });
+  return osLanguage;
 };
 
 app.on('ready', () => {

electron_app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "criptext",
-  "version": "0.23.4",
+  "version": "0.23.5",
   "author": {
     "name": "Criptext Inc",
     "email": "[email protected]",
@@ -141,7 +141,7 @@
     "dotenv": "^6.2.0",
     "electron-context-menu": "^0.10.1",
     "electron-dl": "^1.12.0",
-    "electron-nucleus": "^2.2.1",
+    "electron-nucleus": "^2.3.0",
     "electron-updater": "^3.0.3",
     "electron-window-state": "^4.1.1",
     "getos": "^3.1.1",

electron_app/src/ipc/loading.js

@@ -7,7 +7,7 @@ ipc.answerRenderer('close-create-keys-loading', () => {
   globalManager.loadingData.set({});
 });
 
-ipc.answerRenderer('open-create-keys-loading', arg => {
-  globalManager.loadingData.set(arg);
-  loadingWindow.show();
+ipc.answerRenderer('open-create-keys-loading', params => {
+  globalManager.loadingData.set(params);
+  loadingWindow.show({ type: params.loadingType });
 });

electron_app/src/ipc/nucleus.js

@@ -0,0 +1,6 @@
+const ipc = require('@criptext/electron-better-ipc');
+const { addEventError, NUCLEUS_EVENTS } = require('./../nucleusManager');
+
+ipc.answerRenderer('nucleups-report-content-unencrypted', error =>
+  addEventError(NUCLEUS_EVENTS.REPORT_CONTENT_UNENCRYPTED, { error })
+);

electron_app/src/nucleusManager.js

@@ -0,0 +1,42 @@
+const { APP_VERSION, NUCLEUS_ID } = require('./utils/const');
+const myAccount = require('./Account');
+let Nucleus;
+
+const initNucleus = ({ userId }) => {
+  const data = {
+    onlyMainProcess: true,
+    userId: userId || 'unknown',
+    version: APP_VERSION
+  };
+  Nucleus = require('electron-nucleus')(NUCLEUS_ID, data);
+};
+
+const addEventError = (event, data) => {
+  Nucleus.trackError(event, data);
+};
+
+const addEventTrack = (event, data) => {
+  Nucleus.track(event, data);
+};
+
+const updateUserData = () => {
+  Nucleus.setUserId(myAccount.recipientId);
+};
+
+const NUCLEUS_EVENTS = {
+  LOGIN_OPENED: 'LOGIN_OPENED',
+  LOGIN_NEW_USER: 'LOGIN_NEW_USER',
+  LOGIN_NEW_DEVICE: 'LOGIN_NEW_DEVICE',
+  LOGIN_NEW_ENTERPRISE: 'LOGIN_NEW_ENTERPRISE',
+  MAILBOX_OPENED: 'MAILBOX_OPENED',
+  NEW_USER: 'NEW_USER',
+  REPORT_CONTENT_UNENCRYPTED: 'REPORT_CONTENT_UNENCRYPTED'
+};
+
+module.exports = {
+  initNucleus,
+  addEventError,
+  addEventTrack,
+  updateUserData,
+  NUCLEUS_EVENTS
+};

electron_app/src/socketClient.js

@@ -35,6 +35,8 @@ const disconnect = () => {
 
 const start = ({ jwt }) => {
   client = new WebSocketClient();
+  pingFailedCounter = 0;
+  checkDelay = normalPingDelayMs;
   client.connect(
     `${SOCKET_URL}?token=${jwt}`,
     'criptext-protocol'

electron_app/src/windows/composer.js

@@ -133,13 +133,15 @@ const destroy = async ({
     const { type, key } = emailToEdit;
     if (type === composerEvents.EDIT_DRAFT) {
       const [oldDraftEmail] = await dbManager.getEmailByKey(key);
-      const oldEmailId = oldDraftEmail.id;
-      await dbManager.deleteEmailLabelAndContactByEmailId(
-        oldEmailId,
-        undefined
-      );
+      if (oldDraftEmail) {
+        const oldEmailId = oldDraftEmail.id;
+        await dbManager.deleteEmailLabelAndContactByEmailId(
+          oldEmailId,
+          undefined
+        );
+      }
       event = 'composer-email-delete';
-      params = { threadId, oldEmailId };
+      params = { threadId };
     } else if (
       type === composerEvents.REPLY ||
       type === composerEvents.REPLY_ALL

electron_app/src/windows/loading.js

@@ -2,6 +2,11 @@ const { BrowserWindow } = require('electron');
 const path = require('path');
 const { loadingUrl } = require('./../window_routing');
 const globalManager = require('./../globalManager');
+const {
+  updateUserData,
+  addEventTrack,
+  NUCLEUS_EVENTS
+} = require('./../nucleusManager');
 let loadingWindow;
 
 const LINK_DEVICE_LOADING_TYPES = {
@@ -23,7 +28,6 @@ const create = () => {
     show: false,
     frame: false,
     transparent: true,
-    alwaysOnTop: true,
     center: true
   });
   loadingWindow.loadURL(loadingUrl);
@@ -53,6 +57,7 @@ const create = () => {
 };
 
 const close = () => {
+  updateUserData();
   if (loadingWindow) {
     loadingWindow.close();
   }
@@ -66,15 +71,36 @@ const send = (message, data) => {
   loadingWindow.webContents.send(message, data);
 };
 
-const show = async () => {
+const show = async ({ type }) => {
   if (!loadingWindow) {
     await create();
   }
   loadingWindow.once('ready-to-show', () => {
     loadingWindow.show();
+    sendTrack(type);
   });
 };
 
+const sendTrack = type => {
+  let event;
+  switch (type) {
+    case 'signin-new-password':
+      event = NUCLEUS_EVENTS.LOGIN_NEW_ENTERPRISE;
+      break;
+    case 'signup':
+      event = NUCLEUS_EVENTS.LOGIN_NEW_USER;
+      break;
+    case 'signin':
+    case 'link-new-device':
+      event = NUCLEUS_EVENTS.LOGIN_NEW_DEVICE;
+      break;
+    default:
+      event = '';
+      break;
+  }
+  addEventTrack(event);
+};
+
 module.exports = {
   close,
   send,

electron_app/src/windows/login.js

@@ -1,7 +1,8 @@
 const { BrowserWindow, shell } = require('electron');
+const path = require('path');
 const { loginUrl } = require('./../window_routing');
 const globalManager = require('./../globalManager');
-const path = require('path');
+const { addEventTrack, NUCLEUS_EVENTS } = require('./../nucleusManager');
 let loginWindow;
 
 const loginSize = {
@@ -52,10 +53,12 @@ const create = () => {
 const show = async () => {
   if (loginWindow) {
     loginWindow.show();
+    addEventTrack(NUCLEUS_EVENTS.LOGIN_OPENED);
   } else {
     await create();
     loginWindow.once('ready-to-show', () => {
       loginWindow.show();
+      addEventTrack(NUCLEUS_EVENTS.LOGIN_OPENED);
     });
   }
 };

electron_app/src/windows/mailbox.js

@@ -8,12 +8,12 @@ const { appUpdater } = require('./../updater');
 const globalManager = require('./../globalManager');
 const { mailtoProtocolRegex } = require('./../utils/RegexUtils');
 const { removeProtocolFromUrl } = require('./../utils/stringUtils');
+const { isFromStore, isDev } = require('./windowUtils');
 const {
-  isFromStore,
-  isDev,
-  nucleusTrack,
+  updateUserData,
+  addEventTrack,
   NUCLEUS_EVENTS
-} = require('./windowUtils');
+} = require('./../nucleusManager');
 const { createTrayIcon, destroyTrayIcon } = require('./tray');
 const { isWindows } = require('./../utils/osUtils');
 
@@ -101,17 +101,25 @@ const show = async ({ firstOpenApp = false }) => {
   if (mailboxWindow) {
     mailboxWindow.show();
     createTrayIcon();
-    if (firstOpenApp) nucleusTrack(NUCLEUS_EVENTS.MAILBOX_TRACK);
+    if (firstOpenApp) {
+      updateUserData();
+      addEventTrack(NUCLEUS_EVENTS.MAILBOX_OPENED);
+    }
   } else if (!existVisibleWindow.length || !mailboxWindow) {
     await create();
     mailboxWindow.on('ready-to-show', () => {
       mailboxWindow.show();
       createTrayIcon();
-      if (firstOpenApp) nucleusTrack(NUCLEUS_EVENTS.MAILBOX_TRACK);
+      if (firstOpenApp) {
+        updateUserData();
+        addEventTrack(NUCLEUS_EVENTS.MAILBOX_OPENED);
+      }
     });
     mailboxWindow.on('focus', () => {
       if (!globalManager.windowsEvents.checkDisabled()) {
-        ipc.callRenderer(mailboxWindow, 'get-events');
+        if (mailboxWindow) {
+          ipc.callRenderer(mailboxWindow, 'get-events');
+        }
       }
     });
   }