upgrade electron version and app version

js/cryptoLib.js

@@ -1,6 +1,6 @@
 const electron = require('electron');
 const app = electron.app;
-const ffi = require('ffi');
+const ffi = require('ffi-napi');
 const ref = require('ref');
 const path = require('path');
 const execPath = path.dirname(app.getPath('exe'));
@@ -96,7 +96,7 @@ const library = new ffi.Library((cryptoLibPath), {
  * @return {*}
  * @constructor
  */
-const AESGCMEncrypt = function(Base64IV, Base64AAD, Base64Key, Base64In) {
+const AESGCMEncrypt = function (Base64IV, Base64AAD, Base64Key, Base64In) {
     return EncryptDecrypt('AESGCMEncrypt', Base64IV, Base64AAD, Base64Key, Base64In);
 };
 
@@ -109,7 +109,7 @@ const AESGCMEncrypt = function(Base64IV, Base64AAD, Base64Key, Base64In) {
  * @return {*}
  * @constructor
  */
-const AESGCMDecrypt = function(Base64IV, Base64AAD, Base64Key, Base64In) {
+const AESGCMDecrypt = function (Base64IV, Base64AAD, Base64Key, Base64In) {
     return EncryptDecrypt('AESGCMDecrypt', Base64IV, Base64AAD, Base64Key, Base64In);
 };
 
@@ -123,7 +123,7 @@ const AESGCMDecrypt = function(Base64IV, Base64AAD, Base64Key, Base64In) {
  * @return {*}
  * @constructor
  */
-const EncryptDecrypt = function(name, Base64IV, Base64AAD, Base64Key, Base64In) {
+const EncryptDecrypt = function (name, Base64IV, Base64AAD, Base64Key, Base64In) {
     let base64In = Base64In;
 
     if (!base64In) {

js/preload/preloadMain.js

@@ -84,14 +84,14 @@ const local = {
 };
 
 // throttle calls to this func to at most once per sec, called on leading edge.
-const throttledSetBadgeCount = throttle(1000, function(count) {
+const throttledSetBadgeCount = throttle(1000, function (count) {
     local.ipcRenderer.send(apiName, {
         cmd: apiCmds.setBadgeCount,
         count: count
     });
 });
 
-const throttledSetIsInMeetingStatus = throttle(1000, function(isInMeeting) {
+const throttledSetIsInMeetingStatus = throttle(1000, function (isInMeeting) {
     local.ipcRenderer.send(apiName, {
         cmd: apiCmds.setIsInMeeting,
         isInMeeting
@@ -106,14 +106,14 @@ local.ipcRenderer.on('on-page-load', () => {
     snackBar = new SnackBar();
 });
 
-const throttledActivate = throttle(1000, function(windowName) {
+const throttledActivate = throttle(1000, function (windowName) {
     local.ipcRenderer.send(apiName, {
         cmd: apiCmds.activate,
         windowName: windowName
     });
 });
 
-const throttledBringToFront = throttle(1000, function(windowName, reason) {
+const throttledBringToFront = throttle(1000, function (windowName, reason) {
     local.ipcRenderer.send(apiName, {
         cmd: apiCmds.bringToFront,
         windowName: windowName,
@@ -121,7 +121,7 @@ const throttledBringToFront = throttle(1000, function(windowName, reason) {
     });
 });
 
-const throttledSetLocale = throttle(1000, function(locale) {
+const throttledSetLocale = throttle(1000, function (locale) {
     local.ipcRenderer.send(apiName, {
         cmd: apiCmds.setLocale,
         locale,
@@ -158,8 +158,8 @@ function createAPI() {
     // API exposed to renderer process.
     //
     window.ssf = {
-        getVersionInfo: function() {
+        getVersionInfo: function () {
-            return new Promise(function(resolve) {
+            return new Promise(function (resolve) {
                 let appName = remote.app.getName();
                 let appVer = remote.app.getVersion();
 
@@ -181,7 +181,7 @@ function createAPI() {
          * note: for mac the number displayed will be 1 to infinity
          * note: for windws the number displayed will be 1 to 99 and 99+
          */
-        setBadgeCount: function(count) {
+        setBadgeCount: function (count) {
             throttledSetBadgeCount(count);
         },
 
@@ -220,7 +220,7 @@ function createAPI() {
          * Brings window forward and gives focus.
          * @param  {String} windowName Name of window. Note: main window name is 'main'
          */
-        activate: function(windowName) {
+        activate: function (windowName) {
             if (typeof windowName === 'string') {
                 throttledActivate(windowName);
             }
@@ -231,7 +231,7 @@ function createAPI() {
          * @param  {String} windowName Name of window. Note: main window name is 'main'
          * @param {String} reason, The reason for which the window is to be activated
          */
-        bringToFront: function(windowName, reason) {
+        bringToFront: function (windowName, reason) {
             if (typeof windowName === 'string') {
                 throttledBringToFront(windowName, reason);
             }
@@ -244,7 +244,7 @@ function createAPI() {
          * only one window can register for bounds change.
          * @param  {Function} callback Function invoked when bounds changes.
          */
-        registerBoundsChange: function(callback) {
+        registerBoundsChange: function (callback) {
             if (typeof callback === 'function') {
                 local.boundsChangeCallback = callback;
                 local.ipcRenderer.send(apiName, {
@@ -261,7 +261,7 @@ function createAPI() {
          *  logDetails: String
          *  }
          */
-        registerLogger: function(logger) {
+        registerLogger: function (logger) {
             if (typeof logger === 'function') {
                 local.logger = logger;
 
@@ -287,7 +287,7 @@ function createAPI() {
          * this registration func is invoked then the protocolHandler callback
          * will be immediately called.
          */
-        registerProtocolHandler: function(protocolHandler) {
+        registerProtocolHandler: function (protocolHandler) {
             if (typeof protocolHandler === 'function') {
 
                 local.processProtocolAction = protocolHandler;
@@ -308,7 +308,7 @@ function createAPI() {
          *  systemIdleTime: Number
          *  }
          */
-        registerActivityDetection: function(period, activityDetection) {
+        registerActivityDetection: function (period, activityDetection) {
             if (typeof activityDetection === 'function') {
                 local.activityDetection = activityDetection;
 
@@ -344,7 +344,7 @@ function createAPI() {
         /**
          * Opens a modal window to configure notification preference.
          */
-        showNotificationSettings: function() {
+        showNotificationSettings: function () {
             let windowName = remote.getCurrentWindow().winName;
             local.ipcRenderer.send(apiName, {
                 cmd: apiCmds.showNotificationSettings,

js/windowMgr.js

@@ -41,7 +41,7 @@ let boundsChangeWindow;
 let alwaysOnTop = false;
 let position = 'lower-right';
 let display;
-let sandboxed = false;
+let sandboxed = true;
 let isAutoReload = false;
 let devToolsEnabled = true;
 let isCustomTitleBarEnabled = true;
@@ -654,7 +654,7 @@ function doCreateMainWindow(initialUrl, initialBounds, isCustomTitleBar) {
                             const fullMessage = `${i18n.getMessageFor('Your administrator has disabled')} ${message}. ${i18n.getMessageFor('Please contact your admin for help')}`;
                             const browserWindow = BrowserWindow.getFocusedWindow();
                             if (browserWindow && !browserWindow.isDestroyed()) {
-                                electron.dialog.showMessageBox(browserWindow, {type: 'error', title: `${i18n.getMessageFor('Permission Denied')}!`, message: fullMessage});
+                                electron.dialog.showMessageBox(browserWindow, { type: 'error', title: `${i18n.getMessageFor('Permission Denied')}!`, message: fullMessage });
                             }
                         }
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "Symphony",
   "productName": "Symphony",
-  "version": "2.11.0",
+  "version": "3.1.0",
   "buildNumber": "0",
   "description": "Symphony desktop app (Foundation ODP)",
   "author": "Symphony",
@@ -91,8 +91,8 @@
     "browserify": "16.2.2",
     "chromedriver": "2.40.0",
     "cross-env": "5.2.0",
-    "electron": "2.0.7",
+    "electron": "3.0.0-beta.6",
-    "electron-builder": "20.16.4",
+    "electron-builder": "20.28.1",
     "electron-builder-squirrel-windows": "12.3.0",
     "electron-chromedriver": "2.0.0",
     "electron-packager": "12.1.0",
@@ -121,16 +121,16 @@
     "electron-log": "2.2.15",
     "electron-spellchecker": "1.1.2",
     "electron-squirrel-startup": "1.0.0",
+    "ffi-napi": "2.4.3",
     "filesize": "3.6.1",
     "keymirror": "0.1.1",
     "lodash.difference": "4.5.0",
     "lodash.isequal": "4.5.0",
     "lodash.omit": "4.5.0",
     "lodash.pick": "4.4.0",
+    "ref-napi": "1.4.0",
     "shell-path": "2.1.0",
-    "winreg": "1.2.4",
+    "winreg": "1.2.4"
-    "ffi": "2.2.0",
-    "ref": "1.3.5"
   },
   "optionalDependencies": {
     "screen-snippet": "git+https://github.com/symphonyoss/ScreenSnippet.git#v1.0.2",

tests/config.test.js

@@ -270,7 +270,7 @@ describe('read/write config tests', function() {
 
             return updateConfigField('url2', 'hello world')
                 .catch(function (err) {
-                    expect(err.message).toBe('Path must be a string. Received null');
+                    expect(err.message).toBe('The "path" argument must be of type string. Received type object');
                 });
 
         });
@@ -309,7 +309,7 @@ describe('read/write config tests', function() {
 
             return saveUserConfig('url2', 'hello world')
                 .catch(function (err) {
-                    expect(err.message).toBe('Path must be a string. Received null');
+                    expect(err.message).toBe('The "path" argument must be of type string. Received type object');
                 });
         });